@movable/studio-framework-build-config 3.1.1-error-logging → 3.2.0-app-validation

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@movable/studio-framework-build-config",
-  "version": "3.1.1-error-logging",
+  "version": "3.2.0-app-validation",
   "license": "MIT",
   "private": false,
   "author": "Movable Ink",
@@ -13,8 +13,8 @@
     "@babel/plugin-transform-runtime": "^7.13.15",
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-react": "^7.14.5",
-    "@movable/rollup-plugin-manifest-merger": "^3.1.1-error-logging",
-    "@movable/rollup-plugin-package-manifest-validator": "^3.1.1-error-logging",
+    "@movable/rollup-plugin-manifest-merger": "^3.2.0-app-validation",
+    "@movable/rollup-plugin-package-manifest-validator": "^3.2.0-app-validation",
     "@rollup/plugin-terser": "^0.4.0",
     "@rollup/plugin-url": "^6.0.0",
     "esbuild": "^0.15.14",
@@ -45,5 +45,5 @@
   "volta": {
     "extends": "../../package.json"
   },
-  "gitHead": "2bec2fbb76f33c38f10c8b26fafd065c2bc0a8a6"
+  "gitHead": "4480978dc5c4fdc28f0dd55f569fe6d8344f6469"
 }

package/src/apps/rollup.js

@@ -13,6 +13,7 @@ const { manifestMerger } = require('@movable/rollup-plugin-manifest-merger');
 const { importExportToGlobal, dependenciesOnly } = require('rollup-split-index');
 const babelrc = require('./babel');
 const buildDataLoader = require('./data-loader');
+const { manifestValidatorPluginApps } = require('@movable/rollup-plugin-manifest-validator');
 
 module.exports = function rollupConfig(passedConfig = {}) {
   const inputFile = 'app/index.js';
@@ -24,35 +25,37 @@ module.exports = function rollupConfig(passedConfig = {}) {
     ...passedConfig
   };
 
+  const plugins = [
+    manifestMerger({ output: 'manifest.yml', ignoreFrameworkVersionUpdate: true }),
+    babel(babelrc),
+    resolve(),
+    commonjs(),
+    postcss({
+      modules: false
+    }),
+    copy({
+      assets: glob.sync('**/app/*.{png,jpg,jpeg}')
+    }),
+    image(),
+    json(),
+    dependenciesOnly(),
+    replace({
+      'process.env.NODE_ENV': JSON.stringify('production')
+    }),
+    config.dataLoader ? buildDataLoader(config.dataLoader) : null,
+    config.minify
+      ? terser({
+          ecma: 2022,
+          sourceMap: true,
+          format: { comments: false, ecma: 2022 }
+        })
+      : null,
+    config.serve ? serve() : null
+  ].filter(Boolean);
+
   const vendorTree = {
     input: inputFile,
-    plugins: [
-      manifestMerger({ output: 'manifest.yml', ignoreFrameworkVersionUpdate: true }),
-      babel(babelrc),
-      resolve(),
-      commonjs(),
-      postcss({
-        modules: false
-      }),
-      copy({
-        assets: glob.sync('**/app/*.{png,jpg,jpeg}')
-      }),
-      image(),
-      json(),
-      dependenciesOnly(),
-      replace({
-        'process.env.NODE_ENV': JSON.stringify('production')
-      }),
-      config.dataLoader ? buildDataLoader(config.dataLoader) : null,
-      config.minify
-        ? terser({
-            ecma: 2022,
-            sourceMap: true,
-            format: { comments: false, ecma: 2022 }
-          })
-        : null,
-      config.serve ? serve() : null
-    ].filter(Boolean),
+    plugins: plugins,
     output: {
       name: 'studioDependencies',
       dir: './',
@@ -61,6 +64,8 @@ module.exports = function rollupConfig(passedConfig = {}) {
     }
   };
 
+  plugins.splice(1, 0, manifestValidatorPluginApps({ manifestPath: 'app-manifest.yml' }));
+
   const indexTree = {
     input: inputFile,
     plugins: [

package/src/packages/rollup.js

@@ -11,7 +11,7 @@ const {
   manifestMerger,
   inputFile
 } = require('@movable/rollup-plugin-manifest-merger');
-const { manifestValidatorPlugin } = require('@movable/rollup-plugin-package-manifest-validator');
+const { manifestValidatorPluginPackages } = require('@movable/rollup-plugin-manifest-validator');
 const babelConf = require('./babel');
 
 const reactBase = require.resolve('react');
@@ -44,7 +44,11 @@ module.exports = function rollupConfig(pkg) {
     ];
 
     if (!process.env.SKIP_VALIDATION)
-      plugins.splice(1, 0, manifestValidatorPlugin({ manifestPath: 'package-manifest.yml' }));
+      plugins.splice(
+        1,
+        0,
+        manifestValidatorPluginPackages({ manifestPath: 'package-manifest.yml' })
+      );
 
     return {
       input: inputFile,
@@ -75,7 +79,11 @@ module.exports = function rollupConfig(pkg) {
     ];
 
     if (!process.env.SKIP_VALIDATION)
-      plugins.splice(1, 0, manifestValidatorPlugin({ manifestPath: 'package-manifest.yml' }));
+      plugins.splice(
+        1,
+        0,
+        manifestValidatorPluginPackages({ manifestPath: 'package-manifest.yml' })
+      );
 
     return {
       output: [