@modern-js/app-tools 2.4.0 → 2.5.0

package/dist/{js/modern → esm-node}/builder/builder-webpack/webpackPlugins/RouterPlugin.js

@@ -1,23 +1,3 @@
-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,
@@ -32,6 +12,9 @@ class RouterPlugin {
     if (target === "node" || Array.isArray(target) && target.includes("node")) {
       return;
     }
+    if (target === "webworker" || Array.isArray(target) && target.includes("webworker")) {
+      return;
+    }
     const { webpack } = compiler;
     const { Compilation, sources } = webpack;
     const { RawSource } = sources;
@@ -50,7 +33,7 @@ class RouterPlugin {
           name: PLUGIN_NAME,
           stage: PROCESS_ASSETS_STAGE_REPORT
         },
-        () => __async(this, null, function* () {
+        async () => {
           const stats = compilation.getStats().toJson({
             chunkGroups: true,
             chunks: true
@@ -101,9 +84,9 @@ class RouterPlugin {
             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));
-        })
+          await fs.ensureFile(filename);
+          await fs.writeFile(filename, JSON.stringify(manifest, null, 2));
+        }
       );
     });
   }

package/dist/esm-node/builder/generator/createBuilderProviderConfig.js

@@ -0,0 +1,26 @@
+function createBuilderProviderConfig(resolveConfig, appContext, modifyBuilderConfig) {
+  const htmlConfig = { ...resolveConfig.html };
+  if (!htmlConfig.template) {
+    htmlConfig.templateByEntries = {
+      ...htmlConfig.templateByEntries,
+      ...appContext.htmlTemplates
+    };
+  }
+  const config = {
+    ...resolveConfig,
+    dev: {
+      ...resolveConfig.dev,
+      port: appContext.port
+    },
+    html: htmlConfig,
+    output: {
+      ...resolveConfig.output,
+      cleanDistPath: false
+    }
+  };
+  modifyBuilderConfig == null ? void 0 : modifyBuilderConfig(config);
+  return config;
+}
+export {
+  createBuilderProviderConfig
+};

package/dist/{js/modern → esm-node}/builder/generator/getBuilderTargets.js

@@ -1,10 +1,19 @@
-import { isProd, isSSR, isUseSSRBundle } from "@modern-js/utils";
+import {
+  isProd,
+  isServiceWorker,
+  isSSR,
+  isUseSSRBundle
+} from "@modern-js/utils";
 function getBuilderTargets(normalizedConfig) {
   const targets = ["web"];
   const useNodeTarget = isProd() ? isUseSSRBundle(normalizedConfig) : isSSR(normalizedConfig);
   if (useNodeTarget) {
     targets.push("node");
   }
+  const useWorkerTarget = isProd() ? isServiceWorker(normalizedConfig) : false;
+  if (useWorkerTarget) {
+    targets.push("service-worker");
+  }
   return targets;
 }
 export {

package/dist/esm-node/builder/generator/index.js

@@ -0,0 +1,29 @@
+import { createBuilder } from "@modern-js/builder";
+import { createBuilderProviderConfig } from "./createBuilderProviderConfig";
+import { getBuilderTargets } from "./getBuilderTargets";
+import { createBuilderOptions } from "./createBuilderOptions";
+async function generateBuilder(options, generateProvider, utils) {
+  const { normalizedConfig, appContext } = options;
+  const { modifyBuilderConfig, modifyBuilderInstance } = utils || {};
+  const builderConfig = createBuilderProviderConfig(
+    normalizedConfig,
+    appContext,
+    modifyBuilderConfig
+  );
+  const provider = generateProvider({
+    builderConfig
+  });
+  const target = getBuilderTargets(normalizedConfig);
+  const builderOptions = createBuilderOptions(target, appContext);
+  const builder = await createBuilder(provider, builderOptions);
+  await applyBuilderPlugins(builder, options);
+  await (modifyBuilderInstance == null ? void 0 : modifyBuilderInstance(builder));
+  return builder;
+}
+async function applyBuilderPlugins(builder, options) {
+  const { builderPluginAdapterModern } = await import("../shared/builderPlugins/adapterModern");
+  builder.addPlugins([builderPluginAdapterModern(options)]);
+}
+export {
+  generateBuilder
+};

package/dist/esm-node/builder/index.js

@@ -0,0 +1,17 @@
+async function createBuilderGenerator(bundler) {
+  if (bundler === "rspack") {
+    try {
+      const { createRspackBuilderForModern } = await import("./builder-rspack");
+      return createRspackBuilderForModern;
+    } catch (_) {
+      throw new Error(
+        "Failed to use rspack, please check if you have `@modern-js/builder-rspack-provider` installed"
+      );
+    }
+  }
+  const { createWebpackBuilderForModern } = await import("./builder-webpack");
+  return createWebpackBuilderForModern;
+}
+export {
+  createBuilderGenerator
+};

package/dist/{js/modern → esm-node}/builder/shared/builderPlugins/adapterModern.js

@@ -1,22 +1,3 @@
-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));
 import {
   mergeBuilderConfig
 } from "@modern-js/builder-shared";
@@ -58,13 +39,17 @@ const builderPluginAdapterModern = (options) => ({
       const builderConfig = api.getNormalizedConfig();
       if (target === "node") {
         chain.name("server");
+      } else if (target === "service-worker") {
+        chain.name("service-worker");
+      } else if (target === "web-worker") {
+        chain.name("worker");
       } else if (target === "modern-web") {
         chain.name("modern");
       } else {
         chain.name("client");
       }
-      if (target === "node") {
-        applyNodeCompat(chain, normalizedConfig, isProd);
+      if (target === "node" || target === "service-worker") {
+        applyNodeCompat(target, chain, normalizedConfig, isProd);
       }
       if (isHtmlEnabled(builderConfig, target)) {
         applyBottomHtmlPlugin({
@@ -80,7 +65,7 @@ const builderPluginAdapterModern = (options) => ({
           CHAIN_ID
         });
       }
-      if (target !== "node") {
+      if (target !== "node" && target !== "web-worker" && target !== "service-worker") {
         const bareServerModuleReg = /\.(server|node)\.[tj]sx?$/;
         chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(bareServerModuleReg);
         chain.module.rule("bare-server-module").test(bareServerModuleReg).use("server-module-loader").loader(require.resolve("../loaders/serverModuleLoader"));
@@ -89,7 +74,7 @@ const builderPluginAdapterModern = (options) => ({
     applyCallbacks(api, options);
     function isHtmlEnabled(config, target) {
       var _a;
-      return ((_a = config.tools) == null ? void 0 : _a.htmlPlugin) !== false && target !== "node" && target !== "web-worker";
+      return ((_a = config.tools) == null ? void 0 : _a.htmlPlugin) !== false && target !== "node" && target !== "service-worker" && target !== "web-worker";
     }
   }
 });
@@ -111,7 +96,7 @@ function applyBottomHtmlPlugin({
   CHAIN_ID
 }) {
   for (const entryName of Object.keys(api.context.entry)) {
-    const baseTemplateParams = __spreadValues({
+    const baseTemplateParams = {
       entryName,
       title: getEntryOptions(
         entryName,
@@ -119,20 +104,22 @@ function applyBottomHtmlPlugin({
         modernConfig.html.titleByEntries,
         appContext.packageName
       ),
-      mountId: modernConfig.html.mountId
-    }, getEntryOptions(
-      entryName,
-      modernConfig.html.templateParameters,
-      modernConfig.html.templateParametersByEntries,
-      appContext.packageName
-    ));
+      mountId: modernConfig.html.mountId,
+      ...getEntryOptions(
+        entryName,
+        modernConfig.html.templateParameters,
+        modernConfig.html.templateParametersByEntries,
+        appContext.packageName
+      )
+    };
     chain.plugin(`${CHAIN_ID.PLUGIN.HTML}-${entryName}`).tap((args) => [
-      __spreadProps(__spreadValues({}, args[0] || {}), {
+      {
+        ...args[0] || {},
         __internal__: true,
         bottomTemplate: appContext.htmlTemplates[`__${entryName}-bottom__`] && lodashTemplate(appContext.htmlTemplates[`__${entryName}-bottom__`])(
           baseTemplateParams
         )
-      })
+      }
     ]);
   }
   chain.plugin(CHAIN_ID.PLUGIN.BOTTOM_TEMPLATE).use(BottomTemplatePlugin, [HtmlWebpackPlugin]);
@@ -146,8 +133,8 @@ function applyAsyncChunkHtmlPlugin({
     chain.plugin(CHAIN_ID.PLUGIN.HTML_ASYNC_CHUNK).use(HtmlAsyncChunkPlugin, [HtmlWebpackPlugin]);
   }
 }
-function applyNodeCompat(chain, modernConfig, isProd) {
-  for (const ext of [
+function applyNodeCompat(target, chain, modernConfig, isProd) {
+  const nodeExts = [
     ".node.js",
     ".node.jsx",
     ".node.ts",
@@ -156,9 +143,21 @@ function applyNodeCompat(chain, modernConfig, isProd) {
     ".server.ts",
     ".server.ts",
     ".server.tsx"
-  ]) {
+  ];
+  const webWorkerExts = [
+    ".worker.js",
+    ".worker.jsx",
+    ".worker.ts",
+    ".worker.tsx"
+  ];
+  for (const ext of nodeExts) {
     chain.resolve.extensions.prepend(ext);
   }
+  if (target === "service-worker") {
+    for (const ext of webWorkerExts) {
+      chain.resolve.extensions.prepend(ext);
+    }
+  }
   filterEntriesBySSRConfig(
     isProd,
     chain,

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

@@ -0,0 +1,52 @@
+import { ResolvedConfigContext } from "@modern-js/core";
+import { logger, printBuildError } from "@modern-js/utils";
+import { generateRoutes } from "../utils/routes";
+import { buildServerConfig } from "../utils/config";
+const build = async (api, options) => {
+  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;
+  if (apiOnly) {
+    const { appDirectory: appDirectory2, distDirectory: distDirectory2, serverConfigFile: serverConfigFile2 } = appContext;
+    await hookRunners.beforeBuild({
+      bundlerConfigs: void 0
+    });
+    await buildServerConfig({
+      appDirectory: appDirectory2,
+      distDirectory: distDirectory2,
+      configFile: serverConfigFile2
+    });
+    await generateRoutes(appContext);
+    await hookRunners.afterBuild({
+      stats: void 0
+    });
+    return;
+  }
+  resolvedConfig = { ...resolvedConfig, cliOptions: options };
+  ResolvedConfigContext.set(resolvedConfig);
+  const { distDirectory, appDirectory, serverConfigFile } = appContext;
+  await buildServerConfig({
+    appDirectory,
+    distDirectory,
+    configFile: serverConfigFile
+  });
+  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`"
+      );
+    }
+    await appContext.builder.build();
+  } catch (error) {
+    printBuildError(error);
+    process.exit(1);
+  }
+};
+export {
+  build
+};

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

@@ -0,0 +1,8 @@
+const deploy = async (api, options) => {
+  const hookRunners = api.useHookRunners();
+  await hookRunners.beforeDeploy(options);
+  await hookRunners.afterDeploy(options);
+};
+export {
+  deploy
+};

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

@@ -0,0 +1,72 @@
+import { ResolvedConfigContext } from "@modern-js/core";
+import { printInstructions } from "../utils/printInstructions";
+import {
+  setServer,
+  createServer,
+  injectDataLoaderPlugin
+} from "../utils/createServer";
+import { generateRoutes } from "../utils/routes";
+import { buildServerConfig } from "../utils/config";
+import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
+const dev = async (api, options) => {
+  var _a;
+  if (options.analyze) {
+    process.env.BUNDLE_ANALYZE = "true";
+  }
+  let normalizedConfig = api.useResolvedConfigContext();
+  const appContext = api.useAppContext();
+  const hookRunners = api.useHookRunners();
+  normalizedConfig = { ...normalizedConfig, cliOptions: options };
+  ResolvedConfigContext.set(normalizedConfig);
+  const { appDirectory, distDirectory, port, apiOnly, serverConfigFile } = appContext;
+  await buildServerConfig({
+    appDirectory,
+    distDirectory,
+    configFile: serverConfigFile,
+    options: {
+      esbuildOptions: {
+        watch: true
+      }
+    }
+  });
+  await 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 serverInternalPlugins = await getServerInternalPlugins(api);
+  const serverOptions = {
+    dev: {
+      port,
+      https: normalizedConfig.dev.https,
+      ...(_a = normalizedConfig.tools) == null ? void 0 : _a.devServer
+    },
+    pwd: appDirectory,
+    config: normalizedConfig,
+    serverConfigFile,
+    internalPlugins: injectDataLoaderPlugin(serverInternalPlugins)
+  };
+  if (apiOnly) {
+    const app = await createServer({
+      ...serverOptions,
+      compiler: null
+    });
+    app.listen(port, async (err) => {
+      if (err) {
+        throw err;
+      }
+      printInstructions(hookRunners, appContext, normalizedConfig);
+    });
+  } else {
+    const { server } = await appContext.builder.startDevServer({
+      printURLs: false,
+      serverOptions
+    });
+    setServer(server);
+  }
+};
+export {
+  dev
+};

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

@@ -0,0 +1,18 @@
+import { join } from "path";
+const inspect = async (api, options) => {
+  const appContext = api.useAppContext();
+  if (!appContext.builder) {
+    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 ? void 0 : appContext.builder.context.distPath, options.output),
+    writeToDisk: true
+  });
+};
+export {
+  inspect
+};

package/dist/{js/modern → esm-node}/commands/serve.js

@@ -1,54 +1,34 @@
-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* () {
+const start = async (api) => {
   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(
+  const apiOnly = await isApiOnly(
     appContext.appDirectory,
     (_a = userConfig == null ? void 0 : userConfig.source) == null ? void 0 : _a.entriesDir
   );
-  const serverInternalPlugins = yield getServerInternalPlugins(api);
-  const app = yield server({
+  const serverInternalPlugins = await getServerInternalPlugins(api);
+  const app = await server({
     pwd: appDirectory,
     config: userConfig,
     serverConfigFile,
     internalPlugins: injectDataLoaderPlugin(serverInternalPlugins),
     apiOnly
   });
-  app.listen(port, (err) => __async(void 0, null, function* () {
+  app.listen(port, async (err) => {
     if (err) {
       throw err;
     }
-    yield printInstructions(hookRunners, appContext, userConfig);
-  }));
-});
+    await printInstructions(hookRunners, appContext, userConfig);
+  });
+};
 export {
   start
 };

package/dist/{js/modern → esm-node}/config/default.js

@@ -1,32 +1,16 @@
-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));
 import { createDefaultConfig as createDefaultBuilderConfig } from "@modern-js/builder-webpack-provider";
 function createDefaultConfig(appContext, bundler) {
   const defaultBuilderConfig = createDefaultBuilderConfig();
-  const dev = __spreadProps(__spreadValues({}, defaultBuilderConfig.dev), {
+  const dev = {
+    ...defaultBuilderConfig.dev,
     port: void 0
-  });
-  const output = __spreadProps(__spreadValues({}, defaultBuilderConfig.output), {
+  };
+  const output = {
+    ...defaultBuilderConfig.output,
     disableNodePolyfill: true
-  });
-  const source = __spreadProps(__spreadValues({}, defaultBuilderConfig.source), {
+  };
+  const source = {
+    ...defaultBuilderConfig.source,
     entries: void 0,
     enableAsyncEntry: false,
     disableDefaultEntries: false,
@@ -38,8 +22,9 @@ function createDefaultConfig(appContext, bundler) {
       "@": appContext.srcDirectory,
       "@shared": appContext.sharedDirectory
     }
-  });
-  const html = __spreadProps(__spreadValues({}, defaultBuilderConfig.html), {
+  };
+  const html = {
+    ...defaultBuilderConfig.html,
     title: "",
     meta: {
       charset: { charset: "utf-8" },
@@ -51,7 +36,7 @@ function createDefaultConfig(appContext, bundler) {
       "wap-font-scale": "no",
       "format-detection": "telephone=no"
     }
-  });
+  };
   const server = {
     routes: void 0,
     publicRoutes: void 0,
@@ -60,7 +45,9 @@ function createDefaultConfig(appContext, bundler) {
     baseUrl: "/",
     port: 8080
   };
-  const tools = bundler === "webpack" ? __spreadValues({}, defaultBuilderConfig.tools) : void 0;
+  const tools = bundler === "webpack" ? {
+    ...defaultBuilderConfig.tools
+  } : void 0;
   return {
     source,
     output,

package/dist/{js/modern → esm-node}/config/initialize/inits.js

@@ -1,22 +1,3 @@
-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));
 import path, { dirname, isAbsolute, posix, sep } from "path";
 import {
   applyOptionsChain,
@@ -68,7 +49,7 @@ function initSourceConfig(config, appContext, bundler) {
   function createBuilderGlobalVars(config2, appContext2) {
     const { globalVars = {} } = config2.source;
     const publicEnv = getAutoInjectEnv(appContext2);
-    return __spreadValues(__spreadValues({}, globalVars), publicEnv);
+    return { ...globalVars, ...publicEnv };
   }
   function createBuilderInclude(config2, appContext2) {
     const { include } = config2.source;
@@ -138,10 +119,11 @@ function initToolsConfig(config) {
   config.tools.tsChecker = applyOptionsChain(defaultTsChecker, tsChecker);
   tsLoader && (config.tools.tsLoader = (tsLoaderConfig, utils) => {
     applyOptionsChain(
-      __spreadProps(__spreadValues({}, tsLoaderConfig), {
+      {
+        ...tsLoaderConfig,
         transpileOnly: false,
         allowTsInNodeModules: true
-      }),
+      },
       tsLoader || {},
       utils
     );

package/dist/esm-node/defineConfig.js

@@ -0,0 +1,9 @@
+const defineConfig = (config) => config;
+const defineLegacyConfig = (config) => ({
+  ...config,
+  legacy: true
+});
+export {
+  defineConfig,
+  defineLegacyConfig
+};