fix(Thema): Simplify Thema version resolution logic

stencila · Apr 7, 2020 · 31ce7d0 · 31ce7d0
1 parent 6c09dcb
commit 31ce7d0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/browser/index.ts b/src/browser/index.ts
@@ -1,4 +1,5 @@
 import { themes } from '../themes'
+import { version } from '../../package.json'
 
 export { themes }
 
@@ -7,8 +8,7 @@ export interface ThemaAssets {
   scripts: string[]
 }
 
-const themaVersion = process.env.VERSION ?? '1'
-const themaMajor = themaVersion.split('.')[0]
+const themaMajor = version.split('.')[0]
 
 /**
  * The path to a theme in this package

diff --git a/webpack.config.js b/webpack.config.js
@@ -1,6 +1,5 @@
 const globby = require('globby')
 const path = require('path')
-const pkgJson = require('./package.json')
 
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const FileManagerPlugin = require('filemanager-webpack-plugin')
@@ -103,10 +102,7 @@ module.exports = (env = {}, { mode }) => {
       new CleanWebpackPlugin(),
       new DefinePlugin({
         'process.env.ASSET_PATH': JSON.stringify(ASSET_PATH),
-        'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
-        'process.env.VERSION': JSON.stringify(
-          process.env.VERSION || pkgJson.version
-        )
+        'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV)
       }),
       new MiniCssExtractPlugin(),
       ...docsPlugins,