1
0
Эх сурвалжийг харах

fix: use the actual manifest's version in VM_VER

tophf 4 жил өмнө
parent
commit
b5d6060a1b

+ 5 - 3
gulpfile.js

@@ -51,6 +51,7 @@ async function jsProd() {
  */
 async function manifest() {
   const data = await buildManifest();
+  await fs.mkdir(DIST).catch(() => {});
   await fs.writeFile(`${DIST}/manifest.json`, JSON.stringify(data), 'utf8');
 }
 
@@ -161,12 +162,13 @@ function copyZip() {
   .pipe(gulp.dest(`${DIST}/public/lib`));
 }
 
-const pack = gulp.parallel(manifest, createIcons, copyI18n);
+const pack = gulp.parallel(createIcons, copyI18n, copyZip);
 
 exports.clean = clean;
 exports.manifest = manifest;
-exports.dev = gulp.series(gulp.parallel(copyZip, pack, jsDev), watch);
-exports.build = gulp.series(clean, gulp.parallel(copyZip, pack, jsProd));
+// Making sure `manifest` finishes before its `version` is used by webpack.conf.js
+exports.dev = gulp.series(manifest, gulp.parallel(pack, jsDev), watch);
+exports.build = gulp.series(clean, manifest, gulp.parallel(pack, jsProd));
 exports.i18n = updateI18n;
 exports.check = checkI18n;
 exports.copyI18n = copyI18n;

+ 2 - 2
scripts/webpack.conf.js

@@ -11,8 +11,8 @@ const projectConfig = require('./plaid.conf');
 const mergedConfig = shallowMerge(defaultOptions, projectConfig);
 
 const INIT_FUNC_NAME = 'VMInitInjection';
-// Copied from gulpfile.js: strip alphabetic suffix
-const VM_VER = require('../package.json').version.replace(/-[^.]*/, '');
+// eslint-disable-next-line import/no-dynamic-require
+const VM_VER = require(`${defaultOptions.distDir}/manifest.json`).version;
 const WEBPACK_OPTS = {
   node: {
     global: false,