@rsbuild/plugin-vue2 0.0.0-next-20240514150515 → 0.0.0-next-20240528072128

package/dist/index.cjs

@@ -38,7 +38,6 @@ __export(src_exports, {
   pluginVue2: () => pluginVue2
 });
 module.exports = __toCommonJS(src_exports);
-var import_shared2 = require("@rsbuild/shared");
 var import_vue_loader = require("vue-loader");
 
 // src/VueLoader15PitchFixPlugin.ts
@@ -121,21 +120,39 @@ function pluginVue2(options = {}) {
   return {
     name: "rsbuild:vue2",
     setup(api) {
+      const VUE_REGEXP = /\.vue$/;
+      const CSS_MODULES_REGEX = /\.modules?\.\w+$/i;
+      api.modifyRsbuildConfig((config) => {
+        var _a;
+        config.output || (config.output = {});
+        (_a = config.output).cssModules || (_a.cssModules = {});
+        if (config.output.cssModules.auto === true) {
+          config.output.cssModules.auto = (path, query) => {
+            if (VUE_REGEXP.test(path)) {
+              return query.includes("type=style") && query.includes("module=true");
+            }
+            return CSS_MODULES_REGEX.test(path);
+          };
+        }
+        return config;
+      });
       api.modifyBundlerChain((chain, { CHAIN_ID }) => {
         chain.resolve.extensions.add(".vue");
         if (!chain.resolve.alias.get("vue$")) {
           chain.resolve.alias.set("vue$", "vue/dist/vue.runtime.esm.js");
         }
-        const vueLoaderOptions = (0, import_shared2.deepmerge)(
-          {
-            compilerOptions: {
-              preserveWhitespace: false
-            },
-            experimentalInlineMatchResource: true
-          },
-          options.vueLoaderOptions ?? {}
-        );
-        chain.module.rule(CHAIN_ID.RULE.VUE).test(/\.vue$/).use(CHAIN_ID.USE.VUE).loader(require.resolve("vue-loader")).options(vueLoaderOptions);
+        const userLoaderOptions = options.vueLoaderOptions ?? {};
+        const compilerOptions = {
+          preserveWhitespace: false,
+          ...userLoaderOptions.compilerOptions
+        };
+        const vueLoaderOptions = {
+          experimentalInlineMatchResource: true,
+          ...userLoaderOptions,
+          compilerOptions
+        };
+        chain.module.rule(CHAIN_ID.RULE.VUE).test(VUE_REGEXP).use(CHAIN_ID.USE.VUE).loader(require.resolve("vue-loader")).options(vueLoaderOptions);
+        chain.module.rule(CHAIN_ID.RULE.CSS).test(/\.(?:css|postcss|pcss)$/);
         chain.plugin(CHAIN_ID.PLUGIN.VUE_LOADER_PLUGIN).use(import_vue_loader.VueLoaderPlugin);
         chain.plugin(CHAIN_ID.PLUGIN.VUE_LOADER_15_PITCH_FIX_PLUGIN).use(VueLoader15PitchFixPlugin);
       });

package/dist/index.d.ts

@@ -1,6 +1,7 @@
-import type { RsbuildPlugin } from '@rsbuild/core';
-import type { VueLoaderOptions } from 'vue-loader';
-export type SplitVueChunkOptions = {
+import { RsbuildPlugin } from '@rsbuild/core';
+import { VueLoaderOptions } from 'vue-loader';
+
+type SplitVueChunkOptions = {
     /**
      * Whether to enable split chunking for Vue-related dependencies (e.g., vue, vue-loader).
      * @default true
@@ -12,7 +13,7 @@ export type SplitVueChunkOptions = {
      */
     router?: boolean;
 };
-export type PluginVueOptions = {
+type PluginVueOptions = {
     /**
      * Options passed to `vue-loader`.
      * @see https://vue-loader.vuejs.org/
@@ -23,4 +24,6 @@ export type PluginVueOptions = {
      */
     splitChunks?: SplitVueChunkOptions;
 };
-export declare function pluginVue2(options?: PluginVueOptions): RsbuildPlugin;
+declare function pluginVue2(options?: PluginVueOptions): RsbuildPlugin;
+
+export { type PluginVueOptions, type SplitVueChunkOptions, pluginVue2 };

package/dist/index.js

@@ -15,12 +15,11 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 
-// ../../node_modules/.pnpm/@modern-js+module-tools@2.49.3_eslint@8.57.0_typescript@5.4.5/node_modules/@modern-js/module-tools/shims/esm.js
+// ../../node_modules/.pnpm/@modern-js+module-tools@2.50.0_eslint@9.3.0_typescript@5.4.5/node_modules/@modern-js/module-tools/shims/esm.js
 import { fileURLToPath } from "url";
 import path from "path";
 
 // src/index.ts
-import { deepmerge } from "@rsbuild/shared";
 import { VueLoaderPlugin } from "vue-loader";
 
 // src/VueLoader15PitchFixPlugin.ts
@@ -63,10 +62,7 @@ var VueLoader15PitchFixPlugin = class {
 };
 
 // src/splitChunks.ts
-import {
-  createCacheGroups,
-  isPlainObject
-} from "@rsbuild/shared";
+import { createCacheGroups, isPlainObject } from "@rsbuild/shared";
 var applySplitChunksRule = (api, options = {
   vue: true,
   router: true
@@ -106,21 +102,39 @@ function pluginVue2(options = {}) {
   return {
     name: "rsbuild:vue2",
     setup(api) {
+      const VUE_REGEXP = /\.vue$/;
+      const CSS_MODULES_REGEX = /\.modules?\.\w+$/i;
+      api.modifyRsbuildConfig((config) => {
+        var _a;
+        config.output || (config.output = {});
+        (_a = config.output).cssModules || (_a.cssModules = {});
+        if (config.output.cssModules.auto === true) {
+          config.output.cssModules.auto = (path2, query) => {
+            if (VUE_REGEXP.test(path2)) {
+              return query.includes("type=style") && query.includes("module=true");
+            }
+            return CSS_MODULES_REGEX.test(path2);
+          };
+        }
+        return config;
+      });
       api.modifyBundlerChain((chain, { CHAIN_ID }) => {
         chain.resolve.extensions.add(".vue");
         if (!chain.resolve.alias.get("vue$")) {
           chain.resolve.alias.set("vue$", "vue/dist/vue.runtime.esm.js");
         }
-        const vueLoaderOptions = deepmerge(
-          {
-            compilerOptions: {
-              preserveWhitespace: false
-            },
-            experimentalInlineMatchResource: true
-          },
-          options.vueLoaderOptions ?? {}
-        );
-        chain.module.rule(CHAIN_ID.RULE.VUE).test(/\.vue$/).use(CHAIN_ID.USE.VUE).loader(__require.resolve("vue-loader")).options(vueLoaderOptions);
+        const userLoaderOptions = options.vueLoaderOptions ?? {};
+        const compilerOptions = {
+          preserveWhitespace: false,
+          ...userLoaderOptions.compilerOptions
+        };
+        const vueLoaderOptions = {
+          experimentalInlineMatchResource: true,
+          ...userLoaderOptions,
+          compilerOptions
+        };
+        chain.module.rule(CHAIN_ID.RULE.VUE).test(VUE_REGEXP).use(CHAIN_ID.USE.VUE).loader(__require.resolve("vue-loader")).options(vueLoaderOptions);
+        chain.module.rule(CHAIN_ID.RULE.CSS).test(/\.(?:css|postcss|pcss)$/);
         chain.plugin(CHAIN_ID.PLUGIN.VUE_LOADER_PLUGIN).use(VueLoaderPlugin);
         chain.plugin(CHAIN_ID.PLUGIN.VUE_LOADER_15_PITCH_FIX_PLUGIN).use(VueLoader15PitchFixPlugin);
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-vue2",
-  "version": "0.0.0-next-20240514150515",
+  "version": "0.0.0-next-20240528072128",
   "description": "Vue 2 plugin of Rsbuild",
   "homepage": "https://rsbuild.dev",
   "repository": {
@@ -25,16 +25,16 @@
   "dependencies": {
     "vue-loader": "^15.11.1",
     "webpack": "^5.91.0",
-    "@rsbuild/shared": "0.0.0-next-20240514150515"
+    "@rsbuild/shared": "0.0.0-next-20240528072128"
   },
   "devDependencies": {
     "typescript": "^5.4.2",
     "webpack": "^5.91.0",
-    "@rsbuild/core": "0.0.0-next-20240514150515",
-    "@scripts/test-helper": "0.0.0-next-20240514150515"
+    "@rsbuild/core": "0.0.0-next-20240528072128",
+    "@scripts/test-helper": "0.0.0-next-20240528072128"
   },
   "peerDependencies": {
-    "@rsbuild/core": "0.0.0-next-20240514150515"
+    "@rsbuild/core": "0.0.0-next-20240528072128"
   },
   "publishConfig": {
     "access": "public",

package/dist/VueLoader15PitchFixPlugin.d.ts

@@ -1,8 +0,0 @@
-import type { Rspack } from '@rsbuild/shared';
-/**
- * this plugin is a quick fix for issue https://github.com/web-infra-dev/rsbuild/issues/2093
- */
-export declare class VueLoader15PitchFixPlugin implements Rspack.RspackPluginInstance {
-    readonly name = "VueLoader15PitchFixPlugin";
-    apply(compiler: Rspack.Compiler): void;
-}

package/dist/splitChunks.d.ts

@@ -1,3 +0,0 @@
-import type { RsbuildPluginAPI } from '@rsbuild/core';
-import type { SplitVueChunkOptions } from '.';
-export declare const applySplitChunksRule: (api: RsbuildPluginAPI, options?: SplitVueChunkOptions) => void;