@modern-js/app-tools 2.0.0-beta.3 → 2.0.0-beta.6

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

@@ -1,97 +1,113 @@
-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;
-  }
+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 path from "path";
+import {
+  fs,
+  ROUTE_MANIFEST,
+  logger,
+  ROUTE_MINIFEST_FILE
+} from "@modern-js/utils";
+const PLUGIN_NAME = "ModernjsRoutePlugin";
+class RouterPlugin {
   apply(compiler) {
-    const {
-      existNestedRoutes
-    } = this;
-    const {
-      target
-    } = compiler.options;
-    if (target === 'node' || Array.isArray(target) && target.includes('node')) {
-      return;
-    }
-    if (!existNestedRoutes) {
+    const { target } = compiler.options;
+    if (target === "node" || Array.isArray(target) && target.includes("node")) {
       return;
     }
-    const {
-      webpack
-    } = compiler;
-    const {
-      Compilation,
-      sources
-    } = webpack;
-    const {
-      RawSource
-    } = sources;
-    const {
-      PROCESS_ASSETS_STAGE_REPORT
-    } = Compilation;
+    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}/`;
+    const newAssetsMap = /* @__PURE__ */ new Map();
+    const normalizePath = (path2) => {
+      if (!path2.endsWith("/")) {
+        return `${path2}/`;
       }
-      return path;
+      return path2;
     };
-    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)
+    compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
+      compilation.hooks.processAssets.tapPromise(
+        {
+          name: PLUGIN_NAME,
+          stage: PROCESS_ASSETS_STAGE_REPORT
+        },
+        () => __async(this, null, function* () {
+          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)) {
+            if (assetsByChunkName[name]) {
+              routeAssets[name] = {
+                chunkIds: chunkGroup.chunks,
+                assets: assetsByChunkName[name].map(
+                  (item) => publicPath ? normalizePath(publicPath) + item : item
+                )
+              };
+            }
+          }
+          const manifest = {
+            routeAssets
           };
-        }
-        const manifest = {
-          routeAssets
-        };
-        const injectedContent = `
+          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));
-      });
+          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].find((fname) => fname.includes(".js"))
+          );
+          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);
+          yield fs.ensureFile(filename);
+          yield fs.writeFile(filename, JSON.stringify(manifest, null, 2));
+        })
+      );
     });
   }
-}
+}
+export {
+  RouterPlugin as default
+};

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

@@ -1,66 +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 { ResolvedConfigContext } from '@modern-js/core';
-import { logger, printBuildError } 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 } from "../utils/config";
-export 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';
+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 hookRunners.beforeBuild({
-      // "null" bundlerConfigs
-      bundlerConfigs: undefined
+    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
     });
-    await generateRoutes(appContext);
-    await hookRunners.afterBuild({
-      // "null" stats
-      stats: undefined
+    yield generateRoutes(appContext);
+    yield hookRunners.afterBuild({
+      stats: void 0
     });
     return;
   }
-  resolvedConfig = _objectSpread(_objectSpread({}, resolvedConfig), {}, {
-    cliOptions: options
-  });
+  resolvedConfig = __spreadProps(__spreadValues({}, resolvedConfig), { cliOptions: options });
   ResolvedConfigContext.set(resolvedConfig);
-  const {
-    distDirectory,
-    appDirectory,
-    serverConfigFile
-  } = appContext;
-  await buildServerConfig({
+  const { distDirectory, appDirectory, serverConfigFile } = appContext;
+  yield buildServerConfig({
     appDirectory,
     distDirectory,
     configFile: serverConfigFile
   });
   try {
-    logger.info('Create a production build...\n');
+    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`');
+      throw new Error(
+        "Expect the Builder to have been initialized, But the appContext.builder received `undefined`"
+      );
     }
-    await appContext.builder.build();
+    yield appContext.builder.build();
   } catch (error) {
     printBuildError(error);
-    // eslint-disable-next-line no-process-exit
     process.exit(1);
   }
-};
+});
+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,63 @@
-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';
+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 { createServer, injectDataLoaderPlugin } from "../utils/createServer";
+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) => {
-  var _normalizedConfig$too;
+import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
+const dev = (api, options) => __async(void 0, null, function* () {
+  var _a;
   if (options.analyze) {
-    // Builder will read this env var to enable bundle analyzer
-    process.env.BUNDLE_ANALYZE = 'true';
+    process.env.BUNDLE_ANALYZE = "true";
   }
   let normalizedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
   const hookRunners = api.useHookRunners();
-  normalizedConfig = _objectSpread(_objectSpread({}, normalizedConfig), {}, {
-    cliOptions: options
-  });
+  normalizedConfig = __spreadProps(__spreadValues({}, normalizedConfig), { cliOptions: options });
   ResolvedConfigContext.set(normalizedConfig);
   const {
     appDirectory,
@@ -27,15 +65,17 @@ export const dev = async (api, options) => {
     port,
     apiOnly,
     entrypoints,
-    serverConfigFile,
-    serverInternalPlugins
+    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;
-  await buildServerConfig({
+  yield buildServerConfig({
     appDirectory,
     distDirectory,
     configFile: serverConfigFile,
@@ -45,40 +85,47 @@ export const dev = async (api, options) => {
       }
     }
   });
-  await hookRunners.beforeDev();
-  let compiler;
+  yield hookRunners.beforeDev();
   if (!appContext.builder && !apiOnly) {
-    throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
+    throw new Error(
+      "Expect the Builder to have been initialized, But the appContext.builder received `undefined`"
+    );
   }
-  if (!apiOnly) {
-    compiler = await appContext.builder.createCompiler();
-  }
-  await generateRoutes(appContext);
+  yield generateRoutes(appContext);
+  const serverInternalPlugins = yield getServerInternalPlugins(api);
   const serverOptions = {
-    dev: _objectSpread({
+    dev: __spreadValues({
       port,
       https: normalizedConfig.dev.https
-    }, (_normalizedConfig$too = normalizedConfig.tools) === null || _normalizedConfig$too === void 0 ? void 0 : _normalizedConfig$too.devServer),
-    compiler: compiler || null,
+    }, (_a = normalizedConfig.tools) == null ? void 0 : _a.devServer),
     pwd: appDirectory,
     config: normalizedConfig,
     serverConfigFile,
     internalPlugins: injectDataLoaderPlugin(serverInternalPlugins)
   };
   if (apiOnly) {
-    const app = await createServer(serverOptions);
-    app.listen(port, async err => {
+    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 {
-    await appContext.builder.startDevServer({
-      compiler,
+    const { server } = yield appContext.builder.startDevServer({
       printURLs: false,
       serverOptions
     });
+    setServer(server);
   }
-  await createFileWatcher(appContext, normalizedConfig.source.configDir, hookRunners);
-};
+  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,13 +1,38 @@
-import { join } from 'path';
-export const inspect = 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());
+  });
+};
+import { join } from "path";
+const inspect = (api, options) => __async(void 0, null, function* () {
   const appContext = api.useAppContext();
   if (!appContext.builder) {
-    throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
+    throw new Error(
+      "Expect the Builder to have been initialized, But the appContext.builder received `undefined`"
+    );
   }
   return appContext.builder.inspectConfig({
     env: options.env,
     verbose: options.verbose,
-    outputPath: join(appContext === null || appContext === void 0 ? void 0 : appContext.builder.context.distPath, options.output),
+    outputPath: join(appContext == null ? void 0 : appContext.builder.context.distPath, options.output),
     writeToDisk: true
   });
-};
+});
+export {
+  inspect
+};

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
+};