fix: better beta release process + fix isBeta

Author: Guillaume Chau

package.json

@@ -14,7 +14,7 @@
     "zip:chrome": "cd shells && zip -r -FS ../dist/chrome.zip chrome -x *src/* -x *webpack.config.js",
     "zip:firefox": "web-ext build -s shells/chrome -a dist -i src --overwrite-dest",
     "release": "node release.js && npm run test && npm run build && npm run zip",
-    "release:beta": "cross-env CHANNEL=beta && npm run release",
+    "release:beta": "cross-env RELEASE_CHANNEL=beta npm run release",
     "test": "npm run lint && npm run test:e2e",
     "test:e2e": "cross-env PORT=4040 start-server-and-test dev:shell http://localhost:4040 test:e2e:run",
     "test:e2e:run": "cypress run --config baseUrl=http://localhost:4040",

release.js

@@ -4,8 +4,7 @@ const semver = require('semver')
 const pkg = require('./package.json')
 const manifest = require('./shells/chrome/manifest.json')
 
-const curVersion = manifest.version
-const newVersion = process.argv[2]
+const curVersion = pkg.version
 
 ;(async () => {
   const { newVersion } = await inquirer.prompt([{
@@ -31,11 +30,26 @@ const newVersion = process.argv[2]
   }])
 
   if (yes) {
+    const isBeta = newVersion.includes('beta')
     pkg.version = newVersion
-    manifest.version = newVersion
+    if (isBeta) {
+      const [, baseVersion, betaVersion] = /(.*)-beta\.(\w+)/.exec(newVersion)
+      manifest.version = `${baseVersion}.${betaVersion}`
+      applyIcons(manifest, '-beta')
+    } else {
+      manifest.version = newVersion
+      applyIcons(manifest)
+    }
+
     fs.writeFileSync('./package.json', JSON.stringify(pkg, null, 2))
     fs.writeFileSync('./shells/chrome/manifest.json', JSON.stringify(manifest, null, 2))
   } else {
     process.exit(1)
   }
 })()
+
+function applyIcons (manifest, suffix = '') {
+  [16, 48, 128].forEach(size => {
+    manifest.icons[size] = `icons/${size}${suffix}.png`
+  })
+}

shells/chrome/icons/128-beta.png

@@ -68,7 +68,7 @@ module.exports = (config, target = { chrome: 52, firefox: 48 }) => {
       new VueLoaderPlugin(),
       ...(process.env.VUE_DEVTOOL_TEST ? [] : [new FriendlyErrorsPlugin()]),
       new webpack.DefinePlugin({
-        'process.env.CHANNEL': JSON.stringify(process.env.CHANNEL || 'stable')
+        'process.env.RELEASE_CHANNEL': JSON.stringify(process.env.RELEASE_CHANNEL || 'stable')
       })
     ],
     devServer: {

shells/chrome/icons/16-beta.png

@@ -14,7 +14,7 @@ let panelShown = !isChrome
 let pendingAction = null
 
 const isDark = isChrome ? chrome.devtools.panels.themeName === 'dark' : false
-const isBeta = process.env.CHANNEL === 'beta'
+const isBeta = process.env.RELEASE_CHANNEL === 'beta'
 
 // Capture and log devtool errors when running as actual extension
 // so that we can debug it by inspecting the background page.