Fix broken build number

pixel-point · May 27, 2019 · 630cd6b · 630cd6b
1 parent 1d02a6f
commit 630cd6b
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 31 deletions.
diff --git a/.electron-vue/build.js b/.electron-vue/build.js
@@ -28,14 +28,14 @@ if (process.env.BUILD_TARGET === 'clean') clean()
 else if (process.env.BUILD_TARGET === 'web') web()
 else build()
 
-function clean () {
+function clean() {
   del.sync(['build/*', '!build/icons', '!build/icons/icon.*'])
   console.log(`\n${doneLog}\n`)
   process.exit()
 }
 
-async function build () {
-  await setBuildVersionAndNumber()
+async function build() {
+  const [ver, buildNumber] = await setBuildVersionAndNumber()
 
   del.sync(['dist/electron/*', '!.gitkeep'])
 
@@ -64,7 +64,15 @@ async function build () {
     process.exit(1)
   })
 
-  pack(rendererConfig).then(result => {
+  pack({
+    ...rendererConfig,
+    plugins: [
+      ...rendererConfig.plugins,
+      new webpack.DefinePlugin({
+        'process.env.BUILD': `"${buildNumber}"`
+      }),
+    ]
+  }).then(result => {
     results += result + '\n\n'
     m.success('renderer')
   }).catch(err => {
@@ -84,14 +92,19 @@ async function build () {
 }
 
 async function setBuildVersionAndNumber() {
+  const { version } = packageJson
+  const buildNumber = dateFormat(new Date(), 'yyyyddmm-HHMMss', true)
+
   await mkdirp(path.resolve(__dirname, '../build'))
-  return Promise.all([
-    fs.writeFile(path.resolve(__dirname, '../build/.number'), dateFormat(new Date(), "yyyyddmm-HHMMss", true)),
-    fs.writeFile(path.resolve(__dirname, '../build/.version'), packageJson.version),
+  await Promise.all([
+    fs.writeFile(path.resolve(__dirname, '../build/.number'), buildNumber),
+    fs.writeFile(path.resolve(__dirname, '../build/.version'), version),
   ])
+
+  return [version, buildNumber]
 }
 
-function pack (config) {
+function pack(config) {
   return new Promise((resolve, reject) => {
     config.mode = 'production'
     webpack(config, (err, stats) => {
@@ -103,10 +116,10 @@ function pack (config) {
           chunks: false,
           colors: true
         })
-        .split(/\r?\n/)
-        .forEach(line => {
-          err += `    ${line}\n`
-        })
+          .split(/\r?\n/)
+          .forEach(line => {
+            err += `    ${line}\n`
+          })
 
         reject(err)
       } else {
@@ -119,7 +132,7 @@ function pack (config) {
   })
 }
 
-function web () {
+function web() {
   del.sync(['dist/web/*', '!.gitkeep'])
   webConfig.mode = 'production'
   webpack(webConfig, (err, stats) => {
@@ -147,11 +160,11 @@ async function prepareLogo() {
       .background('none')
       .rotate('none', 45)
       .resize(512, 512)
-      .write(path.resolve(__dirname, '../build/icons/256x256.png'), function (err) {
+      .write(path.resolve(__dirname, '../build/icons/256x256.png'), function(err) {
         if (err) reject(err)
         else resolve()
-      });
+      })
   })
 
-  return createIconsDir.then(() => Promise.all([x256]) )
+  return createIconsDir.then(() => Promise.all([x256]))
 }
diff --git a/.electron-vue/webpack.renderer.config.js b/.electron-vue/webpack.renderer.config.js
@@ -31,17 +31,6 @@ let rendererConfig = {
   ],
   module: {
     rules: [
-      // {
-      //   test: /\.(js|vue)$/,
-      //   enforce: 'pre',
-      //   exclude: /node_modules/,
-      //   use: {
-      //     loader: 'eslint-loader',
-      //     options: {
-      //       formatter: require('eslint-friendly-formatter')
-      //     }
-      //   }
-      // },
       {
         test: /\.scss$/,
         use: ['vue-style-loader', 'css-loader', 'sass-loader']
@@ -121,7 +110,7 @@ let rendererConfig = {
   },
   plugins: [
     new VueLoaderPlugin(),
-    new MiniCssExtractPlugin({filename: 'styles.css'}),
+    new MiniCssExtractPlugin({ filename: 'styles.css' }),
     new HtmlWebpackPlugin({
       filename: 'index.html',
       template: path.resolve(__dirname, '../src/index.ejs'),
@@ -179,8 +168,7 @@ if (process.env.NODE_ENV === 'production') {
       }
     ]),
     new webpack.DefinePlugin({
-      'process.env.NODE_ENV': '"production"',
-      'process.env.BUILD': `"${process.env.BUILD}"`
+      'process.env.NODE_ENV': '"production"'
     }),
     new webpack.LoaderOptionsPlugin({
       minimize: true

diff --git a/src/renderer/components/Layout/Toolbar.vue b/src/renderer/components/Layout/Toolbar.vue
@@ -18,7 +18,12 @@ export default {
   },
   methods: {
     showVerbose() {
-      const message = `Version label: ${this.version}\nVersion: ${packageJs.version}\nBuild: ${process.env.BUILD}`
+      const message = [
+        `Version label: ${this.version}`,
+        `Version: ${packageJs.version}`,
+        `Build: ${process.env.BUILD}`,
+        `Env: ${process.env.NODE_ENV}`
+      ].join('\n')
       showMessageBox(message)
     }
   }