From 1b024ee01cf9c49c5bad3b19cbd3ffd9c458a928 Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Fri, 25 Feb 2022 22:52:32 +0200 Subject: [PATCH] [Dev] Fix dev mode on Windows (#1722) --- package.json | 2 +- webpack.config.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 76a946c46..e6ad90917 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "", "main": "index.js", "scripts": { - "dev": "cross-env APP_ENV=development APP_VERSION=$(npm run print_version --silent) webpack serve --env mode=dev --env isDevServer --mode development --config ./webpack.config.js", + "dev": "cross-env APP_ENV=development webpack serve --env mode=dev --env isDevServer --mode development --config ./webpack.config.js", "build": "webpack --mode production", "build:staging": "rm -rf dist/ && APP_ENV=staging APP_VERSION=$(npm run print_version --silent) npm run build && ./deploy/copy_to_dist.sh", "build:production": "npm i && rm -rf dist/ && APP_VERSION=$(npm run inc_version --silent) APP_ENV=production npm run build && ./deploy/copy_to_dist.sh", diff --git a/webpack.config.js b/webpack.config.js index 1b3f38ca0..c46caf187 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -14,6 +14,7 @@ const { GitRevisionPlugin } = require('git-revision-webpack-plugin'); const gitRevisionPlugin = new GitRevisionPlugin(); const branch = process.env.HEAD || gitRevisionPlugin.branch(); const appRevision = (!branch || branch === 'HEAD') ? gitRevisionPlugin.commithash().substring(0, 7) : branch; +const appVersion = require('./package.json').version; dotenv.config(); @@ -121,7 +122,7 @@ module.exports = (env = {}, argv = {}) => { new EnvironmentPlugin({ APP_ENV: 'production', APP_NAME: null, - APP_VERSION: undefined, + APP_VERSION: appVersion, APP_REVISION: appRevision, TELEGRAM_T_API_ID: undefined, TELEGRAM_T_API_HASH: undefined,