read frontend version from VERSION file instead latest git revision

This commit is contained in:
Omer Lachish
2018-11-29 11:57:53 +02:00
parent 8dc10fbd9a
commit c15fa0c592
4 changed files with 6 additions and 7 deletions

1
VERSION Normal file
View File

@@ -0,0 +1 @@
dev

View File

@@ -5,9 +5,9 @@ import { react2angular } from 'react2angular';
export function Footer({ clientConfig, currentUser }) {
const backendVersion = clientConfig.version;
/* global COMMIT */
/* global FRONTEND_VERSION */
/* eslint no-undef: "error" */
const frontendVersion = COMMIT;
const frontendVersion = FRONTEND_VERSION;
const newVersionAvailable = clientConfig.newVersionAvailable && currentUser.isAdmin;
const separator = ' \u2022 ';

View File

@@ -110,7 +110,6 @@
"eslint-plugin-react": "^7.7.0",
"estraverse": "^4.2.0",
"file-loader": "^2.0.0",
"git-revision-webpack-plugin": "^3.0.3",
"html-webpack-plugin": "^3.2.0",
"jest": "^23.6.0",
"less": "^2.7.3",
@@ -120,6 +119,7 @@
"raw-loader": "^0.5.1",
"react-test-renderer": "^16.5.2",
"request": "^2.88.0",
"shelljs": "^0.8.3",
"url-loader": "^0.5.9",
"webpack": "^4.20.2",
"webpack-build-notifier": "^0.1.16",

View File

@@ -10,8 +10,7 @@ const CopyWebpackPlugin = require("copy-webpack-plugin");
const LessPluginAutoPrefix = require("less-plugin-autoprefix");
const BundleAnalyzerPlugin = require("webpack-bundle-analyzer")
.BundleAnalyzerPlugin;
const GitRevisionPlugin = require("git-revision-webpack-plugin")
const gitRevisionPlugin = new GitRevisionPlugin()
const shell = require('shelljs');
const path = require("path");
@@ -44,10 +43,9 @@ const config = {
},
plugins: [
new WebpackBuildNotifierPlugin({ title: "Redash" }),
gitRevisionPlugin,
new webpack.DefinePlugin({
ON_TEST: process.env.NODE_ENV === "test",
COMMIT: JSON.stringify(gitRevisionPlugin.version())
FRONTEND_VERSION: JSON.stringify(shell.cat('VERSION').toString().trim())
}),
// Enforce angular to use jQuery instead of jqLite
new webpack.ProvidePlugin({ "window.jQuery": "jquery" }),