diff --git a/package.json b/package.json index 2c1c19e..14e312a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "name": "simplelogin-extension", - "version": "1.10.0.1", + "version": "1.10.0", + "betaRev": "1", "description": "SimpleLogin Browser Extension", "author": "son@simplelogin.io", "license": "MIT", diff --git a/scripts/build-zip.js b/scripts/build-zip.js index 9c72be9..9f9a70c 100644 --- a/scripts/build-zip.js +++ b/scripts/build-zip.js @@ -11,19 +11,11 @@ const extractExtensionData = () => { const extPackageJson = require('../package.json'); const distManifestJson = require('../dist/manifest.json'); const isBeta = distManifestJson.name.match(/beta/i); - const verPartsCount = extPackageJson.version.split('.').length; - - if (isBeta && verPartsCount !== 4) { - console.error('Invalid Beta version number'); - process.exit(); - } else if (!isBeta && verPartsCount !== 3) { - console.error('Invalid Release version number'); - process.exit(); - } + const betaRev = extPackageJson.betaRev; return { name: extPackageJson.name + (isBeta ? '-beta' : '-release'), - version: extPackageJson.version + version: extPackageJson.version + (isBeta ? ('.' + betaRev) : ''), } }; diff --git a/webpack.config.js b/webpack.config.js index 351d130..1662a4a 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -4,7 +4,7 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const CopyWebpackPlugin = require('copy-webpack-plugin'); const ExtensionReloader = require('webpack-extension-reloader'); const { VueLoaderPlugin } = require('vue-loader'); -const { version } = require('./package.json'); +const { version, betaRev } = require('./package.json'); const fs = require('fs'); const devConfig = fs.existsSync('./.dev.json') @@ -106,6 +106,8 @@ const config = { '48': 'icons/icon_beta_48.png', '128': 'icons/icon_beta_128.png' }; + + jsonContent['version'] = version + '.' + betaRev; } return JSON.stringify(jsonContent, null, 2);