gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: output app version number just like core (#962)

Browse Source
This commit is contained in:
Daniel Lautzenheiser 2023-10-31 09:12:26 -04:00 committed by GitHub
parent e7dd7bdb2a
commit bf0c5b6971
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/app/.eslintrc.js
View File

@ -15,7 +15,7 @@ module.exports = {
'cypress/globals': true, 'cypress/globals': true,
}, },
globals: { globals: {
STATIC_CMS_CORE_VERSION: false, STATIC_CMS_APP_VERSION: false,
CMS_ENV: false, CMS_ENV: false,
}, },
rules: { rules: {

4
packages/app/babel.config.js
View File

@ -1,6 +1,6 @@
const path = require('path'); const path = require('path');
const coreVersion = require('./package.json').version; const appVersion = require('./package.json').version;
const isProduction = process.env.NODE_ENV === 'production'; const isProduction = process.env.NODE_ENV === 'production';
const isTest = process.env.NODE_ENV === 'test'; const isTest = process.env.NODE_ENV === 'test';
const isESM = process.env.NODE_ENV === 'esm'; const isESM = process.env.NODE_ENV === 'esm';
@ -59,7 +59,7 @@ function plugins() {
[ [
'transform-define', 'transform-define',
{ {
STATIC_CMS_CORE_VERSION: `${coreVersion}`, STATIC_CMS_APP_VERSION: `${appVersion}`,
}, },
], ],
[ [

4
packages/app/webpack.config.js
View File

@ -3,6 +3,7 @@ const webpack = require('webpack');
const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin'); const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin'); const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const pkg = require('./package.json');
const isProduction = process.env.NODE_ENV === 'production'; const isProduction = process.env.NODE_ENV === 'production';
const devServerPort = parseInt(process.env.STATIC_CMS_DEV_SERVER_PORT || `${8080}`); const devServerPort = parseInt(process.env.STATIC_CMS_DEV_SERVER_PORT || `${8080}`);
@ -90,6 +91,9 @@ module.exports = {
process: 'process/browser', process: 'process/browser',
Buffer: ['buffer', 'Buffer'], Buffer: ['buffer', 'Buffer'],
}), }),
new webpack.DefinePlugin({
STATIC_CMS_APP_VERSION: JSON.stringify(`${pkg.version}${isProduction ? '' : '-dev'}`),
}),
].filter(Boolean), ].filter(Boolean),
output: { output: {
path: path.resolve(__dirname, 'dist'), path: path.resolve(__dirname, 'dist'),

4
packages/core/src/bootstrap.tsx
View File

@ -81,7 +81,9 @@ function bootstrap<F extends BaseField = UnknownField>(opts?: {
/** /**
* Log the version number. * Log the version number.
*/ */
if (typeof STATIC_CMS_CORE_VERSION === 'string') { if (typeof STATIC_CMS_APP_VERSION === 'string') {
console.info(`[StaticCMS] Using @staticcms/app ${STATIC_CMS_APP_VERSION}`);
} else if (typeof STATIC_CMS_CORE_VERSION === 'string') {
console.info(`[StaticCMS] Using @staticcms/core ${STATIC_CMS_CORE_VERSION}`); console.info(`[StaticCMS] Using @staticcms/core ${STATIC_CMS_CORE_VERSION}`);
} }

6
packages/core/src/components/ErrorBoundary.tsx
View File

@ -51,8 +51,10 @@ ${config}
function buildIssueTemplate(config?: Config) { function buildIssueTemplate(config?: Config) {
let version = ''; let version = '';
if (typeof STATIC_CMS_CORE_VERSION === 'string') { if (typeof STATIC_CMS_APP_VERSION === 'string') {
version = `static-cms@${STATIC_CMS_CORE_VERSION}`; version = `@staticcms/app@${STATIC_CMS_APP_VERSION}`;
} else if (typeof STATIC_CMS_CORE_VERSION === 'string') {
version = `@staticcms/core@${STATIC_CMS_CORE_VERSION}`;
} }
const template = getIssueTemplate( const template = getIssueTemplate(
version, version,

1
packages/core/src/types/constants.d.ts vendored
View File

@ -1 +1,2 @@
declare const STATIC_CMS_CORE_VERSION: string; declare const STATIC_CMS_CORE_VERSION: string;
declare const STATIC_CMS_APP_VERSION: string;

1
packages/docs/.eslintrc.js
View File

@ -15,7 +15,6 @@ module.exports = {
jest: true, jest: true,
}, },
globals: { globals: {
STATIC_CMS_CORE_VERSION: false,
CMS_ENV: false, CMS_ENV: false,
}, },
rules: { rules: {

6
packages/tools/babel.config.js
View File

@ -56,12 +56,6 @@ function plugins() {
if (isESM) { if (isESM) {
return [ return [
...defaultPlugins, ...defaultPlugins,
[
'transform-define',
{
STATIC_CMS_CORE_VERSION: `${coreVersion}`,
},
],
[ [
'inline-react-svg', 'inline-react-svg',
{ {