@modern-js/app-tools 2.47.1 → 2.48.1

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/esm-node/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 class HtmlAsyncChunkPlugin {
   apply(compiler) {
     compiler.hooks.compilation.tap(this.name, (compilation) => {
@@ -22,8 +21,6 @@ class HtmlAsyncChunkPlugin {
     });
   }
   constructor(htmlWebpackPlugin) {
-    _define_property(this, "name", void 0);
-    _define_property(this, "htmlWebpackPlugin", void 0);
     this.name = "HtmlAsyncChunkPlugin";
     this.htmlWebpackPlugin = htmlWebpackPlugin;
   }

package/dist/esm-node/builder/shared/bundlerPlugins/HtmlBottomTemplate.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 class BottomTemplatePlugin {
   apply(compiler) {
     compiler.hooks.compilation.tap(this.name, (compilation) => {
@@ -21,10 +20,8 @@ ${match}`);
     });
   }
   constructor(htmlWebpackPlugin) {
-    _define_property(this, "htmlWebpackPlugin", void 0);
-    _define_property(this, "bottomTemplateReg", /<!--<\?-\s*bottomTemplate\s*\?>-->/);
-    _define_property(this, "bodyRegExp", /(<\/\s*body\s*>)/i);
-    _define_property(this, "name", void 0);
+    this.bottomTemplateReg = /<!--<\?-\s*bottomTemplate\s*\?>-->/;
+    this.bodyRegExp = /(<\/\s*body\s*>)/i;
     this.htmlWebpackPlugin = htmlWebpackPlugin;
     this.name = "bottom-template";
   }

package/dist/esm-node/builder/shared/bundlerPlugins/RouterPlugin.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { createHash } from "crypto";
 import { mergeWith } from "@modern-js/utils/lodash";
 import { ROUTE_MANIFEST_FILE } from "@modern-js/utils";
@@ -206,13 +205,7 @@ class RouterPlugin {
     });
   }
   constructor({ staticJsDir = "static/js", HtmlBundlerPlugin, enableInlineRouteManifests, disableFilenameHash = false, scriptLoading = "defer", nonce }) {
-    _define_property(this, "name", "RouterPlugin");
-    _define_property(this, "HtmlBundlerPlugin", void 0);
-    _define_property(this, "enableInlineRouteManifests", void 0);
-    _define_property(this, "staticJsDir", void 0);
-    _define_property(this, "disableFilenameHash", void 0);
-    _define_property(this, "scriptLoading", void 0);
-    _define_property(this, "nonce", void 0);
+    this.name = "RouterPlugin";
     this.HtmlBundlerPlugin = HtmlBundlerPlugin;
     this.enableInlineRouteManifests = enableInlineRouteManifests;
     this.staticJsDir = staticJsDir;

package/dist/esm-node/index.js

@@ -1,6 +1,6 @@
 import path from "path";
 import { lintPlugin } from "@modern-js/plugin-lint";
-import { cleanRequireCache, emptyDir, getCommand, getArgv, fs, NESTED_ROUTE_SPEC_FILE } from "@modern-js/utils";
+import { cleanRequireCache, emptyDir, getCommand, getArgv, fs, NESTED_ROUTE_SPEC_FILE, newAction, upgradeAction } from "@modern-js/utils";
 import { castArray } from "@modern-js/utils/lodash";
 import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
 import analyzePlugin from "./analyze";
@@ -123,18 +123,18 @@ const appTools = (options = {
           process.exit(0);
         });
         program.command("new").usage("[options]").description(i18n.t(localeKeys.command.new.describe)).option("--config-file <configFile>", i18n.t(localeKeys.command.shared.config)).option("--lang <lang>", i18n.t(localeKeys.command.new.lang)).option("-c, --config <config>", i18n.t(localeKeys.command.new.config)).option("-d, --debug", i18n.t(localeKeys.command.new.debug), false).option("--dist-tag <tag>", i18n.t(localeKeys.command.new.distTag)).option("--registry", i18n.t(localeKeys.command.new.registry)).option("--no-need-install", i18n.t(localeKeys.command.shared.noNeedInstall)).action(async (options2) => {
-          const { MWANewAction } = await import("@modern-js/new-action");
-          await MWANewAction({
+          await newAction({
             ...options2,
             locale: options2.lang || locale
-          });
+          }, "mwa");
         });
         program.command("inspect").description("inspect the internal configs").option(`--env <env>`, i18n.t(localeKeys.command.inspect.env), "development").option("--output <output>", i18n.t(localeKeys.command.inspect.output), "/").option("--verbose", i18n.t(localeKeys.command.inspect.verbose)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(async (options2) => {
           const { inspect } = await import("./commands/inspect");
           inspect(api, options2);
         });
-        const { defineCommand } = await import("@modern-js/upgrade");
-        defineCommand(program.command("upgrade").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("--no-need-install", i18n.t(localeKeys.command.shared.noNeedInstall)));
+        program.command("upgrade").allowUnknownOption().option("-h --help", "Show help").action(async () => {
+          await upgradeAction();
+        });
       },
       async prepare() {
         const command = getCommand();

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": "2.47.1",
+  "version": "2.48.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -69,39 +69,37 @@
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.23.0",
-    "@rsbuild/plugin-esbuild": "0.4.6",
-    "@rsbuild/plugin-node-polyfill": "0.4.6",
-    "@rsbuild/shared": "0.4.6",
-    "@rsbuild/core": "0.4.6",
+    "@rsbuild/plugin-esbuild": "0.4.15",
+    "@rsbuild/plugin-node-polyfill": "0.4.15",
+    "@rsbuild/shared": "0.4.15",
+    "@rsbuild/core": "0.4.15",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.17.19",
     "@swc/helpers": "0.5.3",
-    "@modern-js/uni-builder": "2.47.1",
-    "@modern-js/core": "2.47.1",
-    "@modern-js/new-action": "2.47.1",
-    "@modern-js/plugin": "2.47.1",
-    "@modern-js/plugin-data-loader": "2.47.1",
-    "@modern-js/node-bundle-require": "2.47.1",
-    "@modern-js/plugin-i18n": "2.47.1",
-    "@modern-js/prod-server": "2.47.1",
-    "@modern-js/server": "2.47.1",
-    "@modern-js/server-utils": "2.47.1",
-    "@modern-js/plugin-lint": "2.47.1",
-    "@modern-js/types": "2.47.1",
-    "@modern-js/upgrade": "2.47.1",
-    "@modern-js/utils": "2.47.1",
-    "@modern-js/server-core": "2.47.1"
+    "@modern-js/uni-builder": "2.48.1",
+    "@modern-js/core": "2.48.1",
+    "@modern-js/plugin": "2.48.1",
+    "@modern-js/node-bundle-require": "2.48.1",
+    "@modern-js/plugin-data-loader": "2.48.1",
+    "@modern-js/plugin-lint": "2.48.1",
+    "@modern-js/plugin-i18n": "2.48.1",
+    "@modern-js/prod-server": "2.48.1",
+    "@modern-js/server": "2.48.1",
+    "@modern-js/server-utils": "2.48.1",
+    "@modern-js/types": "2.48.1",
+    "@modern-js/utils": "2.48.1",
+    "@modern-js/server-core": "2.48.1"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.4.6",
+    "@rsbuild/plugin-swc": "0.4.15",
     "@types/babel__traverse": "7.18.5",
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
     "webpack": "^5.89.0",
-    "@scripts/build": "2.47.1",
-    "@scripts/jest-config": "2.47.1"
+    "@scripts/build": "2.48.1",
+    "@scripts/jest-config": "2.48.1"
   },
   "sideEffects": false,
   "publishConfig": {