@modern-js/app-tools 0.0.0-nightly-20240304170717 → 0.0.0-nightly-20240306170726

package/dist/cjs/builder/generator/index.js

@@ -49,11 +49,12 @@ async function generateBuilder(options, bundlerType) {
   return builder;
 }
 async function applyBuilderPlugins(builder, options) {
-  const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR } = await Promise.resolve().then(() => __toESM(require("../shared/builderPlugins")));
+  const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, builderPluginAdapterWorker } = await Promise.resolve().then(() => __toESM(require("../shared/builderPlugins")));
   builder.addPlugins([
     builderPluginAdapterBasic(),
     builderPluginAdapterSSR(options),
-    builderPluginAdapterHtml(options)
+    builderPluginAdapterHtml(options),
+    builderPluginAdapterWorker()
   ]);
   const { normalizedConfig } = options;
   if (!normalizedConfig.output.disableNodePolyfill) {

package/dist/cjs/builder/shared/builderPlugins/adapterSSR.js

@@ -33,6 +33,7 @@ __export(adapterSSR_exports, {
 module.exports = __toCommonJS(adapterSSR_exports);
 var path = __toESM(require("path"));
 var import_shared = require("@rsbuild/shared");
+var import_core = require("@rsbuild/core");
 var import_utils = require("@modern-js/utils");
 var import_bundlerPlugins = require("../bundlerPlugins");
 var import_utils2 = require("../../../analyze/utils");
@@ -42,7 +43,7 @@ const builderPluginAdapterSSR = (options) => ({
     const { normalizedConfig } = options;
     api.modifyRsbuildConfig((config) => {
       if (isStreamingSSR(normalizedConfig)) {
-        return (0, import_shared.mergeRsbuildConfig)(config, {
+        return (0, import_core.mergeRsbuildConfig)(config, {
           html: {
             inject: "body"
           }

package/dist/cjs/builder/shared/builderPlugins/adapterWorker.js

@@ -0,0 +1,49 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var adapterWorker_exports = {};
+__export(adapterWorker_exports, {
+  builderPluginAdapterWorker: () => builderPluginAdapterWorker
+});
+module.exports = __toCommonJS(adapterWorker_exports);
+var import_path = require("path");
+const getDistPath = (outputConfig, type) => {
+  const { distPath } = outputConfig;
+  const ret = distPath[type];
+  if (typeof ret !== "string") {
+    throw new Error(`unknown key ${type} in "output.distPath"`);
+  }
+  return ret;
+};
+const builderPluginAdapterWorker = () => ({
+  name: "builder-plugin-adapter-worker",
+  setup(api) {
+    api.modifyBundlerChain(async (chain, { isServiceWorker }) => {
+      const config = api.getNormalizedConfig();
+      if (isServiceWorker) {
+        const workerPath = getDistPath(config.output, "worker");
+        const filename = import_path.posix.join(workerPath, `[name].js`);
+        chain.output.filename(filename).chunkFilename(filename).libraryTarget("commonjs2");
+      }
+    });
+  }
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  builderPluginAdapterWorker
+});

package/dist/cjs/builder/shared/builderPlugins/index.js

@@ -18,9 +18,11 @@ module.exports = __toCommonJS(builderPlugins_exports);
 __reExport(builderPlugins_exports, require("./adapterBasic"), module.exports);
 __reExport(builderPlugins_exports, require("./adapterHtml"), module.exports);
 __reExport(builderPlugins_exports, require("./adapterSSR"), module.exports);
+__reExport(builderPlugins_exports, require("./adapterWorker"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./adapterBasic"),
   ...require("./adapterHtml"),
-  ...require("./adapterSSR")
+  ...require("./adapterSSR"),
+  ...require("./adapterWorker")
 });

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

@@ -48,7 +48,7 @@ function applyBuilderPlugins(builder, options) {
 }
 function _applyBuilderPlugins() {
   _applyBuilderPlugins = _async_to_generator(function(builder, options) {
-    var _ref, builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, normalizedConfig, pluginNodePolyfill;
+    var _ref, builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, builderPluginAdapterWorker, normalizedConfig, pluginNodePolyfill;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -57,11 +57,12 @@ function _applyBuilderPlugins() {
             import("../shared/builderPlugins")
           ];
         case 1:
-          _ref = _state.sent(), builderPluginAdapterBasic = _ref.builderPluginAdapterBasic, builderPluginAdapterHtml = _ref.builderPluginAdapterHtml, builderPluginAdapterSSR = _ref.builderPluginAdapterSSR;
+          _ref = _state.sent(), builderPluginAdapterBasic = _ref.builderPluginAdapterBasic, builderPluginAdapterHtml = _ref.builderPluginAdapterHtml, builderPluginAdapterSSR = _ref.builderPluginAdapterSSR, builderPluginAdapterWorker = _ref.builderPluginAdapterWorker;
           builder.addPlugins([
             builderPluginAdapterBasic(),
             builderPluginAdapterSSR(options),
-            builderPluginAdapterHtml(options)
+            builderPluginAdapterHtml(options),
+            builderPluginAdapterWorker()
           ]);
           normalizedConfig = options.normalizedConfig;
           if (!!normalizedConfig.output.disableNodePolyfill)

package/dist/esm/builder/shared/builderPlugins/adapterSSR.js

@@ -1,7 +1,8 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import * as path from "path";
-import { isHtmlDisabled, mergeRsbuildConfig } from "@rsbuild/shared";
+import { isHtmlDisabled } from "@rsbuild/shared";
+import { mergeRsbuildConfig } from "@rsbuild/core";
 import { isSSR, fs } from "@modern-js/utils";
 import { HtmlAsyncChunkPlugin, RouterPlugin } from "../bundlerPlugins";
 import { getServerCombinedModueFile } from "../../../analyze/utils";

package/dist/esm/builder/shared/builderPlugins/adapterWorker.js

@@ -0,0 +1,41 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import { posix } from "path";
+var getDistPath = function(outputConfig, type) {
+  var distPath = outputConfig.distPath;
+  var ret = distPath[type];
+  if (typeof ret !== "string") {
+    throw new Error("unknown key ".concat(type, ' in "output.distPath"'));
+  }
+  return ret;
+};
+var builderPluginAdapterWorker = function() {
+  return {
+    name: "builder-plugin-adapter-worker",
+    setup: function setup(api) {
+      api.modifyBundlerChain(function() {
+        var _ref = _async_to_generator(function(chain, param) {
+          var isServiceWorker, config, workerPath, filename;
+          return _ts_generator(this, function(_state) {
+            isServiceWorker = param.isServiceWorker;
+            config = api.getNormalizedConfig();
+            if (isServiceWorker) {
+              workerPath = getDistPath(config.output, "worker");
+              filename = posix.join(workerPath, "[name].js");
+              chain.output.filename(filename).chunkFilename(filename).libraryTarget("commonjs2");
+            }
+            return [
+              2
+            ];
+          });
+        });
+        return function(chain, _) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+    }
+  };
+};
+export {
+  builderPluginAdapterWorker
+};

package/dist/esm/builder/shared/builderPlugins/index.js

@@ -1,3 +1,4 @@
 export * from "./adapterBasic";
 export * from "./adapterHtml";
 export * from "./adapterSSR";
+export * from "./adapterWorker";

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

@@ -16,11 +16,12 @@ async function generateBuilder(options, bundlerType) {
   return builder;
 }
 async function applyBuilderPlugins(builder, options) {
-  const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR } = await import("../shared/builderPlugins");
+  const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, builderPluginAdapterWorker } = await import("../shared/builderPlugins");
   builder.addPlugins([
     builderPluginAdapterBasic(),
     builderPluginAdapterSSR(options),
-    builderPluginAdapterHtml(options)
+    builderPluginAdapterHtml(options),
+    builderPluginAdapterWorker()
   ]);
   const { normalizedConfig } = options;
   if (!normalizedConfig.output.disableNodePolyfill) {

package/dist/esm-node/builder/shared/builderPlugins/adapterSSR.js

@@ -1,5 +1,6 @@
 import * as path from "path";
-import { isHtmlDisabled, mergeRsbuildConfig } from "@rsbuild/shared";
+import { isHtmlDisabled } from "@rsbuild/shared";
+import { mergeRsbuildConfig } from "@rsbuild/core";
 import { isSSR, fs } from "@modern-js/utils";
 import { HtmlAsyncChunkPlugin, RouterPlugin } from "../bundlerPlugins";
 import { getServerCombinedModueFile } from "../../../analyze/utils";

package/dist/esm-node/builder/shared/builderPlugins/adapterWorker.js

@@ -0,0 +1,25 @@
+import { posix } from "path";
+const getDistPath = (outputConfig, type) => {
+  const { distPath } = outputConfig;
+  const ret = distPath[type];
+  if (typeof ret !== "string") {
+    throw new Error(`unknown key ${type} in "output.distPath"`);
+  }
+  return ret;
+};
+const builderPluginAdapterWorker = () => ({
+  name: "builder-plugin-adapter-worker",
+  setup(api) {
+    api.modifyBundlerChain(async (chain, { isServiceWorker }) => {
+      const config = api.getNormalizedConfig();
+      if (isServiceWorker) {
+        const workerPath = getDistPath(config.output, "worker");
+        const filename = posix.join(workerPath, `[name].js`);
+        chain.output.filename(filename).chunkFilename(filename).libraryTarget("commonjs2");
+      }
+    });
+  }
+});
+export {
+  builderPluginAdapterWorker
+};

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

@@ -1,3 +1,4 @@
 export * from "./adapterBasic";
 export * from "./adapterHtml";
 export * from "./adapterSSR";
+export * from "./adapterWorker";

package/dist/types/builder/shared/builderPlugins/adapterWorker.d.ts

@@ -0,0 +1,2 @@
+import { RsbuildPlugin } from '@rsbuild/shared';
+export declare const builderPluginAdapterWorker: () => RsbuildPlugin;

package/dist/types/builder/shared/builderPlugins/index.d.ts

@@ -1,3 +1,4 @@
 export * from './adapterBasic';
 export * from './adapterHtml';
 export * from './adapterSSR';
+export * from './adapterWorker';

package/dist/types/config/legacy/index.d.ts

@@ -1,3 +1,3 @@
 import type { AppLegacyNormalizedConfig, AppLegacyUserConfig, AppNormalizedConfig, AppUserConfig } from '../../types';
 export declare function transformNormalizedConfig(config: AppLegacyNormalizedConfig): AppNormalizedConfig<'webpack'>;
-export declare function checkIsLegacyConfig(config: AppLegacyUserConfig | AppUserConfig): config is AppLegacyUserConfig;
+export declare function checkIsLegacyConfig(config: AppLegacyUserConfig | AppUserConfig<'shared'>): config is AppLegacyUserConfig;

package/dist/types/defineConfig.d.ts

@@ -4,7 +4,7 @@ import type { AppLegacyUserConfig, AppUserConfig } from './types';
  * This function helps you to autocomplete configuration types.
  * It accepts a direct config object, or a function that returns a config.
  */
-export declare const defineConfig: <B extends "rspack" | "webpack" = "webpack">(config: UserConfigExport<AppUserConfig<B_1>>) => UserConfigExport<AppUserConfig<B_1>>;
+export declare const defineConfig: <B extends "rspack" | "webpack" = "webpack">(config: UserConfigExport<AppUserConfig<B>>) => UserConfigExport<AppUserConfig<B>>;
 /**
  * @deprecated Please use `defineConfig` instead.
  * `defineLegacyConfig` will be removed in the future major version.

package/dist/types/types/config/index.d.ts

@@ -1,5 +1,6 @@
 import type { ServerUserConfig, BffUserConfig } from '@modern-js/server-core';
 import type { UniBuilderPlugin } from '@modern-js/uni-builder';
+import type { Bundler } from '../utils';
 import type { OutputUserConfig } from './output';
 import type { SourceUserConfig } from './source';
 import type { TestingUserConfig } from './testing';
@@ -17,7 +18,7 @@ export interface RuntimeUserConfig {
 export interface RuntimeByEntriesUserConfig {
     [name: string]: RuntimeUserConfig;
 }
-export interface AppToolsUserConfig {
+export interface AppToolsUserConfig<B extends Bundler> {
     server?: ServerUserConfig;
     source?: SourceUserConfig;
     output?: OutputUserConfig;
@@ -33,7 +34,7 @@ export interface AppToolsUserConfig {
     runtime?: RuntimeUserConfig;
     runtimeByEntries?: RuntimeByEntriesUserConfig;
     html?: HtmlUserConfig;
-    tools?: ToolsUserConfig;
+    tools?: ToolsUserConfig<B>;
     security?: SecurityUserConfig;
     testing?: TestingUserConfig;
     builderPlugins?: UniBuilderPlugin[];
@@ -44,4 +45,4 @@ interface SharedNormalizedConfig<RawConfig> {
     cliOptions?: Record<string, any>;
     _raw: RawConfig;
 }
-export type AppToolsNormalizedConfig<Config = AppToolsUserConfig> = Required<Config> & SharedNormalizedConfig<Config>;
+export type AppToolsNormalizedConfig<Config = AppToolsUserConfig<'shared'>> = Required<Config> & SharedNormalizedConfig<Config>;

package/dist/types/types/config/tools.d.ts

@@ -2,9 +2,10 @@ import type { JestConfig } from '@modern-js/types';
 import type { PluginSwcOptions } from '@rsbuild/plugin-swc';
 import type { PluginEsbuildOptions } from '@rsbuild/plugin-esbuild';
 import type { UniBuilderConfig } from '@modern-js/uni-builder';
-import type { UnwrapBuilderConfig } from '../utils';
+import type { UnwrapBuilderConfig, Bundler } from '../utils';
 export type Tailwindcss = Record<string, any> | ((options: Record<string, any>) => Record<string, any> | void);
-export interface ToolsUserConfig extends UnwrapBuilderConfig<UniBuilderConfig, 'tools'> {
+type BuilderToolsConfig = UnwrapBuilderConfig<UniBuilderConfig, 'tools'>;
+export interface ToolsUserConfig<B extends Bundler = 'webpack'> extends Omit<BuilderToolsConfig, 'swc'> {
     /**
      * Used to custom Tailwind CSS configurations.
      * @requires `tailwindcss` plugin.
@@ -25,7 +26,7 @@ export interface ToolsUserConfig extends UnwrapBuilderConfig<UniBuilderConfig, '
      * The configuration of `swc` is provided by `swc` plugin.
      * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
      */
-    swc?: PluginSwcOptions<'outer'>;
+    swc?: B extends 'shared' ? undefined : B extends 'webpack' ? PluginSwcOptions<'outer'> : BuilderToolsConfig['swc'];
     /**
      * Used to custom Esbuild configurations.
      * @requires `esbuild` plugin.
@@ -34,3 +35,4 @@ export interface ToolsUserConfig extends UnwrapBuilderConfig<UniBuilderConfig, '
      */
     esbuild?: PluginEsbuildOptions;
 }
+export {};

package/dist/types/types/index.d.ts

@@ -12,8 +12,8 @@ export type { ServerUserConfig, ServerNormalizedConfig, BffUserConfig, BffNormal
 export type { IAppContext, PluginAPI, CliPlugin, NormalizedConfig, UserConfig, } from '@modern-js/core';
 export type AppTools<B extends Bundler = 'webpack'> = {
     hooks: AppToolsHooks<B>;
-    userConfig: AppToolsUserConfig;
-    normalizedConfig: AppToolsNormalizedConfig<AppToolsUserConfig>;
+    userConfig: AppToolsUserConfig<B>;
+    normalizedConfig: AppToolsNormalizedConfig<AppToolsUserConfig<'shared'>>;
 };
 export type LegacyAppTools = {
     hooks: AppToolsHooks;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-nightly-20240304170717",
+  "version": "0.0.0-nightly-20240306170726",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -69,37 +69,37 @@
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.23.0",
-    "@rsbuild/plugin-esbuild": "0.4.8",
-    "@rsbuild/plugin-node-polyfill": "0.4.8",
-    "@rsbuild/shared": "0.4.8",
-    "@rsbuild/core": "0.4.8",
+    "@rsbuild/plugin-esbuild": "0.4.11",
+    "@rsbuild/plugin-node-polyfill": "0.4.11",
+    "@rsbuild/shared": "0.4.11",
+    "@rsbuild/core": "0.4.11",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.17.19",
     "@swc/helpers": "0.5.3",
-    "@modern-js/uni-builder": "0.0.0-nightly-20240304170717",
-    "@modern-js/core": "0.0.0-nightly-20240304170717",
-    "@modern-js/plugin": "0.0.0-nightly-20240304170717",
-    "@modern-js/plugin-data-loader": "0.0.0-nightly-20240304170717",
-    "@modern-js/plugin-i18n": "0.0.0-nightly-20240304170717",
-    "@modern-js/plugin-lint": "0.0.0-nightly-20240304170717",
-    "@modern-js/prod-server": "0.0.0-nightly-20240304170717",
-    "@modern-js/node-bundle-require": "0.0.0-nightly-20240304170717",
-    "@modern-js/server": "0.0.0-nightly-20240304170717",
-    "@modern-js/types": "0.0.0-nightly-20240304170717",
-    "@modern-js/server-utils": "0.0.0-nightly-20240304170717",
-    "@modern-js/utils": "0.0.0-nightly-20240304170717",
-    "@modern-js/server-core": "0.0.0-nightly-20240304170717"
+    "@modern-js/uni-builder": "0.0.0-nightly-20240306170726",
+    "@modern-js/core": "0.0.0-nightly-20240306170726",
+    "@modern-js/node-bundle-require": "0.0.0-nightly-20240306170726",
+    "@modern-js/plugin": "0.0.0-nightly-20240306170726",
+    "@modern-js/plugin-data-loader": "0.0.0-nightly-20240306170726",
+    "@modern-js/plugin-i18n": "0.0.0-nightly-20240306170726",
+    "@modern-js/plugin-lint": "0.0.0-nightly-20240306170726",
+    "@modern-js/types": "0.0.0-nightly-20240306170726",
+    "@modern-js/server": "0.0.0-nightly-20240306170726",
+    "@modern-js/server-utils": "0.0.0-nightly-20240306170726",
+    "@modern-js/prod-server": "0.0.0-nightly-20240306170726",
+    "@modern-js/utils": "0.0.0-nightly-20240306170726",
+    "@modern-js/server-core": "0.0.0-nightly-20240306170726"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.4.8",
+    "@rsbuild/plugin-swc": "0.4.11",
     "@types/babel__traverse": "7.18.5",
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
     "webpack": "^5.89.0",
-    "@scripts/build": "0.0.0-nightly-20240304170717",
-    "@scripts/jest-config": "0.0.0-nightly-20240304170717"
+    "@scripts/build": "0.0.0-nightly-20240306170726",
+    "@scripts/jest-config": "0.0.0-nightly-20240306170726"
   },
   "sideEffects": false,
   "publishConfig": {