diff --git a/webpack/compilation-info/index.js b/webpack/compilation-info/index.js index 0e78ffa09..22415d2cf 100644 --- a/webpack/compilation-info/index.js +++ b/webpack/compilation-info/index.js @@ -1,12 +1,8 @@ -const commonMeta = require('../../src/client/common.meta.json') -const { altCdn } = require('../cdn') +const runtimeInfo = require('./runtime') const compilationInfo = { - year: new Date().getFullYear(), - version: commonMeta.version, - altCdn, - ...(typeof webpackGitInfo === 'object' ? webpackGitInfo : {}), - // buildTime: Number(new Date()), + ...runtimeInfo, + ...webpackGitInfo, } module.exports = { compilationInfo, diff --git a/webpack/compilation-info/runtime.js b/webpack/compilation-info/runtime.js new file mode 100644 index 000000000..91c027824 --- /dev/null +++ b/webpack/compilation-info/runtime.js @@ -0,0 +1,8 @@ +const commonMeta = require('../../src/client/common.meta.json') +const { altCdn } = require('../cdn') + +module.exports = { + year: new Date().getFullYear(), + version: commonMeta.version, + altCdn, +} diff --git a/webpack/loaders/inject-metadata.js b/webpack/loaders/inject-metadata.js index ee835e261..c422cd823 100644 --- a/webpack/loaders/inject-metadata.js +++ b/webpack/loaders/inject-metadata.js @@ -1,4 +1,5 @@ -const { compilationInfo } = require('../compilation-info') +const runtimeInfo = require('../compilation-info/runtime') +const gitInfo = require('../compilation-info/git') const nodePath = require('path') module.exports = function (babel) { @@ -22,8 +23,8 @@ module.exports = function (babel) { return } targetExpression.properties.push(...[ - types.objectProperty(types.identifier('commitHash'), types.stringLiteral(compilationInfo.commitHash)), - types.objectProperty(types.identifier('coreVersion'), types.stringLiteral(compilationInfo.version)), + types.objectProperty(types.identifier('commitHash'), types.stringLiteral(gitInfo.commitHash)), + types.objectProperty(types.identifier('coreVersion'), types.stringLiteral(runtimeInfo.version)), ]) }) } diff --git a/webpack/webpack.config.js b/webpack/webpack.config.js index 224e57f35..cddb650e4 100644 --- a/webpack/webpack.config.js +++ b/webpack/webpack.config.js @@ -7,7 +7,7 @@ const { cssStyleLoaders, sassStyleLoaders } = require('./loaders/style-loaders') const tsLoader = require('./loaders/ts-loader') -const { compilationInfo } = require('./compilation-info') +const runtimeInfo = require('./compilation-info/runtime') const relativePath = p => path.join(process.cwd(), p) const getDefaultConfig = (srcFolder) => { @@ -156,7 +156,7 @@ const commonMeta = require('../src/client/common.meta.json') const replaceVariables = text => { return text.replace(/\[([^\[\]]+)\]/g, match => { - const value = get(compilationInfo, match) + const value = get(runtimeInfo, match) if (value !== undefined) { return value }