@modern-js/app-tools 2.0.0-beta.0 → 2.0.0-beta.1

package/dist/js/modern/builder/createSourceConfig.js

@@ -10,12 +10,10 @@ export function createSourceConfig(normalizedConfig, appContext) {
     preEntry
   } = normalizedConfig.source;
   const builderGlobalVars = globalVars || {};
-
   for (const envVar of envVars || []) {
     const envVarValue = process.env[envVar];
     envVarValue && (builderGlobalVars[`process.env.${envVar}`] = envVarValue);
   }
-
   const builderModuleScope = createBuilderModuleScope(moduleScopes);
   const builderInclude = createBuilderInclude(include, appContext);
   return {
@@ -35,35 +33,28 @@ export function createBuilderInclude(include, appContext) {
       if (isAbsolute(include)) {
         return include;
       }
-
       return new RegExp(include);
     }
-
     return include;
   }).concat(defaultInclude); // concat default Include
 
   const root = findMonorepoRoot(appContext.appDirectory);
-
   if (!root) {
     return transformInclude;
   }
-
   const modernjsMonorepo = isModernjsMonorepo(root);
-
   if (modernjsMonorepo) {
     const paths = globby.sync(posix.join(root, 'features', '**', 'package.json'), {
       ignore: ['**/node_modules/**/*']
     }).map(pathname => dirname(pathname) + sep);
     return [...paths, ...transformInclude];
   }
-
   return transformInclude;
 }
 export function createBuilderModuleScope(moduleScopes) {
   if (moduleScopes) {
     let builderModuleScope = [];
     const DEFAULT_SCOPES = ['./src', './shared', /node_modules/];
-
     if (Array.isArray(moduleScopes)) {
       if (isPrimitiveScope(moduleScopes)) {
         builderModuleScope = DEFAULT_SCOPES.concat(moduleScopes);
@@ -73,12 +64,10 @@ export function createBuilderModuleScope(moduleScopes) {
     } else {
       builderModuleScope = [DEFAULT_SCOPES, moduleScopes];
     }
-
     return builderModuleScope;
   } else {
     return undefined;
   }
-
   function isPrimitiveScope(items) {
     return items.every(item => typeof item === 'string' || Object.prototype.toString.call(item) === '[object RegExp]');
   }

package/dist/js/modern/builder/createToolsConfig.js

@@ -1,9 +1,6 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import { applyOptionsChain } from '@modern-js/utils';
 export function createToolsConfig(normalizedConfig) {
   const {
@@ -50,18 +47,16 @@ export function createToolsConfig(normalizedConfig) {
       minify: typeof config.minify === 'object' ? _objectSpread(_objectSpread({}, config.minify), {}, {
         removeComments: false
       }) : config.minify
-    }), // eslint-disable-next-line no-nested-ternary
+    }),
+    // eslint-disable-next-line no-nested-ternary
     ...(Array.isArray(htmlPlugin) ? htmlPlugin : htmlPlugin ? [htmlPlugin] : [])]
   };
 }
-
 function createBuilderTsLoader(tsLoader, enableTsLoader) {
   const useTsLoader = Boolean(enableTsLoader);
-
   if (!useTsLoader) {
     return undefined;
   }
-
   const defaultTsLoader = {
     compilerOptions: {
       target: 'es5',
@@ -72,12 +67,10 @@ function createBuilderTsLoader(tsLoader, enableTsLoader) {
   };
   return (_, utils) => applyOptionsChain(defaultTsLoader, tsLoader, utils);
 }
-
 export function createBuilderTsChecker(output) {
-  if (output.enableTsLoader || output.disableTsChecker) {
+  if (output.enableTsLoader) {
     return false;
   }
-
   const defaultTsChecker = {
     issue: {
       include: [{

package/dist/js/modern/builder/index.js

@@ -1,34 +1,37 @@
 import { createBuilder } from '@modern-js/builder';
 import { builderWebpackProvider } from '@modern-js/builder-webpack-provider';
-import { applyOptionsChain } from '@modern-js/utils';
+import { applyOptionsChain, isUseSSRBundle } from '@modern-js/utils';
 import { PluginCompatModern } from "./builderPlugins/compatModern";
 import { createHtmlConfig } from "./createHtmlConfig";
 import { createOutputConfig } from "./createOutputConfig";
 import { createSourceConfig } from "./createSourceConfig";
 import { createToolsConfig } from "./createToolsConfig";
-export default (async ({
-  target: _target = 'web',
-  normalizedConfig,
-  appContext,
-  compatPluginConfig
-}) => {
-  const targets = Array.isArray(_target) ? _target : [_target];
-
+function getBuilderTargets(normalizedConfig) {
+  const targets = ['web'];
   if (normalizedConfig.output.enableModernMode && !targets.includes('modern-web')) {
     targets.push('modern-web');
   }
-
-  const builderConfig = createBuilderProviderConfig(normalizedConfig, appContext); // create webpack provider
-
+  if (isUseSSRBundle(normalizedConfig)) {
+    targets.push('node');
+  }
+  return targets;
+}
+export async function createBuilderForEdenX({
+  normalizedConfig,
+  appContext,
+  compatPluginConfig
+}) {
+  const builderConfig = createBuilderProviderConfig(normalizedConfig, appContext);
+  // create webpack provider
   const webpackProvider = builderWebpackProvider({
     builderConfig
   });
-  const builderOptions = createBuilderOptions(_target, appContext);
+  const target = getBuilderTargets(normalizedConfig);
+  const builderOptions = createBuilderOptions(target, appContext);
   const builder = await createBuilder(webpackProvider, builderOptions);
   await applyBuilderPlugins(builder, normalizedConfig, appContext, compatPluginConfig);
   return builder;
-});
-
+}
 function createBuilderProviderConfig(normalizedConfig, appContext) {
   const source = createSourceConfig(normalizedConfig, appContext);
   const html = createHtmlConfig(normalizedConfig, appContext);
@@ -39,21 +42,24 @@ function createBuilderProviderConfig(normalizedConfig, appContext) {
     html,
     output,
     tools,
+    dev: {
+      https: normalizedConfig.dev.https,
+      assetPrefix: normalizedConfig.dev.assetPrefix
+    },
     performance: {
       // `@modern-js/webpack` used to remove moment locale by default
       removeMomentLocale: true
     }
   };
 }
-
 export function createBuilderOptions(target, appContext) {
   // create entries
+
   const entries = {};
   const {
     entrypoints = [],
     checkedEntries
   } = appContext;
-
   for (const {
     entryName,
     entry
@@ -61,14 +67,12 @@ export function createBuilderOptions(target, appContext) {
     if (checkedEntries && !checkedEntries.includes(entryName)) {
       continue;
     }
-
     if (entryName in entries) {
       entries[entryName].push(entry);
     } else {
       entries[entryName] = [entry];
     }
   }
-
   return {
     cwd: appContext.appDirectory,
     target,
@@ -77,10 +81,10 @@ export function createBuilderOptions(target, appContext) {
     framework: appContext.metaName
   };
 }
+
 /**
  * register builder Plugin by condition
  */
-
 async function applyBuilderPlugins(builder, normalizedConfig, appContext, compatPluginConfig) {
   if (!normalizedConfig.output.disableNodePolyfill) {
     const {
@@ -88,7 +92,6 @@ async function applyBuilderPlugins(builder, normalizedConfig, appContext, compat
     } = await import('@modern-js/builder-plugin-node-polyfill');
     builder.addPlugins([PluginNodePolyfill()]);
   }
-
   if (normalizedConfig.tools.esbuild) {
     const {
       esbuild: esbuildOptions
@@ -101,6 +104,5 @@ async function applyBuilderPlugins(builder, normalizedConfig, appContext, compat
       minimize: applyOptionsChain({}, esbuildOptions)
     })]);
   }
-
   builder.addPlugins([PluginCompatModern(appContext, normalizedConfig, compatPluginConfig)]);
 }

package/dist/js/modern/builder/share.js

@@ -6,19 +6,16 @@ export function createCopyPattern(appContext, config, patternsType, chain) {
   const uploadDir = path.posix.join(configDir.replace(/\\/g, '/'), 'upload');
   const publicDir = path.posix.join(configDir.replace(/\\/g, '/'), 'public');
   const minifiedJsRexExp = /\.min\.js/;
-
   const info = file => ({
     // If the file name ends with `.min.js`, we assume it's a compressed file.
     // So we don't want copy-webpack-plugin to minify it.
     // ref: https://github.com/webpack-contrib/copy-webpack-plugin#info
     minimized: minifiedJsRexExp.test(file.sourceFilename)
   });
-
   if (patternsType === 'public') {
     if (!chain) {
       throw new Error("expect get a webpackChain, but receive 'undefined'");
     }
-
     return {
       info,
       from: '**/*',
@@ -30,7 +27,6 @@ export function createCopyPattern(appContext, config, patternsType, chain) {
         if (!/\.html?$/.test(absoluteFrom)) {
           return content;
         }
-
         return lodashTemplate(content.toString('utf8'))({
           assetPrefix: removeTailSlash(chain.output.get('publicPath'))
         });

package/dist/js/modern/builder/webpackPlugins/htmlAsyncChunkPlugin.js

@@ -1,37 +1,29 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 export class HtmlAsyncChunkPlugin {
   constructor(htmlWebpackPlugin) {
     _defineProperty(this, "name", void 0);
-
     _defineProperty(this, "htmlWebpackPlugin", void 0);
-
     this.name = 'HtmlAsyncChunkPlugin';
     this.htmlWebpackPlugin = htmlWebpackPlugin;
   }
-
   apply(compiler) {
     compiler.hooks.compilation.tap(this.name, compilation => {
       const hooks = this.htmlWebpackPlugin.getHooks(compilation);
       hooks.alterAssetTagGroups.tap(this.name, assets => {
         const tags = [...assets.headTags, ...assets.bodyTags];
-
         for (const tag of tags) {
           if (tag.tagName === 'script') {
             const {
               attributes
             } = tag;
-
             if (attributes && attributes.defer === true) {
               attributes.async = true;
               delete attributes.defer;
             }
           }
         }
-
         return assets;
       });
     });
   }
-
 }

package/dist/js/modern/builder/webpackPlugins/htmlBottomTemplate.js

@@ -1,44 +1,33 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 export class BottomTemplatePlugin {
   constructor(htmlWebpackPlugin) {
     _defineProperty(this, "htmlWebpackPlugin", void 0);
-
     _defineProperty(this, "bottomTemplateReg", /<!--<\?-\s*bottomTemplate\s*\?>-->/);
-
     _defineProperty(this, "bodyRegExp", /(<\/\s*body\s*>)/i);
-
     _defineProperty(this, "name", void 0);
-
     this.htmlWebpackPlugin = htmlWebpackPlugin;
     this.name = 'bottom-template';
   }
-
   apply(compiler) {
     compiler.hooks.compilation.tap(this.name, compilation => {
       this.htmlWebpackPlugin.getHooks(compilation).beforeEmit.tap(this.name, data => {
         var _data$plugin$options;
-
         if (!((_data$plugin$options = data.plugin.options) !== null && _data$plugin$options !== void 0 && _data$plugin$options.__internal__)) {
           return data;
-        } // 含有 <!--<?- bottomTemplate ?>--> 占位符时才需要注入 bottom.html
-
-
+        }
+        // 含有 <!--<?- bottomTemplate ?>--> 占位符时才需要注入 bottom.html
         if (this.bottomTemplateReg.test(data.html)) {
           // 清空占位符
           data.html = data.html.replace(this.bottomTemplateReg, '');
           const {
             bottomTemplate
           } = data.plugin.options;
-
           if (bottomTemplate) {
             data.html = data.html.replace(this.bodyRegExp, match => `\n${bottomTemplate}\n${match}`);
           }
         }
-
         return data;
       });
     });
   }
-
 }

package/dist/js/modern/builder/webpackPlugins/routerPlugin.js

@@ -0,0 +1,97 @@
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+import path from 'path';
+import { fs, ROUTE_MANIFEST, logger, ROUTE_MINIFEST_FILE } from '@modern-js/utils';
+const PLUGIN_NAME = 'ModernjsRoutePlugin';
+export default class RouterPlugin {
+  constructor(options) {
+    _defineProperty(this, "existNestedRoutes", void 0);
+    this.existNestedRoutes = options.existNestedRoutes;
+  }
+  apply(compiler) {
+    const {
+      existNestedRoutes
+    } = this;
+    const {
+      target
+    } = compiler.options;
+    if (target === 'node' || Array.isArray(target) && target.includes('node')) {
+      return;
+    }
+    if (!existNestedRoutes) {
+      return;
+    }
+    const {
+      webpack
+    } = compiler;
+    const {
+      Compilation,
+      sources
+    } = webpack;
+    const {
+      RawSource
+    } = sources;
+    const {
+      PROCESS_ASSETS_STAGE_REPORT
+    } = Compilation;
+    const outputPath = compiler.options.output.path;
+    const newAssetsMap = new Map();
+    const normalizePath = path => {
+      if (!path.endsWith('/')) {
+        return `${path}/`;
+      }
+      return path;
+    };
+    compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
+      compilation.hooks.processAssets.tapPromise({
+        name: PLUGIN_NAME,
+        stage: PROCESS_ASSETS_STAGE_REPORT
+      }, async () => {
+        const stats = compilation.getStats().toJson({
+          chunkGroups: true,
+          chunks: true
+        });
+        const {
+          publicPath
+        } = stats;
+        const routeAssets = {};
+        const {
+          namedChunkGroups,
+          assetsByChunkName
+        } = stats;
+        if (!namedChunkGroups || !assetsByChunkName) {
+          logger.warn('Route manifest does not exist, performance will be affected');
+          return;
+        }
+        for (const [name, chunkGroup] of Object.entries(namedChunkGroups)) {
+          routeAssets[name] = {
+            chunkIds: chunkGroup.chunks,
+            assets: assetsByChunkName[name].map(item => publicPath ? normalizePath(publicPath) + item : item)
+          };
+        }
+        const manifest = {
+          routeAssets
+        };
+        const injectedContent = `
+            ;(function(){
+              window.${ROUTE_MANIFEST} = ${JSON.stringify(manifest)};
+            })();
+          `;
+        const entrypointsArray = Array.from(compilation.entrypoints.entries());
+        const entryChunkIds = entrypointsArray.map(entrypoint => entrypoint[0]);
+        const entryChunks = [...compilation.chunks].filter(chunk => {
+          return entryChunkIds.includes(chunk.name);
+        });
+        const entryChunkFiles = entryChunks.map(chunk => [...chunk.files][0]);
+        for (const file of entryChunkFiles) {
+          const asset = compilation.assets[file];
+          const newContent = `${injectedContent}${asset.source().toString()}`;
+          newAssetsMap.set(path.join(outputPath, file), newContent);
+          compilation.updateAsset(file, new RawSource(newContent));
+        }
+        const filename = path.join(outputPath, ROUTE_MINIFEST_FILE);
+        await fs.ensureFile(filename);
+        await fs.writeFile(filename, JSON.stringify(manifest, null, 2));
+      });
+    });
+  }
+}

package/dist/js/modern/commands/build.js

@@ -1,14 +1,10 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import { ResolvedConfigContext } from '@modern-js/core';
-import { logger, isUseSSRBundle, printBuildError } from '@modern-js/utils';
+import { logger, printBuildError } from '@modern-js/utils';
 import { generateRoutes } from "../utils/routes";
-import { buildServerConfig, emitResolvedConfig } from "../utils/config";
-import createBuilder from "../builder";
+import { buildServerConfig } from "../utils/config";
 export const build = async (api, options) => {
   let resolvedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
@@ -16,7 +12,6 @@ export const build = async (api, options) => {
   const {
     apiOnly
   } = appContext;
-
   if (apiOnly) {
     const {
       appDirectory,
@@ -39,7 +34,6 @@ export const build = async (api, options) => {
     });
     return;
   }
-
   resolvedConfig = _objectSpread(_objectSpread({}, resolvedConfig), {}, {
     cliOptions: options
   });
@@ -54,47 +48,13 @@ export const build = async (api, options) => {
     distDirectory,
     configFile: serverConfigFile
   });
-  const targets = ['web'];
-
-  if (resolvedConfig.output.enableModernMode) {
-    targets.push('modern-web');
-  }
-
-  if (isUseSSRBundle(resolvedConfig)) {
-    targets.push('node');
-  }
-
   try {
-    const builder = await createBuilder({
-      target: targets,
-      appContext,
-      normalizedConfig: resolvedConfig,
-      compatPluginConfig: {
-        async onBeforeBuild({
-          bundlerConfigs
-        }) {
-          await generateRoutes(appContext);
-          await hookRunners.beforeBuild({
-            bundlerConfigs
-          });
-        },
-
-        async onAfterBuild({
-          stats
-        }) {
-          await hookRunners.afterBuild({
-            stats
-          });
-          await emitResolvedConfig(appDirectory, resolvedConfig);
-        }
-
-      }
-    });
+    var _appContext$builder;
     logger.info('Create a production build...\n');
-    await builder.build();
+    await ((_appContext$builder = appContext.builder) === null || _appContext$builder === void 0 ? void 0 : _appContext$builder.build());
   } catch (error) {
-    printBuildError(error); // eslint-disable-next-line no-process-exit
-
+    printBuildError(error);
+    // eslint-disable-next-line no-process-exit
     process.exit(1);
   }
 };

package/dist/js/modern/commands/dev.js

@@ -1,13 +1,9 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { logger, isSSR } from '@modern-js/utils';
+import { logger } from '@modern-js/utils';
 import { ResolvedConfigContext } from '@modern-js/core';
 import { printInstructions } from "../utils/printInstructions";
-import { createDevCompiler } from "../utils/createCompiler";
 import { createServer, injectDataLoaderPlugin } from "../utils/createServer";
 import { generateRoutes } from "../utils/routes";
 import { getSpecifiedEntries } from "../utils/getSpecifiedEntries";
@@ -46,17 +42,10 @@ export const dev = async (api, options) => {
   });
   await hookRunners.beforeDev();
   let compiler = null;
-
   if (!apiOnly) {
-    const target = isSSR(userConfig) ? ['web', 'node'] : ['web'];
-    compiler = await createDevCompiler({
-      target,
-      api,
-      normalizedConfig: userConfig,
-      appContext
-    });
+    var _appContext$builder;
+    compiler = await ((_appContext$builder = appContext.builder) === null || _appContext$builder === void 0 ? void 0 : _appContext$builder.createCompiler());
   }
-
   await generateRoutes(appContext);
   const app = await createServer({
     dev: _objectSpread(_objectSpread({}, {
@@ -81,9 +70,8 @@ export const dev = async (api, options) => {
     if (err) {
       throw err;
     }
-
     if (!apiOnly) {
-      logger.info(`Starting dev server...`);
+      logger.info(`Starting dev server...\n`);
     } else {
       printInstructions(hookRunners, appContext, userConfig);
     }

package/dist/js/modern/commands/inspect.js

@@ -1,28 +1,11 @@
 import { join } from 'path';
-import { isUseSSRBundle } from '@modern-js/utils';
-import createBuilder from "../builder";
 export const inspect = async (api, options) => {
-  const resolvedConfig = api.useResolvedConfigContext();
+  var _appContext$builder;
   const appContext = api.useAppContext();
-  const targets = ['web'];
-
-  if (resolvedConfig.output.enableModernMode) {
-    targets.push('modern-web');
-  }
-
-  if (isUseSSRBundle(resolvedConfig)) {
-    targets.push('node');
-  }
-
-  const builder = await createBuilder({
-    target: targets,
-    appContext,
-    normalizedConfig: resolvedConfig
-  });
-  return builder.inspectConfig({
+  return (_appContext$builder = appContext.builder) === null || _appContext$builder === void 0 ? void 0 : _appContext$builder.inspectConfig({
     env: options.env,
     verbose: options.verbose,
-    outputPath: join(builder.context.distPath, options.output),
+    outputPath: join(appContext === null || appContext === void 0 ? void 0 : appContext.builder.context.distPath, options.output),
     writeToDisk: true
   });
 };

package/dist/js/modern/commands/start.js

@@ -4,7 +4,6 @@ import { printInstructions } from "../utils/printInstructions";
 import { injectDataLoaderPlugin } from "../utils/createServer";
 export const start = async api => {
   var _userConfig$source;
-
   const appContext = api.useAppContext();
   const userConfig = api.useResolvedConfigContext();
   const hookRunners = api.useHookRunners();
@@ -26,7 +25,6 @@ export const start = async api => {
     if (err) {
       throw err;
     }
-
     await printInstructions(hookRunners, appContext, userConfig);
   });
 };