fix: Don't include settings in release build

oliversalzburg · Jul 17, 2021 · 82fe4f2 · 82fe4f2
1 parent 651ef94
commit 82fe4f2
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/packages/userscript/bundle/kitten-scientists.user.js b/packages/userscript/bundle/kitten-scientists.user.js
diff --git a/packages/userscript/source/fixtures/savegame.ts b/packages/userscript/source/fixtures/savegame.ts
@@ -1 +1,2 @@
+// This file is replaced during build as needed.
 export default null;
diff --git a/packages/userscript/source/fixtures/settings.ts b/packages/userscript/source/fixtures/settings.ts
@@ -0,0 +1,2 @@
+// This file is replaced during build as needed.
+export default null;
diff --git a/packages/userscript/source/index.ts b/packages/userscript/source/index.ts
@@ -1,5 +1,5 @@
-import testConfig from "./fixtures/localstorage.json";
-import savegame from "./fixtures/savegame";
+import devSavegame from "./fixtures/savegame";
+import devSettings from "./fixtures/settings";
 import { Options } from "./options/Options";
 import { SettingsStorage } from "./options/SettingsStorage";
 import { cinfo } from "./tools/Log";
@@ -11,8 +11,8 @@ import { UserScript } from "./UserScript";
   const kittenGame = await UserScript.waitForGame();
 
   // For development convenience, load a lategame save to give us more test options.
-  if (!isNil(savegame)) {
-    await new SavegameLoader(kittenGame).load(savegame);
+  if (!isNil(devSavegame)) {
+    await new SavegameLoader(kittenGame).load(devSavegame);
   }
 
   const userScript = await UserScript.getDefaultInstance();
@@ -25,9 +25,12 @@ import { UserScript } from "./UserScript";
   if (legacySettings === null) {
     cinfo("No legacy settings found. Default settings will be used.");
   }
-  const options = Options.parseLegacyOptions(testConfig);
-  //const options = Options.parseLegacyOptions(legacySettings);
-  userScript.injectOptions(options);
+
+  if (!isNil(devSettings)) {
+    const options = Options.parseLegacyOptions(devSettings);
+    userScript.injectOptions(options);
+  }
+
   userScript.run();
 
   /*

diff --git a/packages/userscript/webpack.config.inject.js b/packages/userscript/webpack.config.inject.js
@@ -23,6 +23,10 @@ module.exports = {
   },
   plugins: [
     new webpack.NormalModuleReplacementPlugin(/.\/fixtures\/savegame/, "./fixtures/lategame"),
+    new webpack.NormalModuleReplacementPlugin(
+      /.\/fixtures\/settings/,
+      "./fixtures/localstorage.json"
+    ),
   ],
   resolve: {
     extensions: [".ts", ".js"],