@rsbuild/plugin-svelte 1.0.1-rc.5 → 1.0.2

package/dist/index.cjs

@@ -1,101 +1,132 @@
 "use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/index.ts
-var src_exports = {};
-__export(src_exports, {
-  PLUGIN_SVELTE_NAME: () => PLUGIN_SVELTE_NAME,
-  pluginSvelte: () => pluginSvelte
-});
-module.exports = __toCommonJS(src_exports);
-var import_node_path = __toESM(require("path"));
-var import_core = require("@rsbuild/core");
-var PLUGIN_SVELTE_NAME = "rsbuild:svelte";
-function pluginSvelte(options = {}) {
-  return {
-    name: PLUGIN_SVELTE_NAME,
-    setup(api) {
-      let sveltePath = "";
-      try {
-        sveltePath = import_node_path.default.dirname(
-          require.resolve("svelte/package.json", {
-            paths: [api.context.rootPath]
-          })
-        );
-      } catch (err) {
-        import_core.logger.error(
-          "Cannot resolve `svelte` package under the project directory, did you forget to install it?"
-        );
-        throw new Error("Cannot resolve `svelte` package", {
-          cause: err
+// The require scope
+var __webpack_require__ = {};
+/************************************************************************/ // webpack/runtime/compat_get_default_export
+(()=>{
+    // getDefaultExport function for compatibility with non-harmony modules
+    __webpack_require__.n = function(module) {
+        var getter = module && module.__esModule ? function() {
+            return module['default'];
+        } : function() {
+            return module;
+        };
+        __webpack_require__.d(getter, {
+            a: getter
         });
-      }
-      api.modifyBundlerChain(
-        async (chain, { CHAIN_ID, environment, isDev, isProd }) => {
-          const { default: sveltePreprocess } = await import("svelte-preprocess");
-          const environmentConfig = environment.config;
-          chain.resolve.alias.set(
-            "svelte",
-            import_node_path.default.join(sveltePath, "src/runtime")
-          );
-          chain.resolve.extensions.add(".svelte");
-          chain.resolve.mainFields.add("svelte").add("...");
-          chain.resolve.conditionNames.add("svelte").add("...");
-          const loaderPath = require.resolve("svelte-loader");
-          chain.merge({
-            resolveLoader: {
-              alias: {
-                "svelte-loader": loaderPath
-              }
-            }
-          });
-          const userLoaderOptions = options.svelteLoaderOptions ?? {};
-          const svelteLoaderOptions = {
-            preprocess: sveltePreprocess(options.preprocessOptions),
-            // NOTE emitCss: true is currently not supported with HMR
-            // See https://github.com/web-infra-dev/rsbuild/issues/2744
-            emitCss: isProd && !environmentConfig.output.injectStyles,
-            hotReload: isDev && environmentConfig.dev.hmr,
-            ...userLoaderOptions,
-            compilerOptions: {
-              dev: isDev,
-              ...userLoaderOptions.compilerOptions
+        return getter;
+    };
+})();
+// webpack/runtime/define_property_getters
+(()=>{
+    __webpack_require__.d = function(exports1, definition) {
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+// webpack/runtime/has_own_property
+(()=>{
+    __webpack_require__.o = function(obj, prop) {
+        return Object.prototype.hasOwnProperty.call(obj, prop);
+    };
+})();
+// webpack/runtime/make_namespace_object
+(()=>{
+    // define __esModule on exports
+    __webpack_require__.r = function(exports1) {
+        if ('undefined' != typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+/************************************************************************/ var __webpack_exports__ = {};
+// ESM COMPAT FLAG
+__webpack_require__.r(__webpack_exports__);
+// EXPORTS
+__webpack_require__.d(__webpack_exports__, {
+    PLUGIN_SVELTE_NAME: ()=>/* binding */ PLUGIN_SVELTE_NAME,
+    pluginSvelte: ()=>/* binding */ pluginSvelte
+});
+const external_node_fs_namespaceObject = require("node:fs");
+const external_node_path_namespaceObject = require("node:path");
+var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
+const core_namespaceObject = require("@rsbuild/core");
+const external_svelte_preprocess_namespaceObject = require("svelte-preprocess");
+const PLUGIN_SVELTE_NAME = 'rsbuild:svelte';
+const isSvelte5 = async (sveltePath)=>{
+    try {
+        const pkgPath = external_node_path_default().join(sveltePath, 'package.json');
+        const pkgRaw = await external_node_fs_namespaceObject.promises.readFile(pkgPath, 'utf-8');
+        const pkgJson = JSON.parse(pkgRaw);
+        return pkgJson.version.startsWith('5.');
+    } catch (err) {
+        return false;
+    }
+};
+function pluginSvelte() {
+    let options = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {};
+    return {
+        name: PLUGIN_SVELTE_NAME,
+        setup (api) {
+            let sveltePath = '';
+            try {
+                // Resolve `svelte` package path from the project directory
+                sveltePath = external_node_path_default().dirname(require.resolve('svelte/package.json', {
+                    paths: [
+                        api.context.rootPath
+                    ]
+                }));
+            } catch (err) {
+                core_namespaceObject.logger.error('Cannot resolve `svelte` package under the project directory, did you forget to install it?');
+                throw new Error('Cannot resolve `svelte` package', {
+                    cause: err
+                });
             }
-          };
-          chain.module.rule(CHAIN_ID.RULE.SVELTE).test(/\.svelte$/).use(CHAIN_ID.USE.SVELTE).loader(loaderPath).options(svelteLoaderOptions);
+            api.modifyBundlerChain(async (chain, param)=>{
+                let { CHAIN_ID, environment, isDev, isProd } = param;
+                const svelte5 = await isSvelte5(sveltePath);
+                const environmentConfig = environment.config;
+                if (!svelte5) chain.resolve.alias.set('svelte', external_node_path_default().join(sveltePath, 'src/runtime'));
+                chain.resolve.extensions.add('.svelte');
+                chain.resolve.mainFields.add('svelte').add('...');
+                chain.resolve.conditionNames.add('svelte').add('...');
+                const loaderPath = require.resolve('svelte-loader');
+                // We need to set an alias from `svelte-loader` to its realpath.
+                // Because with `emitCss` option on, the loader generates css
+                // imports with inline loader reference like `!svelte-loader...`,
+                // which would cause the bundler failed to resolve the loader.
+                // See https://github.com/sveltejs/svelte-loader/blob/344f00744b06a98ff5ee7e7a04d5e04ac496988c/index.js#L128
+                chain.merge({
+                    resolveLoader: {
+                        alias: {
+                            'svelte-loader': loaderPath
+                        }
+                    }
+                });
+                const userLoaderOptions = options.svelteLoaderOptions ?? {};
+                const svelteLoaderOptions = {
+                    preprocess: (0, external_svelte_preprocess_namespaceObject.sveltePreprocess)(options.preprocessOptions),
+                    // NOTE emitCss: true is currently not supported with HMR
+                    // See https://github.com/web-infra-dev/rsbuild/issues/2744
+                    emitCss: isProd && !environmentConfig.output.injectStyles,
+                    hotReload: isDev && environmentConfig.dev.hmr,
+                    ...userLoaderOptions,
+                    compilerOptions: {
+                        dev: isDev,
+                        ...userLoaderOptions.compilerOptions
+                    }
+                };
+                chain.module.rule(CHAIN_ID.RULE.SVELTE).test(svelte5 ? /\.(?:svelte|svelte\.js|svelte\.ts)$/ : /\.svelte$/).use(CHAIN_ID.USE.SVELTE).loader(loaderPath).options(svelteLoaderOptions);
+            });
         }
-      );
-    }
-  };
+    };
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  PLUGIN_SVELTE_NAME,
-  pluginSvelte
+var __webpack_export_target__ = exports;
+for(var i in __webpack_exports__)__webpack_export_target__[i] = __webpack_exports__[i];
+if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
+    value: true
 });

package/{dist-types → dist}/index.d.ts

@@ -1,5 +1,5 @@
 import type { RsbuildPlugin } from '@rsbuild/core';
-import type { sveltePreprocess } from 'svelte-preprocess';
+import { sveltePreprocess } from 'svelte-preprocess';
 import type { CompileOptions } from 'svelte/compiler';
 export type AutoPreprocessOptions = NonNullable<Parameters<typeof sveltePreprocess>[0]>;
 export interface SvelteLoaderOptions {

package/dist/index.js

@@ -1,80 +1,74 @@
-import { createRequire } from 'module';
-var require = createRequire(import.meta['url']);
-
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined")
-    return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
-
-// ../../node_modules/.pnpm/@modern-js+module-tools@2.58.3_typescript@5.5.2/node_modules/@modern-js/module-tools/shims/esm.js
-import path from "path";
-import { fileURLToPath } from "url";
-
-// src/index.ts
-import path2 from "path";
-import { logger } from "@rsbuild/core";
-var PLUGIN_SVELTE_NAME = "rsbuild:svelte";
-function pluginSvelte(options = {}) {
-  return {
-    name: PLUGIN_SVELTE_NAME,
-    setup(api) {
-      let sveltePath = "";
-      try {
-        sveltePath = path2.dirname(
-          __require.resolve("svelte/package.json", {
-            paths: [api.context.rootPath]
-          })
-        );
-      } catch (err) {
-        logger.error(
-          "Cannot resolve `svelte` package under the project directory, did you forget to install it?"
-        );
-        throw new Error("Cannot resolve `svelte` package", {
-          cause: err
-        });
-      }
-      api.modifyBundlerChain(
-        async (chain, { CHAIN_ID, environment, isDev, isProd }) => {
-          const { default: sveltePreprocess } = await import("svelte-preprocess");
-          const environmentConfig = environment.config;
-          chain.resolve.alias.set(
-            "svelte",
-            path2.join(sveltePath, "src/runtime")
-          );
-          chain.resolve.extensions.add(".svelte");
-          chain.resolve.mainFields.add("svelte").add("...");
-          chain.resolve.conditionNames.add("svelte").add("...");
-          const loaderPath = __require.resolve("svelte-loader");
-          chain.merge({
-            resolveLoader: {
-              alias: {
-                "svelte-loader": loaderPath
-              }
-            }
-          });
-          const userLoaderOptions = options.svelteLoaderOptions ?? {};
-          const svelteLoaderOptions = {
-            preprocess: sveltePreprocess(options.preprocessOptions),
-            // NOTE emitCss: true is currently not supported with HMR
-            // See https://github.com/web-infra-dev/rsbuild/issues/2744
-            emitCss: isProd && !environmentConfig.output.injectStyles,
-            hotReload: isDev && environmentConfig.dev.hmr,
-            ...userLoaderOptions,
-            compilerOptions: {
-              dev: isDev,
-              ...userLoaderOptions.compilerOptions
+import * as __WEBPACK_EXTERNAL_MODULE_node_fs__ from "node:fs";
+import * as __WEBPACK_EXTERNAL_MODULE_node_path__ from "node:path";
+import * as __WEBPACK_EXTERNAL_MODULE__rsbuild_core__ from "@rsbuild/core";
+import * as __WEBPACK_EXTERNAL_MODULE_svelte_preprocess__ from "svelte-preprocess";
+const PLUGIN_SVELTE_NAME = 'rsbuild:svelte';
+const isSvelte5 = async (sveltePath)=>{
+    try {
+        const pkgPath = __WEBPACK_EXTERNAL_MODULE_node_path__["default"].join(sveltePath, 'package.json');
+        const pkgRaw = await __WEBPACK_EXTERNAL_MODULE_node_fs__.promises.readFile(pkgPath, 'utf-8');
+        const pkgJson = JSON.parse(pkgRaw);
+        return pkgJson.version.startsWith('5.');
+    } catch (err) {
+        return false;
+    }
+};
+function pluginSvelte() {
+    let options = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {};
+    return {
+        name: PLUGIN_SVELTE_NAME,
+        setup (api) {
+            let sveltePath = '';
+            try {
+                // Resolve `svelte` package path from the project directory
+                sveltePath = __WEBPACK_EXTERNAL_MODULE_node_path__["default"].dirname(require.resolve('svelte/package.json', {
+                    paths: [
+                        api.context.rootPath
+                    ]
+                }));
+            } catch (err) {
+                __WEBPACK_EXTERNAL_MODULE__rsbuild_core__.logger.error('Cannot resolve `svelte` package under the project directory, did you forget to install it?');
+                throw new Error('Cannot resolve `svelte` package', {
+                    cause: err
+                });
             }
-          };
-          chain.module.rule(CHAIN_ID.RULE.SVELTE).test(/\.svelte$/).use(CHAIN_ID.USE.SVELTE).loader(loaderPath).options(svelteLoaderOptions);
+            api.modifyBundlerChain(async (chain, param)=>{
+                let { CHAIN_ID, environment, isDev, isProd } = param;
+                const svelte5 = await isSvelte5(sveltePath);
+                const environmentConfig = environment.config;
+                if (!svelte5) chain.resolve.alias.set('svelte', __WEBPACK_EXTERNAL_MODULE_node_path__["default"].join(sveltePath, 'src/runtime'));
+                chain.resolve.extensions.add('.svelte');
+                chain.resolve.mainFields.add('svelte').add('...');
+                chain.resolve.conditionNames.add('svelte').add('...');
+                const loaderPath = require.resolve('svelte-loader');
+                // We need to set an alias from `svelte-loader` to its realpath.
+                // Because with `emitCss` option on, the loader generates css
+                // imports with inline loader reference like `!svelte-loader...`,
+                // which would cause the bundler failed to resolve the loader.
+                // See https://github.com/sveltejs/svelte-loader/blob/344f00744b06a98ff5ee7e7a04d5e04ac496988c/index.js#L128
+                chain.merge({
+                    resolveLoader: {
+                        alias: {
+                            'svelte-loader': loaderPath
+                        }
+                    }
+                });
+                const userLoaderOptions = options.svelteLoaderOptions ?? {};
+                const svelteLoaderOptions = {
+                    preprocess: (0, __WEBPACK_EXTERNAL_MODULE_svelte_preprocess__.sveltePreprocess)(options.preprocessOptions),
+                    // NOTE emitCss: true is currently not supported with HMR
+                    // See https://github.com/web-infra-dev/rsbuild/issues/2744
+                    emitCss: isProd && !environmentConfig.output.injectStyles,
+                    hotReload: isDev && environmentConfig.dev.hmr,
+                    ...userLoaderOptions,
+                    compilerOptions: {
+                        dev: isDev,
+                        ...userLoaderOptions.compilerOptions
+                    }
+                };
+                chain.module.rule(CHAIN_ID.RULE.SVELTE).test(svelte5 ? /\.(?:svelte|svelte\.js|svelte\.ts)$/ : /\.svelte$/).use(CHAIN_ID.USE.SVELTE).loader(loaderPath).options(svelteLoaderOptions);
+            });
         }
-      );
-    }
-  };
+    };
 }
-export {
-  PLUGIN_SVELTE_NAME,
-  pluginSvelte
-};
+export { PLUGIN_SVELTE_NAME, pluginSvelte };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-svelte",
-  "version": "1.0.1-rc.5",
+  "version": "1.0.2",
   "description": "Svelte plugin for Rsbuild",
   "repository": {
     "type": "git",
@@ -11,30 +11,29 @@
   "type": "module",
   "exports": {
     ".": {
-      "types": "./dist-types/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
     }
   },
   "main": "./dist/index.cjs",
-  "types": "./dist-types/index.d.ts",
+  "types": "./dist/index.d.ts",
   "files": [
-    "dist",
-    "dist-types"
+    "dist"
   ],
   "dependencies": {
-    "svelte-loader": "3.2.3",
-    "svelte-preprocess": "^6.0.2"
+    "svelte-loader": "3.2.4",
+    "svelte-preprocess": "^6.0.3"
   },
   "devDependencies": {
     "@types/node": "18.x",
     "svelte": "^4.2.19",
-    "typescript": "^5.5.2",
-    "@rsbuild/core": "1.0.1-rc.5",
-    "@scripts/test-helper": "1.0.1-rc.5"
+    "typescript": "^5.6.3",
+    "@rsbuild/core": "1.0.14",
+    "@scripts/test-helper": "1.0.1"
   },
   "peerDependencies": {
-    "@rsbuild/core": "^1.0.1-rc.4"
+    "@rsbuild/core": "1.x || ^1.0.1-rc.0"
   },
   "publishConfig": {
     "access": "public",
@@ -42,7 +41,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
-    "build": "modern build",
-    "dev": "modern build --watch"
+    "build": "rslib build",
+    "dev": "rslib build --watch"
   }
 }

package/dist-types/package.json

@@ -1 +0,0 @@
-{"//":"This file is for making TypeScript work with moduleResolution node16+.","version":"1.0.0"}