chore(version-snjs): 2.7.18

2021-07-13 19:23:14 -03:00
parent 0e67f78259
commit b1aeaeac41
10 changed files with 8 additions and 24 deletions
--- a/.env.sample
+++ b/.env.sample
@@ -10,11 +10,9 @@ APP_HOST=http://localhost:3001

 EXTENSIONS_MANAGER_LOCATION=extensions/extensions-manager/dist/index.html
 SF_DEFAULT_SERVER=http://localhost:3000
-SF_NEXT_VERSION_SERVER=http://localhost:3000

 # Development options
-DEV_DEFAULT_SYNC_SERVER=https://sync.standardnotes.org
-DEV_NEXT_VERSION_SYNC_SERVER=https://api.standardnotes.com
+DEV_DEFAULT_SYNC_SERVER=https://api.standardnotes.com
 DEV_EXTENSIONS_MANAGER_LOCATION=public/extensions/extensions-manager/dist/index.html
 ENABLE_UNFINISHED_FEATURES=false

--- a/README.md
+++ b/README.md
@@ -107,13 +107,10 @@ The web app makes use of two optional native extensions, which, when running the
 	EXTENSIONS_MANAGER_LOCATION=extensions/extensions-manager/dist/index.html
 	```

-You can also set the `SF_DEFAULT_SERVER` and `SF_NEXT_VERSION_SERVER` environment variables to set the default servers for login and registration.
-
-> **Note:** SF_NEXT_VERSION_SERVER can point to the same server. It is used for gradual upgrade of API versions.
+You can also set the `SF_DEFAULT_SERVER` environment variable to set the default server for login and registration.

 ```
 SF_DEFAULT_SERVER=https://sync.myserver
-SF_NEXT_VERSION_SERVER=https://sync.myserver
 ```

 ---
--- a/app/assets/javascripts/app.ts
+++ b/app/assets/javascripts/app.ts
@@ -91,7 +91,6 @@ function reloadHiddenFirefoxTab(): boolean {
 const startApplication: StartApplication = async function startApplication(
  defaultSyncServerHost: string,
  bridge: Bridge,
-  nextVersionSyncServerHost: string
 ) {
  if (reloadHiddenFirefoxTab()) {
    return;
@@ -108,7 +107,6 @@ const startApplication: StartApplication = async function startApplication(
    .config(configRoutes)
    .constant('bridge', bridge)
    .constant('defaultSyncServerHost', defaultSyncServerHost)
-    .constant('nextVersionSyncServerHost', nextVersionSyncServerHost)
    .constant('appVersion', bridge.appVersion);

  // Controllers
@@ -195,7 +193,6 @@ if (__WEB__) {
  startApplication(
    (window as any)._default_sync_server,
    new BrowserBridge(__VERSION__),
-    (window as any)._next_version_sync_server
  );
 } else {
  (window as any).startApplication = startApplication;
--- a/app/assets/javascripts/startApplication.ts
+++ b/app/assets/javascripts/startApplication.ts
@@ -3,5 +3,4 @@ import { Bridge } from "./services/bridge";
 export type StartApplication = (
  defaultSyncServerHost: string,
  bridge: Bridge,
-  nextVersionSyncServerHost: string
 ) => Promise<void>;
--- a/app/assets/javascripts/ui_models/application.ts
+++ b/app/assets/javascripts/ui_models/application.ts
@@ -53,7 +53,6 @@ export class WebApplication extends SNApplication {
    scope: angular.IScope,
    defaultSyncServerHost: string,
    public bridge: Bridge,
-    nextVersionSyncServerHost: string,
  ) {
    super(
      bridge.environment,
@@ -64,7 +63,6 @@ export class WebApplication extends SNApplication {
      identifier,
      [],
      defaultSyncServerHost,
-      nextVersionSyncServerHost,
    );
    this.$compile = $compile;
    this.scope = scope;
--- a/app/assets/javascripts/ui_models/application_group.ts
+++ b/app/assets/javascripts/ui_models/application_group.ts
@@ -29,7 +29,6 @@ export class ApplicationGroup extends SNApplicationGroup {
    $timeout: ng.ITimeoutService,
    private defaultSyncServerHost: string,
    private bridge: Bridge,
-    private nextVersionSyncServerHost: string,
  ) {
    super(new WebDeviceInterface($timeout, bridge));
    this.$compile = $compile;
@@ -64,7 +63,6 @@ export class ApplicationGroup extends SNApplicationGroup {
      scope,
      this.defaultSyncServerHost,
      this.bridge,
-      this.nextVersionSyncServerHost,
    );
    const appState = new AppState(
      this.$rootScope,
--- a/app/views/application/app.html.erb
+++ b/app/views/application/app.html.erb
@@ -30,7 +30,6 @@

    <script>
      window._default_sync_server = "<%= ENV['SF_DEFAULT_SERVER'] %>";
-      window._next_version_sync_server = "<%= ENV['SF_NEXT_VERSION_SERVER'] || ENV['SF_DEFAULT_SERVER'] %>";
      window._extensions_manager_location = "<%= ENV['EXTENSIONS_MANAGER_LOCATION'] %>";
      window._batch_manager_location = "<%= ENV['BATCH_MANAGER_LOCATION'] %>";
      window._bugsnag_api_key = "<%= ENV['BUGSNAG_API_KEY'] %>";
--- a/index.html
+++ b/index.html
@@ -30,14 +30,12 @@

 <body
  data-default-sync-server="<%= env.DEV_DEFAULT_SYNC_SERVER %>"
-  data-next-version-sync-server="<%= env.DEV_NEXT_VERSION_SYNC_SERVER || env.DEV_DEFAULT_SYNC_SERVER %>"
  data-extensions-manager-location="<%= env.DEV_EXTENSIONS_MANAGER_LOCATION %>"
  data-bugsnag-api-key="<%= env.DEV_BUGSNAG_API_KEY %>"
  data-enable-unfinished-features="<%= env.ENABLE_UNFINISHED_FEATURES %>"
 >
  <script>
-    window._default_sync_server = document.body.dataset.defaultSyncServer || "https://sync.standardnotes.org";
-    window._next_version_sync_server = document.body.dataset.nextVersionSyncServer || "https://api.standardnotes.com";
+    window._default_sync_server = document.body.dataset.defaultSyncServer || "https://api.standardnotes.com";
    window._extensions_manager_location = document.body.dataset.extensionsManagerLocation || "public/extensions/extensions-manager/dist/index.html";
    window._bugsnag_api_key = document.body.dataset.bugsnagApiKey;
    window._enable_unfinished_features = document.body.dataset.enableUnfinishedFeatures === 'true';
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
    "@reach/checkbox": "^0.13.2",
    "@reach/dialog": "^0.13.0",
    "@standardnotes/sncrypto-web": "1.2.10",
-    "@standardnotes/snjs": "2.7.17",
+    "@standardnotes/snjs": "2.7.18",
    "mobx": "^6.1.6",
    "mobx-react-lite": "^3.2.0",
    "preact": "^10.5.12"
--- a/yarn.lock
+++ b/yarn.lock
@@ -2029,10 +2029,10 @@
    "@standardnotes/sncrypto-common" "^1.2.7"
    libsodium-wrappers "^0.7.8"

-"@standardnotes/snjs@2.7.17":
-  version "2.7.17"
-  resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.7.17.tgz#e83986e637dbfdb9ac0d94270c6a3d7391de88ce"
-  integrity sha512-M030ex34TTMXWTTWu2ViSYEHKTScf1xbC03IIysxC9BRYpwAh996V5RQQiUW3jiW0XMHXxFYN/XhKGYHn5bixw==
+"@standardnotes/snjs@2.7.18":
+  version "2.7.18"
+  resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.7.18.tgz#90dd33576176da53714438e0819eef180c221381"
+  integrity sha512-fXv91FhsxLRMK9KR1LLNzG/k9vdnMqrqMwQrfRECDqJRG2iZvlvVqzgWKBCYtCvLRHSRnFmt0xPKA2yuTkZqpA==
  dependencies:
    "@standardnotes/auth" "^2.0.0"
    "@standardnotes/sncrypto-common" "^1.2.9"