fix extension versioning

cryptolandtech · Mar 15, 2019 · bf2780d · bf2780d
1 parent dd0a9ff
commit bf2780d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/scripts/update-extension-version.js b/scripts/update-extension-version.js
@@ -1,14 +1,11 @@
 const fs = require('fs');
 const resolve = require('path').resolve;
 const manifest = require('../src/extension/manifest.json');
-const BUILD = process.env.TRAVIS_BUILD_NUMBER;
-const VERSION_FILE_PATH = resolve(__dirname, '../src/extension/version.ts');
+const packageJson = require('../package.json');
 
-const VERSION_PATTERN = `export const VERSION = "%%VERSION%%";`;
+manifest.version = packageJson.version;
 
-let VER = manifest.version;
-if (BUILD) {
-    VER += '.' + BUILD;
-}
-
-fs.writeFileSync(VERSION_FILE_PATH, VERSION_PATTERN.replace('%%VERSION%%', VER));
+fs.writeFileSync(
+    resolve(__dirname, '../src/extension/manifest.json'),
+    JSON.stringify(manifest, null, 4)
+);
diff --git a/src/extension/index.tsx b/src/extension/index.tsx
@@ -9,11 +9,11 @@ import { Blockchain } from 'moonlet-core/src/core/blockchain';
 import { createLoadWallet } from '../app/data/wallet/actions';
 import { ExtensionWalletProvider } from './wallet-provider';
 
-import { VERSION } from './version';
 import { browser } from 'webextension-polyfill-ts';
 import { createSetPreferences } from '../app/data/user-preferences/actions';
 import { createUpdateConversionRates } from '../app/data/currency/actions';
-import { getSwitchNetworkConfig } from '../app/utils/blockchain/utils';
+
+import manifest from './manifest.json';
 
 const USER_PREFERENCES_STORAGE_KEY = 'userPref';
 
@@ -37,7 +37,7 @@ const store = getStore({
         selectedAccount: 0
     },
     extension: {
-        version: VERSION
+        version: manifest.version
     },
     userPreferences: undefined
 });

diff --git a/src/extension/manifest.json b/src/extension/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "Moonlet Wallet",
-    "version": "0.4",
+    "version": "0.0.0",
     "description": "Moonlet Wallet Extension",
     "permissions": ["storage"],
     "background": {

diff --git a/src/extension/version.ts b/src/extension/version.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -13,6 +13,7 @@
         "keyofStringsOnly": true,
         "noImplicitAny": false,
         "allowSyntheticDefaultImports": true,
-        "typeRoots": ["node_modules/@types"]
+        "typeRoots": ["node_modules/@types"],
+        "resolveJsonModule": true
     }
 }