@modern-js/app-tools 1.22.2 → 2.0.0-alpha.0

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

@@ -1,154 +1,91 @@
-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 { webpack, getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
-import { ResolvedConfigContext } from '@modern-js/core';
-import { formatWebpackMessages, measureFileSizesBeforeBuild, printFileSizesAfterBuild, printBuildError, logger, isUseSSRBundle, emptyDir } from '@modern-js/utils';
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { ResolvedConfigContext } from "@modern-js/core";
+import { logger, printBuildError } from "@modern-js/utils";
 import { generateRoutes } from "../utils/routes";
-import { buildServerConfig, emitResolvedConfig } from "../utils/config";
-// These sizes are pretty large. We'll warn for bundles exceeding them.
-const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
-const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
-export const build = async (api, options) => {
+import { buildServerConfig } from "../utils/config";
+const build = (api, options) => __async(void 0, null, function* () {
+  if (options == null ? void 0 : options.analyze) {
+    process.env.BUNDLE_ANALYZE = "true";
+  }
   let resolvedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
   const hookRunners = api.useHookRunners();
-  const {
-    apiOnly
-  } = appContext;
-
+  const { apiOnly } = appContext;
   if (apiOnly) {
-    const {
-      appDirectory,
-      distDirectory,
-      serverConfigFile
-    } = appContext;
-    await emptyDir(distDirectory);
-    await hookRunners.beforeBuild({
-      webpackConfigs: []
+    const { appDirectory: appDirectory2, distDirectory: distDirectory2, serverConfigFile: serverConfigFile2 } = appContext;
+    yield hookRunners.beforeBuild({
+      bundlerConfigs: void 0
     });
-    await buildServerConfig({
-      appDirectory,
-      distDirectory,
-      configFile: serverConfigFile
+    yield buildServerConfig({
+      appDirectory: appDirectory2,
+      distDirectory: distDirectory2,
+      configFile: serverConfigFile2
+    });
+    yield generateRoutes(appContext);
+    yield hookRunners.afterBuild({
+      stats: void 0
     });
-    await generateRoutes(appContext);
-    await hookRunners.afterBuild();
     return;
   }
-
-  const webpackBuild = async (webpackConfig, type) => {
-    const compiler = webpack(webpackConfig);
-    return new Promise((resolve, reject) => {
-      let label = process.env.NODE_ENV || '';
-
-      if (type && type !== 'legacy') {
-        label += ` ${type}`;
-      }
-
-      logger.info(`Creating a ${label} build...`);
-      compiler.run((err, stats) => {
-        let messages;
-
-        if (!err) {
-          messages = formatWebpackMessages(stats.toJson({
-            all: false,
-            warnings: true,
-            errors: true
-          }));
-
-          if (messages.errors.length === 0) {
-            logger.info(`File sizes after ${label} build:\n`);
-            printFileSizesAfterBuild(stats, previousFileSizes, distDirectory, WARN_AFTER_BUNDLE_GZIP_SIZE, WARN_AFTER_CHUNK_GZIP_SIZE);
-            logger.log();
-          }
-        } // When using run or watch, call close and wait for it to finish before calling run or watch again.
-        // Concurrent compilations will corrupt the output files.
-
-
-        compiler.close(closeErr => {
-          if (closeErr) {
-            logger.error(closeErr);
-          }
-
-          if (err) {
-            reject(err);
-          } else {
-            if (messages.errors.length) {
-              reject(new Error(messages.errors.join('\n\n')));
-              return;
-            }
-
-            resolve({
-              warnings: messages.warnings
-            });
-          }
-        });
-      });
-    });
-  };
-
-  resolvedConfig = _objectSpread(_objectSpread({}, resolvedConfig), {}, {
-    cliOptions: options
-  });
+  resolvedConfig = __spreadProps(__spreadValues({}, resolvedConfig), { cliOptions: options });
   ResolvedConfigContext.set(resolvedConfig);
-  const {
-    distDirectory,
-    appDirectory,
-    serverConfigFile
-  } = appContext;
-  const previousFileSizes = await measureFileSizesBeforeBuild(distDirectory);
-  await emptyDir(distDirectory);
-  await buildServerConfig({
+  const { distDirectory, appDirectory, serverConfigFile } = appContext;
+  yield buildServerConfig({
     appDirectory,
     distDirectory,
     configFile: serverConfigFile
   });
-  const buildConfigs = [];
-  buildConfigs.push({
-    type: 'legacy',
-    config: getWebpackConfig(WebpackConfigTarget.CLIENT, appContext, resolvedConfig)
-  });
-
-  if (resolvedConfig.output.enableModernMode) {
-    buildConfigs.push({
-      type: 'modern',
-      config: getWebpackConfig(WebpackConfigTarget.MODERN, appContext, resolvedConfig)
-    });
-  }
-
-  if (isUseSSRBundle(resolvedConfig)) {
-    buildConfigs.push({
-      type: 'ssr',
-      config: getWebpackConfig(WebpackConfigTarget.NODE, appContext, resolvedConfig)
-    });
-  }
-
-  await hookRunners.beforeBuild({
-    webpackConfigs: buildConfigs.map(({
-      config
-    }) => config)
-  });
-
-  for (const buildConfig of buildConfigs) {
-    const {
-      type: buildType,
-      config
-    } = buildConfig;
-
-    try {
-      await webpackBuild(config, buildType);
-    } catch (error) {
-      printBuildError(error); // eslint-disable-next-line no-process-exit
-
-      process.exit(1);
+  try {
+    logger.info("Create a production build...\n");
+    if (!appContext.builder) {
+      throw new Error(
+        "Expect the Builder to have been initialized, But the appContext.builder received `undefined`"
+      );
     }
+    yield appContext.builder.build();
+  } catch (error) {
+    printBuildError(error);
+    process.exit(1);
   }
-
-  await generateRoutes(appContext);
-  await hookRunners.afterBuild();
-  await emitResolvedConfig(appDirectory, resolvedConfig);
-};
+});
+export {
+  build
+};

package/dist/js/modern/commands/deploy.js

@@ -1,5 +1,28 @@
-export const deploy = async (api, options) => {
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+const deploy = (api, options) => __async(void 0, null, function* () {
   const hookRunners = api.useHookRunners();
-  await hookRunners.beforeDeploy(options);
-  await hookRunners.afterDeploy(options);
-};
+  yield hookRunners.beforeDeploy(options);
+  yield hookRunners.afterDeploy(options);
+});
+export {
+  deploy
+};

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

@@ -1,25 +1,64 @@
-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 { fs, logger, chalk, isSSR } from '@modern-js/utils';
-import { ResolvedConfigContext } from '@modern-js/core';
-import { createCompiler } from "../utils/createCompiler";
-import { createServer } from "../utils/createServer";
-import { generateRoutes } from "../utils/routes";
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { ResolvedConfigContext } from "@modern-js/core";
+import { createFileWatcher } from "../utils/createFileWatcher";
 import { printInstructions } from "../utils/printInstructions";
+import {
+  setServer,
+  createServer,
+  injectDataLoaderPlugin
+} from "../utils/createServer";
+import { generateRoutes } from "../utils/routes";
 import { getSpecifiedEntries } from "../utils/getSpecifiedEntries";
 import { buildServerConfig } from "../utils/config";
-export const dev = async (api, options) => {
-  let userConfig = api.useResolvedConfigContext();
+import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
+const dev = (api, options) => __async(void 0, null, function* () {
+  var _a;
+  if (options.analyze) {
+    process.env.BUNDLE_ANALYZE = "true";
+  }
+  let normalizedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
   const hookRunners = api.useHookRunners();
-  userConfig = _objectSpread(_objectSpread({}, userConfig), {}, {
-    cliOptions: options
-  });
-  ResolvedConfigContext.set(userConfig);
+  normalizedConfig = __spreadProps(__spreadValues({}, normalizedConfig), { cliOptions: options });
+  ResolvedConfigContext.set(normalizedConfig);
   const {
     appDirectory,
     distDirectory,
@@ -28,13 +67,15 @@ export const dev = async (api, options) => {
     entrypoints,
     serverConfigFile
   } = appContext;
-  const checkedEntries = await getSpecifiedEntries(options.entry || false, entrypoints);
-  api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
+  const checkedEntries = yield getSpecifiedEntries(
+    options.entry || false,
+    entrypoints
+  );
+  api.setAppContext(__spreadProps(__spreadValues({}, appContext), {
     checkedEntries
   }));
   appContext.checkedEntries = checkedEntries;
-  fs.emptyDirSync(distDirectory);
-  await buildServerConfig({
+  yield buildServerConfig({
     appDirectory,
     distDirectory,
     configFile: serverConfigFile,
@@ -44,52 +85,47 @@ export const dev = async (api, options) => {
       }
     }
   });
-  await hookRunners.beforeDev();
-  let compiler = null;
-
-  if (!apiOnly) {
-    const {
-      getWebpackConfig,
-      WebpackConfigTarget
-    } = await import('@modern-js/webpack');
-    const webpackConfigs = [isSSR(userConfig) && getWebpackConfig(WebpackConfigTarget.NODE, appContext, userConfig), getWebpackConfig(WebpackConfigTarget.CLIENT, appContext, userConfig)].filter(Boolean);
-    compiler = await createCompiler({
-      api,
-      webpackConfigs,
-      userConfig,
-      appContext
-    });
+  yield hookRunners.beforeDev();
+  if (!appContext.builder && !apiOnly) {
+    throw new Error(
+      "Expect the Builder to have been initialized, But the appContext.builder received `undefined`"
+    );
   }
-
-  await generateRoutes(appContext);
-  const app = await createServer({
-    dev: _objectSpread(_objectSpread({}, {
-      client: {
-        port: port.toString()
-      },
-      devMiddleware: {
-        writeToDisk: file => !file.includes('.hot-update.')
-      },
-      hot: true,
-      liveReload: true,
+  yield generateRoutes(appContext);
+  const serverInternalPlugins = yield getServerInternalPlugins(api);
+  const serverOptions = {
+    dev: __spreadValues({
       port,
-      https: userConfig.dev.https
-    }), userConfig.tools.devServer),
-    compiler,
+      https: normalizedConfig.dev.https
+    }, (_a = normalizedConfig.tools) == null ? void 0 : _a.devServer),
     pwd: appDirectory,
-    config: userConfig,
+    config: normalizedConfig,
     serverConfigFile,
-    plugins: appContext.plugins.filter(p => p.server).map(p => p.server)
-  });
-  app.listen(port, async err => {
-    if (err) {
-      throw err;
-    }
-
-    if (apiOnly) {
-      return printInstructions(hookRunners, appContext, userConfig);
-    }
-
-    return logger.log(chalk.cyan(`Starting the development server...`));
-  });
-};
+    internalPlugins: injectDataLoaderPlugin(serverInternalPlugins)
+  };
+  if (apiOnly) {
+    const app = yield createServer(__spreadProps(__spreadValues({}, serverOptions), {
+      compiler: null
+    }));
+    app.listen(port, (err) => __async(void 0, null, function* () {
+      if (err) {
+        throw err;
+      }
+      printInstructions(hookRunners, appContext, normalizedConfig);
+    }));
+  } else {
+    const { server } = yield appContext.builder.startDevServer({
+      printURLs: false,
+      serverOptions
+    });
+    setServer(server);
+  }
+  yield createFileWatcher(
+    appContext,
+    normalizedConfig.source.configDir,
+    hookRunners
+  );
+});
+export {
+  dev
+};

package/dist/js/modern/commands/index.js

@@ -1,3 +1,3 @@
 export * from "./dev";
 export * from "./build";
-export * from "./start";
+export * from "./serve";

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

@@ -1,69 +1,38 @@
-import path from 'path';
-import { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
-import { fs, logger, isUseSSRBundle, chalk } from '@modern-js/utils';
-import WebpackChain from '@modern-js/utils/webpack-chain';
-export const formatWebpackConfig = (config, verbose) => {
-  const stringify = WebpackChain.toString;
-  return `module.exports = ${stringify(config, {
-    verbose
-  })};`;
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
 };
-export const inspect = (api, options) => {
-  process.env.NODE_ENV = options.env;
-  const resolvedConfig = api.useResolvedConfigContext();
+import { join } from "path";
+const inspect = (api, options) => __async(void 0, null, function* () {
   const appContext = api.useAppContext();
-  const outputFiles = [];
-  outputFiles.push(printInspectResult(WebpackConfigTarget.CLIENT, appContext, resolvedConfig, options));
-
-  if (resolvedConfig.output.enableModernMode) {
-    outputFiles.push(printInspectResult(WebpackConfigTarget.MODERN, appContext, resolvedConfig, options));
-  }
-
-  if (isUseSSRBundle(resolvedConfig)) {
-    outputFiles.push(printInspectResult(WebpackConfigTarget.NODE, appContext, resolvedConfig, options));
+  if (!appContext.builder) {
+    throw new Error(
+      "Expect the Builder to have been initialized, But the appContext.builder received `undefined`"
+    );
   }
-
-  logger.success('Inspect succeed, you can open following files to view the full webpack config: \n');
-  outputFiles.forEach(file => {
-    logger.log(`  - ${chalk.yellow(path.relative(appContext.appDirectory, file))}`);
+  return appContext.builder.inspectConfig({
+    env: options.env,
+    verbose: options.verbose,
+    outputPath: join(appContext == null ? void 0 : appContext.builder.context.distPath, options.output),
+    writeToDisk: true
   });
-  logger.log();
+});
+export {
+  inspect
 };
-export const getTagByWebpackTarget = webpackTarget => {
-  switch (webpackTarget) {
-    case WebpackConfigTarget.CLIENT:
-      return 'client';
-
-    case WebpackConfigTarget.MODERN:
-      return 'modern';
-
-    case WebpackConfigTarget.NODE:
-      return 'ssr';
-
-    default:
-      throw Error(`Unsupported webpack target: ${webpackTarget}`);
-  }
-};
-export const printInspectResult = (webpackTarget, appContext, resolvedConfig, options) => {
-  const webpackConfig = getWebpackConfig(webpackTarget, appContext, resolvedConfig);
-  const {
-    output,
-    verbose,
-    console = true
-  } = options;
-  const outputPath = output ? path.posix.join(appContext.distDirectory, output) : appContext.distDirectory;
-  const tag = getTagByWebpackTarget(webpackTarget);
-  const outputFile = `webpack.${tag}.inspect.js`;
-  const outputFilePath = path.posix.join(outputPath, outputFile);
-  const rawWebpackConfig = formatWebpackConfig(webpackConfig, verbose);
-  fs.outputFileSync(outputFilePath, rawWebpackConfig);
-
-  if (console) {
-    logger.log(`
-webpack config for ${tag} build:
-${rawWebpackConfig}
-    `);
-  }
-
-  return outputFilePath;
-};

package/dist/js/modern/commands/serve.js

@@ -0,0 +1,54 @@
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { logger, chalk, isApiOnly } from "@modern-js/utils";
+import server from "@modern-js/prod-server";
+import { printInstructions } from "../utils/printInstructions";
+import { injectDataLoaderPlugin } from "../utils/createServer";
+import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
+const start = (api) => __async(void 0, null, function* () {
+  var _a;
+  const appContext = api.useAppContext();
+  const userConfig = api.useResolvedConfigContext();
+  const hookRunners = api.useHookRunners();
+  const { appDirectory, port, serverConfigFile } = appContext;
+  logger.log(chalk.cyan(`Starting the modern server...`));
+  const apiOnly = yield isApiOnly(
+    appContext.appDirectory,
+    (_a = userConfig == null ? void 0 : userConfig.source) == null ? void 0 : _a.entriesDir
+  );
+  const serverInternalPlugins = yield getServerInternalPlugins(api);
+  const app = yield server({
+    pwd: appDirectory,
+    config: userConfig,
+    serverConfigFile,
+    internalPlugins: injectDataLoaderPlugin(serverInternalPlugins),
+    apiOnly
+  });
+  app.listen(port, (err) => __async(void 0, null, function* () {
+    if (err) {
+      throw err;
+    }
+    yield printInstructions(hookRunners, appContext, userConfig);
+  }));
+});
+export {
+  start
+};