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

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

@@ -9,22 +9,18 @@ var _utils = require("@modern-js/utils");
 
 var _core = require("@modern-js/core");
 
+var _printInstructions = require("../utils/printInstructions");
+
 var _createCompiler = require("../utils/createCompiler");
 
 var _createServer = require("../utils/createServer");
 
 var _routes = require("../utils/routes");
 
-var _printInstructions = require("../utils/printInstructions");
-
 var _getSpecifiedEntries = require("../utils/getSpecifiedEntries");
 
 var _config = require("../utils/config");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 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; }
@@ -47,16 +43,14 @@ const dev = async (api, options) => {
     port,
     apiOnly,
     entrypoints,
-    serverConfigFile
+    serverConfigFile,
+    serverInternalPlugins
   } = appContext;
   const checkedEntries = await (0, _getSpecifiedEntries.getSpecifiedEntries)(options.entry || false, entrypoints);
   api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
     checkedEntries
   }));
   appContext.checkedEntries = checkedEntries;
-
-  _utils.fs.emptyDirSync(distDirectory);
-
   await (0, _config.buildServerConfig)({
     appDirectory,
     distDirectory,
@@ -71,15 +65,11 @@ const dev = async (api, options) => {
   let compiler = null;
 
   if (!apiOnly) {
-    const {
-      getWebpackConfig,
-      WebpackConfigTarget
-    } = await Promise.resolve().then(() => _interopRequireWildcard(require('@modern-js/webpack')));
-    const webpackConfigs = [(0, _utils.isSSR)(userConfig) && getWebpackConfig(WebpackConfigTarget.NODE, appContext, userConfig), getWebpackConfig(WebpackConfigTarget.CLIENT, appContext, userConfig)].filter(Boolean);
-    compiler = await (0, _createCompiler.createCompiler)({
+    const target = (0, _utils.isSSR)(userConfig) ? ['web', 'node'] : ['web'];
+    compiler = await (0, _createCompiler.createDevCompiler)({
+      target,
       api,
-      webpackConfigs,
-      userConfig,
+      normalizedConfig: userConfig,
       appContext
     });
   }
@@ -102,18 +92,18 @@ const dev = async (api, options) => {
     pwd: appDirectory,
     config: userConfig,
     serverConfigFile,
-    plugins: appContext.plugins.filter(p => p.server).map(p => p.server)
+    internalPlugins: (0, _createServer.injectDataLoaderPlugin)(serverInternalPlugins)
   });
   app.listen(port, async err => {
     if (err) {
       throw err;
     }
 
-    if (apiOnly) {
-      return (0, _printInstructions.printInstructions)(hookRunners, appContext, userConfig);
+    if (!apiOnly) {
+      _utils.logger.info(`Starting dev server...`);
+    } else {
+      (0, _printInstructions.printInstructions)(hookRunners, appContext, userConfig);
     }
-
-    return _utils.logger.log(_utils.chalk.cyan(`Starting the development server...`));
   });
 };
 

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

@@ -3,96 +3,40 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.printInspectResult = exports.inspect = exports.getTagByWebpackTarget = exports.formatWebpackConfig = void 0;
+exports.inspect = void 0;
 
-var _path = _interopRequireDefault(require("path"));
-
-var _webpack = require("@modern-js/webpack");
+var _path = require("path");
 
 var _utils = require("@modern-js/utils");
 
-var _webpackChain = _interopRequireDefault(require("@modern-js/utils/webpack-chain"));
+var _builder = _interopRequireDefault(require("../builder"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const formatWebpackConfig = (config, verbose) => {
-  const stringify = _webpackChain.default.toString;
-  return `module.exports = ${stringify(config, {
-    verbose
-  })};`;
-};
-
-exports.formatWebpackConfig = formatWebpackConfig;
-
-const inspect = (api, options) => {
-  process.env.NODE_ENV = options.env;
+const inspect = async (api, options) => {
   const resolvedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
-  const outputFiles = [];
-  outputFiles.push(printInspectResult(_webpack.WebpackConfigTarget.CLIENT, appContext, resolvedConfig, options));
+  const targets = ['web'];
 
   if (resolvedConfig.output.enableModernMode) {
-    outputFiles.push(printInspectResult(_webpack.WebpackConfigTarget.MODERN, appContext, resolvedConfig, options));
+    targets.push('modern-web');
   }
 
   if ((0, _utils.isUseSSRBundle)(resolvedConfig)) {
-    outputFiles.push(printInspectResult(_webpack.WebpackConfigTarget.NODE, appContext, resolvedConfig, options));
+    targets.push('node');
   }
 
-  _utils.logger.success('Inspect succeed, you can open following files to view the full webpack config: \n');
-
-  outputFiles.forEach(file => {
-    _utils.logger.log(`  - ${_utils.chalk.yellow(_path.default.relative(appContext.appDirectory, file))}`);
+  const builder = await (0, _builder.default)({
+    target: targets,
+    appContext,
+    normalizedConfig: resolvedConfig
+  });
+  return builder.inspectConfig({
+    env: options.env,
+    verbose: options.verbose,
+    outputPath: (0, _path.join)(builder.context.distPath, options.output),
+    writeToDisk: true
   });
-
-  _utils.logger.log();
-};
-
-exports.inspect = inspect;
-
-const getTagByWebpackTarget = webpackTarget => {
-  switch (webpackTarget) {
-    case _webpack.WebpackConfigTarget.CLIENT:
-      return 'client';
-
-    case _webpack.WebpackConfigTarget.MODERN:
-      return 'modern';
-
-    case _webpack.WebpackConfigTarget.NODE:
-      return 'ssr';
-
-    default:
-      throw Error(`Unsupported webpack target: ${webpackTarget}`);
-  }
-};
-
-exports.getTagByWebpackTarget = getTagByWebpackTarget;
-
-const printInspectResult = (webpackTarget, appContext, resolvedConfig, options) => {
-  const webpackConfig = (0, _webpack.getWebpackConfig)(webpackTarget, appContext, resolvedConfig);
-  const {
-    output,
-    verbose,
-    console = true
-  } = options;
-  const outputPath = output ? _path.default.posix.join(appContext.distDirectory, output) : appContext.distDirectory;
-  const tag = getTagByWebpackTarget(webpackTarget);
-  const outputFile = `webpack.${tag}.inspect.js`;
-
-  const outputFilePath = _path.default.posix.join(outputPath, outputFile);
-
-  const rawWebpackConfig = formatWebpackConfig(webpackConfig, verbose);
-
-  _utils.fs.outputFileSync(outputFilePath, rawWebpackConfig);
-
-  if (console) {
-    _utils.logger.log(`
-webpack config for ${tag} build:
-${rawWebpackConfig}
-    `);
-  }
-
-  return outputFilePath;
 };
 
-exports.printInspectResult = printInspectResult;
+exports.inspect = inspect;

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

@@ -11,6 +11,8 @@ 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 => {
@@ -31,8 +33,8 @@ const start = async api => {
   const app = await (0, _prodServer.default)({
     pwd: appDirectory,
     config: userConfig,
-    plugins: appContext.plugins.filter(p => p.server).map(p => p.server),
     serverConfigFile,
+    internalPlugins: (0, _createServer.injectDataLoaderPlugin)(appContext.serverInternalPlugins),
     apiOnly
   });
   app.listen(port, async err => {

package/dist/js/node/index.js

@@ -10,6 +10,12 @@ Object.defineProperty(exports, "defineConfig", {
     return _core.defineConfig;
   }
 });
+Object.defineProperty(exports, "hooks", {
+  enumerable: true,
+  get: function () {
+    return _hooks.hooks;
+  }
+});
 
 var _path = _interopRequireDefault(require("path"));
 
@@ -27,6 +33,8 @@ var _locale = require("./locale");
 
 var _language = require("./utils/language");
 
+var _commands = require("./utils/commands");
+
 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; }
@@ -43,7 +51,7 @@ const upgradeModel = _utils.Import.lazy('@modern-js/upgrade', require);
 
 var _default = () => ({
   name: '@modern-js/app-tools',
-  post: ['@modern-js/plugin-analyze', '@modern-js/plugin-ssr', '@modern-js/plugin-state', '@modern-js/plugin-router', '@modern-js/plugin-polyfill'],
+  post: ['@modern-js/plugin-analyze', '@modern-js/plugin-ssr', '@modern-js/plugin-state', '@modern-js/plugin-router', '@modern-js/plugin-router-legacy', '@modern-js/plugin-polyfill'],
   registerHook: _hooks.hooks,
   usePlugins: [(0, _analyze.default)(), (0, _pluginJarvis.default)()],
   setup: api => {
@@ -98,7 +106,7 @@ var _default = () => ({
             locale
           }));
         });
-        program.command('inspect').description('inspect internal webpack config').option(`--env <env>`, _locale.i18n.t(_locale.localeKeys.command.inspect.env), 'development').option('--output <output>', _locale.i18n.t(_locale.localeKeys.command.inspect.output), '/').option('--no-console', _locale.i18n.t(_locale.localeKeys.command.inspect.noConsole)).option('--verbose', _locale.i18n.t(_locale.localeKeys.command.inspect.verbose)).option('-c --config <config>', _locale.i18n.t(_locale.localeKeys.command.shared.config)).action(async options => {
+        program.command('inspect').description('inspect internal webpack config').option(`--env <env>`, _locale.i18n.t(_locale.localeKeys.command.inspect.env), 'development').option('--output <output>', _locale.i18n.t(_locale.localeKeys.command.inspect.output), '/').option('--verbose', _locale.i18n.t(_locale.localeKeys.command.inspect.verbose)).option('-c --config <config>', _locale.i18n.t(_locale.localeKeys.command.shared.config)).action(async options => {
           const {
             inspect
           } = await Promise.resolve().then(() => _interopRequireWildcard(require("./commands/inspect")));
@@ -107,6 +115,15 @@ var _default = () => ({
         upgradeModel.defineCommand(program.command('upgrade'));
       },
 
+      async prepare() {
+        const command = (0, _commands.getCommand)();
+
+        if (command === 'dev' || command === 'build') {
+          const appContext = api.useAppContext();
+          await (0, _utils.emptyDir)(appContext.distDirectory);
+        }
+      },
+
       // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
       async fileChange(e) {
         const {

package/dist/js/node/locale/en.js

@@ -34,7 +34,6 @@ const EN_LOCALE = {
     inspect: {
       env: 'specify env mode',
       output: 'specify inspect content output path',
-      noConsole: 'do not log the result in terminal',
       verbose: 'show full function definitions in output'
     }
   }

package/dist/js/node/locale/zh.js

@@ -34,7 +34,6 @@ const ZH_LOCALE = {
     inspect: {
       env: '查看指定环境下的配置',
       output: '指定在 dist 目录下输出的路径',
-      noConsole: '不在终端中输出完整结果',
       verbose: '在结果中展示函数的完整内容'
     }
   }

package/dist/js/node/utils/commands.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getCommand = void 0;
+
+const getCommand = () => {
+  const args = process.argv.slice(2);
+  const command = args[0];
+  return command;
+};
+
+exports.getCommand = getCommand;

package/dist/js/node/utils/createCompiler.js

@@ -3,68 +3,62 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createCompiler = void 0;
-
-var _webpack = require("@modern-js/webpack");
+exports.createDevCompiler = void 0;
 
 var _utils = require("@modern-js/utils");
 
+var _builder = _interopRequireDefault(require("../builder"));
+
 var _printInstructions = require("./printInstructions");
 
-const createCompiler = async ({
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const createDevCompiler = async ({
   api,
-  webpackConfigs,
-  // TODO: params
-  userConfig,
+  target,
+  normalizedConfig,
   appContext
 }) => {
   try {
     const hookRunners = api.useHookRunners();
-    await hookRunners.beforeCreateCompiler({
-      webpackConfigs
-    });
-    const compiler = (0, _webpack.webpack)(webpackConfigs);
-    await hookRunners.afterCreateCompiler({
-      compiler
-    });
-    let isFirstCompile = true;
-    compiler.hooks.invalid.tap('invalid', () => {
-      (0, _utils.clearConsole)();
-
-      _utils.logger.log('Compiling...');
-    });
-    compiler.hooks.done.tap('done', async stats => {
-      const statsData = stats.toJson({
-        preset: 'errors-warnings'
-      });
-      const {
-        errors,
-        warnings
-      } = (0, _utils.formatWebpackMessages)(statsData);
-
-      if (errors.length) {
-        _utils.logger.log(_utils.chalk.red(`Failed to compile.\n`));
-
-        _utils.logger.log(errors.join('\n\n'));
-
-        _utils.logger.log();
-      } else if (process.stdout.isTTY || isFirstCompile) {
-        await hookRunners.afterDev();
-
-        if (warnings.length) {
-          _utils.logger.log(_utils.chalk.yellow(`Compiled with warnings.\n`));
-
-          _utils.logger.log(warnings.join('\n\n'));
-
-          _utils.logger.log();
+    const builder = await (0, _builder.default)({
+      target,
+      normalizedConfig,
+      appContext,
+      compatPluginConfig: {
+        async onDevCompileDone({
+          isFirstCompile
+        }) {
+          if (process.stdout.isTTY || isFirstCompile) {
+            hookRunners.afterDev();
+
+            if (isFirstCompile) {
+              (0, _printInstructions.printInstructions)(hookRunners, appContext, normalizedConfig);
+            }
+          }
+        },
+
+        async onBeforeCreateCompiler({
+          bundlerConfigs
+        }) {
+          // run modernjs framework `beforeCreateCompiler` hook
+          await hookRunners.beforeCreateCompiler({
+            bundlerConfigs
+          });
+        },
+
+        async onAfterCreateCompiler({
+          compiler
+        }) {
+          // run modernjs framework afterCreateCompiler hooks
+          await hookRunners.afterCreateCompiler({
+            compiler
+          });
         }
 
-        await (0, _printInstructions.printInstructions)(hookRunners, appContext, userConfig);
       }
-
-      isFirstCompile = false;
     });
-    return compiler;
+    return builder.createCompiler();
   } catch (err) {
     _utils.logger.log(_utils.chalk.red(`Failed to compile.`));
 
@@ -78,4 +72,4 @@ const createCompiler = async ({
   }
 };
 
-exports.createCompiler = createCompiler;
+exports.createDevCompiler = createDevCompiler;

package/dist/js/node/utils/createServer.js

@@ -3,10 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getServer = exports.createServer = exports.closeServer = void 0;
+exports.injectDataLoaderPlugin = exports.getServer = exports.createServer = exports.closeServer = void 0;
 
 var _server = require("@modern-js/server");
 
+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; }
+
 let server = null;
 
 const getServer = () => server;
@@ -32,4 +38,17 @@ const createServer = async options => {
   return app;
 };
 
-exports.createServer = createServer;
+exports.createServer = createServer;
+
+const injectDataLoaderPlugin = internalPlugins => {
+  const DataLoaderPlugin = require.resolve('@modern-js/plugin-data-loader/server');
+
+  return _objectSpread(_objectSpread({}, internalPlugins), {}, {
+    '@modern-js/plugin-data-loader': {
+      path: DataLoaderPlugin,
+      forced: true
+    }
+  });
+};
+
+exports.injectDataLoaderPlugin = injectDataLoaderPlugin;

package/dist/js/node/utils/printInstructions.js

@@ -16,7 +16,7 @@ const printInstructions = async (hookRunners, appContext, config) => {
     instructions: message
   });
 
-  _utils.logger.log(instructions);
+  _utils.logger.info(instructions);
 };
 
 exports.printInstructions = printInstructions;

package/dist/js/treeshaking/analyze/constants.js

@@ -0,0 +1,16 @@
+export var JS_EXTENSIONS = ['.js', '.ts', '.jsx', '.tsx'];
+export var INDEX_FILE_NAME = 'index';
+export var APP_FILE_NAME = 'App';
+export var PAGES_DIR_NAME = 'pages';
+export var NESTED_ROUTES_DIR = 'routes';
+export var FILE_SYSTEM_ROUTES_FILE_NAME = 'routes.js';
+export var ENTRY_POINT_FILE_NAME = 'index.js';
+export var ENTRY_BOOTSTRAP_FILE_NAME = 'bootstrap.js';
+export var FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP = /^\[(\S+)\]([*+?]?)$/;
+export var FILE_SYSTEM_ROUTES_LAYOUT = '_layout';
+export var FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT = '_app';
+export var FILE_SYSTEM_ROUTES_INDEX = 'index';
+export var FILE_SYSTEM_ROUTES_IGNORED_REGEX = /\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/;
+export var HTML_PARTIALS_FOLDER = 'html';
+export var HTML_PARTIALS_EXTENSIONS = ['.htm', '.html', '.ejs'];
+export var FILE_SYSTEM_ROUTES_COMPONENTS_DIR = 'internal_components';