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

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

@@ -0,0 +1,105 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _path = _interopRequireDefault(require("path"));
+var _utils = require("@modern-js/utils");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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; }
+const PLUGIN_NAME = 'ModernjsRoutePlugin';
+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) {
+          _utils.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.${_utils.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.default.join(outputPath, file), newContent);
+          compilation.updateAsset(file, new RawSource(newContent));
+        }
+        const filename = _path.default.join(outputPath, _utils.ROUTE_MINIFEST_FILE);
+        await _utils.fs.ensureFile(filename);
+        await _utils.fs.writeFile(filename, JSON.stringify(manifest, null, 2));
+      });
+    });
+  }
+}
+exports.default = RouterPlugin;

package/dist/js/node/commands/build.js

@@ -4,33 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.build = void 0;
-
 var _core = require("@modern-js/core");
-
 var _utils = require("@modern-js/utils");
-
 var _routes = require("../utils/routes");
-
 var _config = require("../utils/config");
-
-var _builder = _interopRequireDefault(require("../builder"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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; }
-
 const build = async (api, options) => {
+  if (options !== null && options !== void 0 && options.analyze) {
+    // Builder will read this env var to enable bundle analyzer
+    process.env.BUNDLE_ANALYZE = 'true';
+  }
   let resolvedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
   const hookRunners = api.useHookRunners();
   const {
     apiOnly
   } = appContext;
-
   if (apiOnly) {
     const {
       appDirectory,
@@ -53,13 +44,10 @@ const build = async (api, options) => {
     });
     return;
   }
-
   resolvedConfig = _objectSpread(_objectSpread({}, resolvedConfig), {}, {
     cliOptions: options
   });
-
   _core.ResolvedConfigContext.set(resolvedConfig);
-
   const {
     distDirectory,
     appDirectory,
@@ -70,51 +58,16 @@ const build = async (api, options) => {
     distDirectory,
     configFile: serverConfigFile
   });
-  const targets = ['web'];
-
-  if (resolvedConfig.output.enableModernMode) {
-    targets.push('modern-web');
-  }
-
-  if ((0, _utils.isUseSSRBundle)(resolvedConfig)) {
-    targets.push('node');
-  }
-
   try {
-    const builder = await (0, _builder.default)({
-      target: targets,
-      appContext,
-      normalizedConfig: resolvedConfig,
-      compatPluginConfig: {
-        async onBeforeBuild({
-          bundlerConfigs
-        }) {
-          await (0, _routes.generateRoutes)(appContext);
-          await hookRunners.beforeBuild({
-            bundlerConfigs
-          });
-        },
-
-        async onAfterBuild({
-          stats
-        }) {
-          await hookRunners.afterBuild({
-            stats
-          });
-          await (0, _config.emitResolvedConfig)(appDirectory, resolvedConfig);
-        }
-
-      }
-    });
-
     _utils.logger.info('Create a production build...\n');
-
-    await builder.build();
+    if (!appContext.builder) {
+      throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
+    }
+    await appContext.builder.build();
   } catch (error) {
-    (0, _utils.printBuildError)(error); // eslint-disable-next-line no-process-exit
-
+    (0, _utils.printBuildError)(error);
+    // eslint-disable-next-line no-process-exit
     process.exit(1);
   }
 };
-
 exports.build = build;

package/dist/js/node/commands/deploy.js

@@ -4,11 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.deploy = void 0;
-
 const deploy = async (api, options) => {
   const hookRunners = api.useHookRunners();
   await hookRunners.beforeDeploy(options);
   await hookRunners.afterDeploy(options);
 };
-
 exports.deploy = deploy;

package/dist/js/node/commands/dev.js

@@ -4,39 +4,30 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.dev = void 0;
-
 var _utils = require("@modern-js/utils");
-
 var _core = require("@modern-js/core");
-
+var _createFileWatcher = require("../utils/createFileWatcher");
 var _printInstructions = require("../utils/printInstructions");
-
-var _createCompiler = require("../utils/createCompiler");
-
 var _createServer = require("../utils/createServer");
-
 var _routes = require("../utils/routes");
-
 var _getSpecifiedEntries = require("../utils/getSpecifiedEntries");
-
 var _config = require("../utils/config");
-
 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; }
-
 const dev = async (api, options) => {
-  let userConfig = api.useResolvedConfigContext();
+  var _normalizedConfig$too;
+  if (options.analyze) {
+    // Builder will read this env var to enable bundle analyzer
+    process.env.BUNDLE_ANALYZE = 'true';
+  }
+  let normalizedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
   const hookRunners = api.useHookRunners();
-  userConfig = _objectSpread(_objectSpread({}, userConfig), {}, {
+  normalizedConfig = _objectSpread(_objectSpread({}, normalizedConfig), {}, {
     cliOptions: options
   });
-
-  _core.ResolvedConfigContext.set(userConfig);
-
+  _core.ResolvedConfigContext.set(normalizedConfig);
   const {
     appDirectory,
     distDirectory,
@@ -63,17 +54,12 @@ const dev = async (api, options) => {
   });
   await hookRunners.beforeDev();
   let compiler = null;
-
   if (!apiOnly) {
-    const target = (0, _utils.isSSR)(userConfig) ? ['web', 'node'] : ['web'];
-    compiler = await (0, _createCompiler.createDevCompiler)({
-      target,
-      api,
-      normalizedConfig: userConfig,
-      appContext
-    });
+    if (!appContext.builder) {
+      throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
+    }
+    compiler = await appContext.builder.createCompiler();
   }
-
   await (0, _routes.generateRoutes)(appContext);
   const app = await (0, _createServer.createServer)({
     dev: _objectSpread(_objectSpread({}, {
@@ -86,11 +72,11 @@ const dev = async (api, options) => {
       hot: true,
       liveReload: true,
       port,
-      https: userConfig.dev.https
-    }), userConfig.tools.devServer),
+      https: normalizedConfig.dev.https
+    }), (_normalizedConfig$too = normalizedConfig.tools) === null || _normalizedConfig$too === void 0 ? void 0 : _normalizedConfig$too.devServer),
     compiler,
     pwd: appDirectory,
-    config: userConfig,
+    config: normalizedConfig,
     serverConfigFile,
     internalPlugins: (0, _createServer.injectDataLoaderPlugin)(serverInternalPlugins)
   });
@@ -98,13 +84,12 @@ const dev = async (api, options) => {
     if (err) {
       throw err;
     }
-
     if (!apiOnly) {
-      _utils.logger.info(`Starting dev server...`);
+      _utils.logger.info(`Starting dev server...\n`);
     } else {
-      (0, _printInstructions.printInstructions)(hookRunners, appContext, userConfig);
+      (0, _printInstructions.printInstructions)(hookRunners, appContext, normalizedConfig);
     }
   });
+  await (0, _createFileWatcher.createFileWatcher)(appContext, normalizedConfig.source.configDir, hookRunners);
 };
-
 exports.dev = dev;

package/dist/js/node/commands/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _dev = require("./dev");
-
 Object.keys(_dev).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _dev[key]) return;
@@ -16,9 +14,7 @@ Object.keys(_dev).forEach(function (key) {
     }
   });
 });
-
 var _build = require("./build");
-
 Object.keys(_build).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _build[key]) return;
@@ -29,9 +25,7 @@ Object.keys(_build).forEach(function (key) {
     }
   });
 });
-
 var _start = require("./start");
-
 Object.keys(_start).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _start[key]) return;

package/dist/js/node/commands/inspect.js

@@ -4,39 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.inspect = void 0;
-
 var _path = require("path");
-
-var _utils = require("@modern-js/utils");
-
-var _builder = _interopRequireDefault(require("../builder"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const inspect = async (api, options) => {
-  const resolvedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
-  const targets = ['web'];
-
-  if (resolvedConfig.output.enableModernMode) {
-    targets.push('modern-web');
+  if (!appContext.builder) {
+    throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
   }
-
-  if ((0, _utils.isUseSSRBundle)(resolvedConfig)) {
-    targets.push('node');
-  }
-
-  const builder = await (0, _builder.default)({
-    target: targets,
-    appContext,
-    normalizedConfig: resolvedConfig
-  });
-  return builder.inspectConfig({
+  return appContext.builder.inspectConfig({
     env: options.env,
     verbose: options.verbose,
-    outputPath: (0, _path.join)(builder.context.distPath, options.output),
+    outputPath: (0, _path.join)(appContext === null || appContext === void 0 ? void 0 : appContext.builder.context.distPath, options.output),
     writeToDisk: true
   });
 };
-
 exports.inspect = inspect;

package/dist/js/node/commands/start.js

@@ -4,20 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.start = void 0;
-
 var _utils = require("@modern-js/utils");
-
 var _prodServer = _interopRequireDefault(require("@modern-js/prod-server"));
-
 var _printInstructions = require("../utils/printInstructions");
-
 var _createServer = require("../utils/createServer");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const start = async api => {
   var _userConfig$source;
-
   const appContext = api.useAppContext();
   const userConfig = api.useResolvedConfigContext();
   const hookRunners = api.useHookRunners();
@@ -26,12 +19,11 @@ const start = async api => {
     port,
     serverConfigFile
   } = appContext;
-
   _utils.logger.log(_utils.chalk.cyan(`Starting the modern server...`));
-
   const apiOnly = await (0, _utils.isApiOnly)(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$source = userConfig.source) === null || _userConfig$source === void 0 ? void 0 : _userConfig$source.entriesDir);
   const app = await (0, _prodServer.default)({
     pwd: appDirectory,
+    // FIXME: remove the `any` type
     config: userConfig,
     serverConfigFile,
     internalPlugins: (0, _createServer.injectDataLoaderPlugin)(appContext.serverInternalPlugins),
@@ -41,9 +33,7 @@ const start = async api => {
     if (err) {
       throw err;
     }
-
     await (0, _printInstructions.printInstructions)(hookRunners, appContext, userConfig);
   });
 };
-
 exports.start = start;

package/dist/js/node/config/default.js

@@ -0,0 +1,214 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createDefaultConfig = createDefaultConfig;
+exports.createLegacyDefaultConfig = createLegacyDefaultConfig;
+function createDefaultConfig(appContext) {
+  const defaultAlias = appContext ? {
+    [appContext.internalDirAlias]: appContext.internalDirectory,
+    [appContext.internalSrcAlias]: appContext.srcDirectory,
+    '@': appContext.srcDirectory,
+    '@shared': appContext.sharedDirectory
+  } : {};
+  const source = {
+    entries: undefined,
+    enableAsyncEntry: false,
+    disableDefaultEntries: false,
+    entriesDir: './src',
+    configDir: './config',
+    globalVars: undefined,
+    moduleScopes: undefined,
+    include: [],
+    alias: defaultAlias
+  };
+  const output = {
+    assetPrefix: '/',
+    distPath: {
+      html: 'html',
+      js: 'static/js',
+      css: 'static/css',
+      media: 'static/media',
+      root: 'dist'
+    },
+    copy: undefined,
+    disableCssModuleExtension: false,
+    enableCssModuleTSDeclaration: false,
+    disableMinimize: false,
+    enableInlineStyles: false,
+    enableInlineScripts: false,
+    disableSourceMap: false,
+    disableInlineRuntimeChunk: false,
+    disableFilenameHash: false,
+    enableLatestDecorators: false,
+    polyfill: 'entry',
+    dataUriLimit: 10000,
+    cssModuleLocalIdentName: undefined
+  };
+  const html = {
+    title: '',
+    titleByEntries: undefined,
+    meta: {
+      charset: {
+        charset: 'utf-8'
+      },
+      viewport: 'width=device-width, initial-scale=1.0, shrink-to-fit=no, viewport-fit=cover, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no',
+      'http-equiv': {
+        'http-equiv': 'x-ua-compatible',
+        content: 'ie=edge'
+      },
+      renderer: 'webkit',
+      layoutmode: 'standard',
+      imagemode: 'force',
+      'wap-font-scale': 'no',
+      'format-detection': 'telephone=no'
+    },
+    metaByEntries: undefined,
+    inject: 'head',
+    injectByEntries: undefined,
+    mountId: 'root',
+    favicon: '',
+    faviconByEntries: undefined,
+    disableHtmlFolder: false,
+    templateParameters: {},
+    templateParametersByEntries: undefined
+  };
+  const server = {
+    routes: undefined,
+    publicRoutes: undefined,
+    ssr: undefined,
+    ssrByEntries: undefined,
+    baseUrl: '/',
+    port: 8080
+  };
+  const dev = {
+    assetPrefix: false,
+    https: false
+  };
+  const tools = {
+    webpack: undefined,
+    babel: undefined,
+    postcss: undefined,
+    autoprefixer: undefined,
+    devServer: undefined,
+    tsLoader: undefined,
+    terser: undefined,
+    minifyCss: undefined
+  };
+  return {
+    source,
+    output,
+    server,
+    dev,
+    html,
+    tools,
+    plugins: [],
+    runtime: {},
+    runtimeByEntries: {}
+  };
+}
+function createLegacyDefaultConfig(appContext) {
+  const defaultAlias = appContext ? {
+    [appContext.internalDirAlias]: appContext.internalDirectory,
+    [appContext.internalSrcAlias]: appContext.srcDirectory,
+    '@': appContext.srcDirectory,
+    '@shared': appContext.sharedDirectory
+  } : {};
+  const sourceDefaults = {
+    entries: undefined,
+    enableAsyncEntry: false,
+    disableDefaultEntries: false,
+    entriesDir: './src',
+    configDir: './config',
+    apiDir: './api',
+    envVars: [],
+    globalVars: undefined,
+    alias: defaultAlias,
+    moduleScopes: undefined,
+    include: []
+  };
+  const outputDefaults = {
+    assetPrefix: '/',
+    htmlPath: 'html',
+    jsPath: 'static/js',
+    cssPath: 'static/css',
+    mediaPath: 'static/media',
+    path: 'dist',
+    title: '',
+    titleByEntries: undefined,
+    meta: {
+      charset: {
+        charset: 'utf-8'
+      },
+      viewport: 'width=device-width, initial-scale=1.0, shrink-to-fit=no, viewport-fit=cover, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no',
+      'http-equiv': {
+        'http-equiv': 'x-ua-compatible',
+        content: 'ie=edge'
+      },
+      renderer: 'webkit',
+      layoutmode: 'standard',
+      imagemode: 'force',
+      'wap-font-scale': 'no',
+      'format-detection': 'telephone=no'
+    },
+    metaByEntries: undefined,
+    inject: 'head',
+    injectByEntries: undefined,
+    mountId: 'root',
+    favicon: '',
+    faviconByEntries: undefined,
+    copy: undefined,
+    disableHtmlFolder: false,
+    disableCssModuleExtension: false,
+    disableCssExtract: false,
+    enableCssModuleTSDeclaration: false,
+    disableMinimize: false,
+    enableInlineStyles: false,
+    enableInlineScripts: false,
+    disableSourceMap: false,
+    disableInlineRuntimeChunk: false,
+    disableAssetsCache: false,
+    enableLatestDecorators: false,
+    polyfill: 'entry',
+    dataUriLimit: 10000,
+    templateParameters: {},
+    templateParametersByEntries: undefined,
+    cssModuleLocalIdentName: undefined,
+    enableModernMode: false,
+    disableNodePolyfill: false,
+    enableTsLoader: false
+  };
+  const serverDefaults = {
+    routes: undefined,
+    publicRoutes: undefined,
+    ssr: undefined,
+    ssrByEntries: undefined,
+    baseUrl: '/',
+    port: 8080
+  };
+  const devDefaults = {
+    assetPrefix: false,
+    https: false
+  };
+  const toolsDefaults = {
+    webpack: undefined,
+    babel: undefined,
+    postcss: undefined,
+    autoprefixer: undefined,
+    lodash: undefined,
+    devServer: undefined,
+    tsLoader: undefined,
+    terser: undefined,
+    minifyCss: undefined
+  };
+  return {
+    source: sourceDefaults,
+    output: outputDefaults,
+    server: serverDefaults,
+    dev: devDefaults,
+    tools: toolsDefaults,
+    runtime: {},
+    runtimeByEntries: {}
+  };
+}

package/dist/js/node/config/index.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "checkIsLegacyConfig", {
+  enumerable: true,
+  get: function () {
+    return _initial.checkIsLegacyConfig;
+  }
+});
+Object.defineProperty(exports, "createDefaultConfig", {
+  enumerable: true,
+  get: function () {
+    return _default.createDefaultConfig;
+  }
+});
+Object.defineProperty(exports, "createLegacyDefaultConfig", {
+  enumerable: true,
+  get: function () {
+    return _default.createLegacyDefaultConfig;
+  }
+});
+Object.defineProperty(exports, "initialNormalizedConfig", {
+  enumerable: true,
+  get: function () {
+    return _initial.initialNormalizedConfig;
+  }
+});
+var _default = require("./default");
+var _initial = require("./initial");