@rsbuild/webpack 0.1.8 → 0.2.0

package/dist/core/initConfigs.js

@@ -30,11 +30,11 @@ async function initConfigs({
   pluginStore,
   rsbuildOptions
 }) {
-  await (0, import_provider.initRsbuildConfig)({
+  const normalizedConfig = await (0, import_provider.initRsbuildConfig)({
     context,
     pluginStore
   });
-  const targets = (0, import_shared.castArray)(rsbuildOptions.target);
+  const { targets } = normalizedConfig.output;
   const webpackConfigs = await Promise.all(
     targets.map((target) => (0, import_webpackConfig.generateWebpackConfig)({ target, context }))
   );

package/dist/core/inspectConfig.d.ts

@@ -1,5 +1,5 @@
 import { InitConfigsOptions } from './initConfigs';
-import { InspectConfigOptions } from '@rsbuild/shared';
+import { type InspectConfigResult, type InspectConfigOptions } from '@rsbuild/shared';
 import type { WebpackConfig } from '../types';
 export declare function inspectConfig({
   context,
@@ -10,22 +10,4 @@ export declare function inspectConfig({
 }: InitConfigsOptions & {
   inspectOptions?: InspectConfigOptions;
   bundlerConfigs?: WebpackConfig[];
-}): Promise<{
-  rsbuildConfig: string;
-  bundlerConfigs: string[];
-  origin: {
-    rsbuildConfig: {
-      pluginNames: string[];
-      dev?: import("@rsbuild/shared").DevConfig | undefined;
-      server?: import("@rsbuild/shared").ServerConfig | undefined;
-      html?: import("@rsbuild/shared").HtmlConfig | undefined;
-      tools?: import("@rsbuild/shared").ToolsConfig | undefined;
-      source?: import("@rsbuild/shared").SourceConfig | undefined;
-      output?: import("@rsbuild/shared").OutputConfig | undefined;
-      security?: import("@rsbuild/shared").SecurityConfig | undefined;
-      performance?: import("@rsbuild/shared").PerformanceConfig | undefined;
-      plugins?: import("@rsbuild/shared").RsbuildPlugin[] | undefined;
-    };
-    bundlerConfigs: WebpackConfig[];
-  };
-}>;
+}): Promise<InspectConfigResult<'webpack'>>;

package/dist/core/inspectConfig.js

@@ -42,7 +42,7 @@ async function inspectConfig({
     rsbuildOptions
   })).webpackConfigs;
   const rsbuildDebugConfig = {
-    ...context.config,
+    ...context.normalizedConfig,
     pluginNames: pluginStore.plugins.map((p) => p.name)
   };
   const rawRsbuildConfig = await (0, import_shared.stringifyConfig)(
@@ -60,13 +60,13 @@ async function inspectConfig({
   }
   if (inspectOptions.writeToDisk) {
     await (0, import_shared.outputInspectConfigFiles)({
-      rsbuildConfig: rawRsbuildConfig,
+      rsbuildConfig: context.normalizedConfig,
+      rawRsbuildConfig,
       bundlerConfigs: rawBundlerConfigs,
       inspectOptions: {
         ...inspectOptions,
         outputPath
       },
-      rsbuildOptions,
       configType: "webpack"
     });
   }

package/dist/plugins/css.d.ts

@@ -8,8 +8,7 @@ export declare function applyBaseCSSRule({
     isProd,
     isServer,
     CHAIN_ID,
-    isWebWorker,
-    getCompiledPath
+    isWebWorker
   },
   importLoaders
 }: {

package/dist/plugins/css.js

@@ -37,7 +37,7 @@ async function applyBaseCSSRule({
   rule,
   config,
   context,
-  utils: { target, isProd, isServer, CHAIN_ID, isWebWorker, getCompiledPath },
+  utils: { target, isProd, isServer, CHAIN_ID, isWebWorker },
   importLoaders = 1
 }) {
   const browserslist = await (0, import_shared.getBrowserslistWithDefault)(
@@ -46,12 +46,10 @@ async function applyBaseCSSRule({
     target
   );
   const enableExtractCSS = (0, import_shared.isUseCssExtract)(config, target);
-  const enableSourceMap = (0, import_shared.isUseCssSourceMap)(config);
   const enableCSSModuleTS = Boolean(config.output.enableCssModuleTSDeclaration);
   const localIdentName = (0, import_shared.getCssModuleLocalIdentName)(config, isProd);
   const cssLoaderOptions = (0, import_shared.getCssLoaderOptions)({
     config,
-    enableSourceMap,
     importLoaders,
     isServer,
     isWebWorker,
@@ -84,14 +82,13 @@ async function applyBaseCSSRule({
   } else {
     rule.use(CHAIN_ID.USE.IGNORE_CSS).loader((0, import_shared.resolvePackage)("@rsbuild/shared/ignore-css-loader", __dirname)).end();
   }
-  rule.use(CHAIN_ID.USE.CSS).loader(getCompiledPath("css-loader")).options(cssLoaderOptions).end();
+  rule.use(CHAIN_ID.USE.CSS).loader((0, import_shared.getSharedPkgCompiledPath)("css-loader")).options(cssLoaderOptions).end();
   if (!isServer && !isWebWorker) {
     const postcssLoaderOptions = (0, import_shared.getPostcssConfig)({
-      enableSourceMap,
       browserslist,
       config
     });
-    rule.use(CHAIN_ID.USE.POSTCSS).loader(getCompiledPath("postcss-loader")).options(postcssLoaderOptions).end();
+    rule.use(CHAIN_ID.USE.POSTCSS).loader((0, import_shared.getSharedPkgCompiledPath)("postcss-loader")).options(postcssLoaderOptions).end();
   }
   rule.merge({ sideEffects: true });
   rule.resolve.preferRelative(true);

package/dist/plugins/less.js

@@ -41,7 +41,7 @@ function pluginLess() {
         const { applyBaseCSSRule } = await Promise.resolve().then(() => __toESM(require("./css")));
         const { options, excludes } = (0, import_shared.getLessLoaderOptions)(
           config.tools.less,
-          (0, import_shared.isUseCssSourceMap)(config)
+          config.output.sourceMap.css
         );
         const rule = chain.module.rule(utils.CHAIN_ID.RULE.LESS).test(import_shared.LESS_REGEX);
         excludes.forEach((item) => {
@@ -54,7 +54,7 @@ function pluginLess() {
           context: api.context,
           importLoaders: 2
         });
-        rule.use(utils.CHAIN_ID.USE.LESS).loader(utils.getCompiledPath("less-loader")).options(options);
+        rule.use(utils.CHAIN_ID.USE.LESS).loader((0, import_shared.getSharedPkgCompiledPath)("less-loader")).options(options);
       });
     }
   };

package/dist/plugins/output.js

@@ -39,14 +39,14 @@ const pluginOutput = () => ({
     (0, import_shared.applyOutputPlugin)(api);
     api.modifyBundlerChain(async (chain, { isProd, target, CHAIN_ID }) => {
       const config = api.getNormalizedConfig();
-      const cssPath = (0, import_shared.getDistPath)(config.output, "css");
+      const cssPath = (0, import_shared.getDistPath)(config, "css");
       if ((0, import_shared.isUseCssExtract)(config, target)) {
         const { default: MiniCssExtractPlugin } = await Promise.resolve().then(() => __toESM(require("mini-css-extract-plugin")));
         const extractPluginOptions = (0, import_shared.mergeChainedOptions)({
           defaults: {},
           options: config.tools.cssExtract?.pluginOptions
         });
-        const cssFilename = (0, import_shared.getFilename)(config.output, "css", isProd);
+        const cssFilename = (0, import_shared.getFilename)(config, "css", isProd);
         chain.plugin(CHAIN_ID.PLUGIN.MINI_CSS_EXTRACT).use(MiniCssExtractPlugin, [
           {
             filename: import_path.posix.join(cssPath, cssFilename),

package/dist/plugins/progress.js

@@ -41,7 +41,7 @@ const pluginProgress = () => ({
       if (!options) {
         return;
       }
-      const { ProgressPlugin } = await Promise.resolve().then(() => __toESM(require("../ProgressPlugin/ProgressPlugin")));
+      const { ProgressPlugin } = await Promise.resolve().then(() => __toESM(require("../progress/ProgressPlugin")));
       chain.plugin(CHAIN_ID.PLUGIN.PROGRESS).use(ProgressPlugin, [
         {
           id: import_shared.TARGET_ID_MAP[target],

package/dist/plugins/resolve.js

@@ -67,7 +67,6 @@ const pluginResolve = () => ({
     api.modifyBundlerChain(async (chain, { CHAIN_ID, target }) => {
       const config = api.getNormalizedConfig();
       const isTsProject = Boolean(api.context.tsconfigPath);
-      chain.module.rule(CHAIN_ID.RULE.JS_DATA_URI).resolve.set("fullySpecified", false);
       if (isTsProject && config.source.aliasStrategy === "prefer-tsconfig") {
         await applyTsConfigPathsPlugin({
           chain,

package/dist/plugins/sass.js

@@ -59,13 +59,13 @@ function pluginSass() {
           // postcss-loader, resolve-url-loader, sass-loader
           importLoaders: 3
         });
-        rule.use(utils.CHAIN_ID.USE.RESOLVE_URL_LOADER_FOR_SASS).loader(utils.getCompiledPath("resolve-url-loader")).options({
+        rule.use(utils.CHAIN_ID.USE.RESOLVE_URL_LOADER_FOR_SASS).loader((0, import_shared.getSharedPkgCompiledPath)("resolve-url-loader")).options({
           join: await (0, import_shared.getResolveUrlJoinFn)(),
           // 'resolve-url-loader' relies on 'adjust-sourcemap-loader',
           // it has performance regression issues in some scenarios,
           // so we need to disable the sourceMap option.
           sourceMap: false
-        }).end().use(utils.CHAIN_ID.USE.SASS).loader(utils.getCompiledPath("sass-loader")).options(options);
+        }).end().use(utils.CHAIN_ID.USE.SASS).loader((0, import_shared.getSharedPkgCompiledPath)("sass-loader")).options(options);
       });
     }
   };

package/dist/plugins/server.d.ts

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

package/dist/plugins/{basic.js → server.js}

@@ -26,33 +26,45 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var basic_exports = {};
-__export(basic_exports, {
-  pluginBasic: () => pluginBasic
+var server_exports = {};
+__export(server_exports, {
+  pluginServer: () => pluginServer
 });
-module.exports = __toCommonJS(basic_exports);
-var import_path = __toESM(require("path"));
-var import_shared = require("@rsbuild/shared");
-const pluginBasic = () => ({
-  name: "rsbuild-webpack:basic",
+module.exports = __toCommonJS(server_exports);
+var import_fs = __toESM(require("fs"));
+var import_path = require("path");
+const pluginServer = () => ({
+  name: "rsbuild:server",
   setup(api) {
-    (0, import_shared.applyBasicPlugin)(api);
-    api.modifyBundlerChain(async (chain, { env }) => {
-      chain.performance.hints(false);
-      chain.module.parser.merge({
-        javascript: {
-          exportsPresence: "error"
+    api.modifyBundlerChain(async (chain, { isProd }) => {
+      const config = api.getNormalizedConfig();
+      if (isProd && config.server?.publicDir) {
+        const { name, copyOnBuild } = config.server?.publicDir;
+        if (!copyOnBuild || !name) {
+          return;
         }
-      });
-      if (env === "development") {
-        chain.output.devtoolModuleFilenameTemplate(
-          (info) => import_path.default.resolve(info.absoluteResourcePath).replace(/\\/g, "/")
-        );
+        const publicDir = (0, import_path.isAbsolute)(name) ? name : (0, import_path.join)(api.context.rootPath, name);
+        const publicPattern = [
+          {
+            from: publicDir,
+            to: "",
+            noErrorOnMissing: true
+          }
+        ];
+        if (!import_fs.default.existsSync(publicDir)) {
+          return;
+        }
+        const { default: CopyPlugin } = await Promise.resolve().then(() => __toESM(require("../../compiled/copy-webpack-plugin")));
+        chain.plugin("public-dir").use(CopyPlugin, [
+          {
+            patterns: publicPattern
+          }
+        ]);
       }
     });
   }
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  pluginBasic
+  pluginServer
 });

package/dist/provider.js

@@ -33,7 +33,6 @@ __export(provider_exports, {
 module.exports = __toCommonJS(provider_exports);
 var import_shared = require("@rsbuild/shared");
 var import_provider = require("@rsbuild/core/provider");
-var import_createContext = require("./core/createContext");
 var import_shared2 = require("./shared");
 var import_initConfigs = require("./core/initConfigs");
 function webpackProvider({
@@ -41,7 +40,11 @@ function webpackProvider({
 }) {
   const rsbuildConfig = (0, import_shared.pickRsbuildConfig)(originalRsbuildConfig);
   return async ({ pluginStore, rsbuildOptions, plugins }) => {
-    const context = await (0, import_createContext.createContext)(rsbuildOptions, rsbuildConfig);
+    const context = await (0, import_provider.createContext)(
+      rsbuildOptions,
+      rsbuildConfig,
+      "webpack"
+    );
     const pluginAPI = (0, import_provider.getPluginAPI)({ context, pluginStore });
     context.pluginAPI = pluginAPI;
     return {
@@ -68,6 +71,17 @@ function webpackProvider({
         });
         return createCompiler({ context, webpackConfigs });
       },
+      async createDevServer(options) {
+        const { createDevServer } = await Promise.resolve().then(() => __toESM(require("@rsbuild/core/server")));
+        const { createDevMiddleware } = await Promise.resolve().then(() => __toESM(require("./core/createCompiler")));
+        await (0, import_provider.initRsbuildConfig)({ context, pluginStore });
+        return createDevServer(
+          { context, pluginStore, rsbuildOptions },
+          // @ts-expect-error compile type mismatch
+          createDevMiddleware,
+          options
+        );
+      },
       async startDevServer(options) {
         const { startDevServer } = await Promise.resolve().then(() => __toESM(require("@rsbuild/core/server")));
         const { createDevMiddleware } = await Promise.resolve().then(() => __toESM(require("./core/createCompiler")));

package/dist/shared.js

@@ -37,12 +37,11 @@ var import_path = require("path");
 var import_shared = require("@rsbuild/shared");
 var import_shared2 = require("@rsbuild/shared");
 const applyDefaultPlugins = (plugins) => (0, import_shared2.awaitableGetter)([
-  Promise.resolve().then(() => __toESM(require("./plugins/basic"))).then((m) => m.pluginBasic()),
+  plugins.basic?.(),
   plugins.entry?.(),
   plugins.cache?.(),
   plugins.target?.(),
   Promise.resolve().then(() => __toESM(require("./plugins/output"))).then((m) => m.pluginOutput()),
-  plugins.devtool(),
   Promise.resolve().then(() => __toESM(require("./plugins/resolve"))).then((m) => m.pluginResolve()),
   plugins.fileSize?.(),
   plugins.cleanOutput?.(),
@@ -69,7 +68,7 @@ const applyDefaultPlugins = (plugins) => (0, import_shared2.awaitableGetter)([
   plugins.performance(),
   plugins.networkPerformance(),
   plugins.preloadOrPrefetch(),
-  plugins.server()
+  Promise.resolve().then(() => __toESM(require("./plugins/server"))).then((m) => m.pluginServer())
 ]);
 const getCompiledPath = (packageName) => {
   const providerCompilerPath = (0, import_path.join)(__dirname, "../../compiled", packageName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/webpack",
-  "version": "0.1.8",
+  "version": "0.2.0",
   "homepage": "https://rsbuild.dev",
   "repository": {
     "type": "git",
@@ -8,6 +8,7 @@
     "directory": "packages/compat/webpack"
   },
   "license": "MIT",
+  "type": "commonjs",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -35,13 +36,13 @@
     "terser-webpack-plugin": "5.3.9",
     "tsconfig-paths-webpack-plugin": "4.1.0",
     "webpack": "^5.89.0",
-    "@rsbuild/core": "0.1.8",
-    "@rsbuild/shared": "0.1.8"
+    "@rsbuild/core": "0.2.0",
+    "@rsbuild/shared": "0.2.0"
   },
   "devDependencies": {
-    "@types/node": "^16",
+    "@types/node": "16.x",
     "typescript": "^5.3.0",
-    "@rsbuild/test-helper": "0.1.8"
+    "@rsbuild/test-helper": "0.2.0"
   },
   "publishConfig": {
     "access": "public",

package/dist/core/createContext.d.ts

@@ -1,13 +0,0 @@
-import { type RsbuildConfig, type CreateRsbuildOptions } from '@rsbuild/shared';
-import { type Context } from '@rsbuild/core/provider';
-/**
- * Create primary context.
- * It will be assembled into a normal context or a stub for testing as needed.
- * Usually it would be a pure function
- */
-export declare function createPrimaryContext(options: Required<CreateRsbuildOptions>, userRsbuildConfig: RsbuildConfig): Context;
-/**
- * Generate the actual context used in the build,
- * which can have a lot of overhead and take some side effects.
- */
-export declare function createContext(options: Required<CreateRsbuildOptions>, rsbuildConfig: RsbuildConfig): Promise<Context>;

package/dist/core/createContext.js

@@ -1,56 +0,0 @@
-"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 createContext_exports = {};
-__export(createContext_exports, {
-  createContext: () => createContext,
-  createPrimaryContext: () => createPrimaryContext
-});
-module.exports = __toCommonJS(createContext_exports);
-var import_path = require("path");
-var import_shared = require("@rsbuild/shared");
-var import_provider = require("@rsbuild/core/provider");
-function createPrimaryContext(options, userRsbuildConfig) {
-  const rsbuildConfig = (0, import_provider.withDefaultConfig)(userRsbuildConfig);
-  const context = (0, import_provider.createContextByConfig)(
-    options,
-    "webpack",
-    rsbuildConfig.source,
-    rsbuildConfig.output
-  );
-  return {
-    ...context,
-    hooks: (0, import_provider.initHooks)(),
-    config: { ...rsbuildConfig },
-    originalConfig: userRsbuildConfig
-  };
-}
-async function createContext(options, rsbuildConfig) {
-  (0, import_shared.debug)("create context");
-  const ctx = createPrimaryContext(options, rsbuildConfig);
-  const tsconfigPath = (0, import_path.join)(ctx.rootPath, import_shared.TS_CONFIG_FILE);
-  if (await (0, import_shared.isFileExists)(tsconfigPath)) {
-    ctx.tsconfigPath = tsconfigPath;
-  }
-  return ctx;
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createContext,
-  createPrimaryContext
-});

package/dist/plugins/basic.d.ts

@@ -1,5 +0,0 @@
-import { type RsbuildPlugin } from '@rsbuild/shared';
-/**
- * Provide some basic configs of webpack
- */
-export declare const pluginBasic: () => RsbuildPlugin;