@rsbuild/plugin-solid 1.1.1 → 1.2.1

package/dist/index.cjs

@@ -1,11 +1,14 @@
 "use strict";
 const __rslib_import_meta_url__ = "u" < typeof document ? new (require('url'.replace('', ''))).URL('file:' + __filename).href : document.currentScript && document.currentScript.src || new URL('main.js', document.baseURI).href;
 var __webpack_require__ = {};
-__webpack_require__.d = (exports1, definition)=>{
-    for(var key in definition)__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key) && Object.defineProperty(exports1, key, {
-        enumerable: !0,
-        get: definition[key]
-    });
+__webpack_require__.d = (exports1, getters, values)=>{
+    var define = (defs, kind)=>{
+        for(var key in defs)__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key) && Object.defineProperty(exports1, key, {
+            enumerable: !0,
+            [kind]: defs[key]
+        });
+    };
+    define(getters, "get"), define(values, "value");
 }, __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop), __webpack_require__.r = (exports1)=>{
     "u" > typeof Symbol && Symbol.toStringTag && Object.defineProperty(exports1, Symbol.toStringTag, {
         value: 'Module'
@@ -20,10 +23,24 @@ __webpack_require__.r(__webpack_exports__), __webpack_require__.d(__webpack_expo
 });
 const external_node_module_namespaceObject = require("node:module"), plugin_babel_namespaceObject = require("@rsbuild/plugin-babel"), src_require = (0, external_node_module_namespaceObject.createRequire)(__rslib_import_meta_url__), PLUGIN_SOLID_NAME = 'rsbuild:solid';
 function pluginSolid(options = {}) {
+    let { dev, solid, solidPresetOptions, ssr } = options;
     return {
         name: PLUGIN_SOLID_NAME,
         setup (api) {
-            api.modifyBundlerChain((chain, { CHAIN_ID, environment, isProd, target })=>{
+            api.modifyEnvironmentConfig((config)=>{
+                let conditionNames = config.resolve.conditionNames ?? [
+                    '...'
+                ], useDevRuntime = dev ?? 'development' === config.mode;
+                config.resolve.conditionNames = [
+                    ...new Set([
+                        'solid',
+                        ...useDevRuntime ? [
+                            'development'
+                        ] : [],
+                        ...conditionNames
+                    ])
+                ];
+            }), api.modifyBundlerChain((chain, { CHAIN_ID, environment, isProd, target })=>{
                 let environmentConfig = environment.config;
                 (0, plugin_babel_namespaceObject.modifyBabelLoaderOptions)({
                     chain,
@@ -31,15 +48,28 @@ function pluginSolid(options = {}) {
                     modifier: (babelOptions)=>(babelOptions.presets = [
                             [
                                 src_require.resolve('babel-preset-solid'),
-                                options.solidPresetOptions || {}
+                                {
+                                    ...ssr ? 'node' === target ? {
+                                        generate: 'ssr',
+                                        hydratable: !0
+                                    } : {
+                                        generate: 'dom',
+                                        hydratable: !0
+                                    } : {},
+                                    ...solidPresetOptions,
+                                    ...solid
+                                }
                             ]
                         ], babelOptions.parserOpts = {
                             plugins: [
                                 'jsx',
                                 "typescript"
                             ]
-                        }, !isProd && environmentConfig.dev.hmr && 'web' === target && (babelOptions.plugins ??= [], babelOptions.plugins.push([
-                            src_require.resolve('solid-refresh/babel')
+                        }, options.refresh?.disabled !== !0 && !isProd && environmentConfig.dev.hmr && 'web' === target && (babelOptions.plugins ??= [], babelOptions.plugins.push([
+                            src_require.resolve('solid-refresh/babel'),
+                            {
+                                bundler: 'rspack-esm'
+                            }
                         ]), chain.resolve.alias.set('solid-refresh', src_require.resolve('solid-refresh/dist/solid-refresh.mjs'))), babelOptions)
                 });
             });

package/dist/index.d.ts

@@ -2,10 +2,30 @@ import type { RsbuildPlugin } from '@rsbuild/core';
 import type { SolidPresetOptions } from './types.js';
 export type PluginSolidOptions = {
     /**
-     * Options passed to `babel-preset-solid`.
-     * @see https://npmjs.com/package/babel-preset-solid
-     */
-    solidPresetOptions?: SolidPresetOptions;
+   * Whether to resolve Solid's development runtime.
+   * @default `true` in development mode, `false` in production mode
+   */ dev?: boolean;
+    /**
+   * Whether to generate output for Solid SSR.
+   * @default false
+   */ ssr?: boolean;
+    /**
+   * Configure Solid Refresh for HMR in development mode.
+   */ refresh?: {
+        /**
+     * Whether to disable Solid Refresh while keeping Rsbuild HMR enabled.
+     * @default false
+     */ disabled?: boolean;
+    };
+    /**
+   * Options passed to `babel-preset-solid`.
+   * @see https://npmjs.com/package/babel-preset-solid
+   */ solid?: SolidPresetOptions;
+    /**
+   * Options passed to `babel-preset-solid`.
+   * If both `solid` and `solidPresetOptions` are set, `solid` takes precedence.
+   * @deprecated Use `solid` instead.
+   */ solidPresetOptions?: SolidPresetOptions;
 };
-export declare const PLUGIN_SOLID_NAME = "rsbuild:solid";
+export declare const PLUGIN_SOLID_NAME = 'rsbuild:solid';
 export declare function pluginSolid(options?: PluginSolidOptions): RsbuildPlugin;

package/dist/index.js

@@ -2,10 +2,24 @@ import { createRequire } from "node:module";
 import { modifyBabelLoaderOptions } from "@rsbuild/plugin-babel";
 let src_require = createRequire(import.meta.url), PLUGIN_SOLID_NAME = 'rsbuild:solid';
 function pluginSolid(options = {}) {
+    let { dev, solid, solidPresetOptions, ssr } = options;
     return {
         name: PLUGIN_SOLID_NAME,
         setup (api) {
-            api.modifyBundlerChain((chain, { CHAIN_ID, environment, isProd, target })=>{
+            api.modifyEnvironmentConfig((config)=>{
+                let conditionNames = config.resolve.conditionNames ?? [
+                    '...'
+                ], useDevRuntime = dev ?? 'development' === config.mode;
+                config.resolve.conditionNames = [
+                    ...new Set([
+                        'solid',
+                        ...useDevRuntime ? [
+                            'development'
+                        ] : [],
+                        ...conditionNames
+                    ])
+                ];
+            }), api.modifyBundlerChain((chain, { CHAIN_ID, environment, isProd, target })=>{
                 let environmentConfig = environment.config;
                 modifyBabelLoaderOptions({
                     chain,
@@ -13,15 +27,28 @@ function pluginSolid(options = {}) {
                     modifier: (babelOptions)=>(babelOptions.presets = [
                             [
                                 src_require.resolve('babel-preset-solid'),
-                                options.solidPresetOptions || {}
+                                {
+                                    ...ssr ? 'node' === target ? {
+                                        generate: 'ssr',
+                                        hydratable: !0
+                                    } : {
+                                        generate: 'dom',
+                                        hydratable: !0
+                                    } : {},
+                                    ...solidPresetOptions,
+                                    ...solid
+                                }
                             ]
                         ], babelOptions.parserOpts = {
                             plugins: [
                                 'jsx',
                                 "typescript"
                             ]
-                        }, !isProd && environmentConfig.dev.hmr && 'web' === target && (babelOptions.plugins ??= [], babelOptions.plugins.push([
-                            src_require.resolve('solid-refresh/babel')
+                        }, options.refresh?.disabled !== !0 && !isProd && environmentConfig.dev.hmr && 'web' === target && (babelOptions.plugins ??= [], babelOptions.plugins.push([
+                            src_require.resolve('solid-refresh/babel'),
+                            {
+                                bundler: 'rspack-esm'
+                            }
                         ]), chain.resolve.alias.set('solid-refresh', src_require.resolve('solid-refresh/dist/solid-refresh.mjs'))), babelOptions)
                 });
             });

package/dist/types.d.ts

@@ -4,86 +4,71 @@
  * https://github.com/solidjs/solid/blob/main/packages/babel-preset-solid/index.js
  *
  * https://github.com/ryansolid/dom-expressions/blob/main/packages/babel-plugin-jsx-dom-expressions/README.md
- */
-export type SolidPresetOptions = {
+ */ export type SolidPresetOptions = {
     /**
-     * The name of the runtime module to import the methods from.
-     */
-    moduleName?: string;
+   * The name of the runtime module to import the methods from.
+   */ moduleName?: string;
     /**
-     * The output mode of the compiler.
-     * Can be:
-     * - "dom" is standard output
-     * - "ssr" is for server side rendering of strings.
-     * - "universal" is for using custom renderers from solid-js/universal
-     *
-     * @default "dom"
-     */
-    generate?: 'ssr' | 'dom' | 'universal';
+   * The output mode of the compiler.
+   * Can be:
+   * - "dom" is standard output
+   * - "ssr" is for server side rendering of strings.
+   * - "universal" is for using custom renderers from solid-js/universal
+   *
+   * @default "dom"
+   */ generate?: 'ssr' | 'dom' | 'universal';
     /**
-     * Indicate whether the output should contain hydratable markers.
-     * @default false
-     */
-    hydratable?: boolean;
+   * Indicate whether the output should contain hydratable markers.
+   * @default false
+   */ hydratable?: boolean;
     /**
-     * Boolean to indicate whether to enable automatic event delegation on camelCase.
-     * @default true
-     */
-    delegateEvents?: boolean;
+   * Boolean to indicate whether to enable automatic event delegation on camelCase.
+   * @default true
+   */ delegateEvents?: boolean;
     /**
-     * Boolean indicates whether smart conditional detection should be used. This optimizes simple boolean expressions and ternaries in JSX.
-     * @default true
-     */
-    wrapConditionals?: boolean;
+   * Boolean indicates whether smart conditional detection should be used. This optimizes simple boolean expressions and ternaries in JSX.
+   * @default true
+   */ wrapConditionals?: boolean;
     /**
-     * Boolean indicates whether to set current render context on Custom Elements and slots. Useful for seamless Context API with Web Components.
-     * @default false
-     */
-    contextToCustomElements?: boolean;
+   * Boolean indicates whether to set current render context on Custom Elements and slots. Useful for seamless Context API with Web Components.
+   * @default false
+   */ contextToCustomElements?: boolean;
     /**
-     * Array of Component exports from module, that aren't included by default with the library. This plugin will automatically import them if it comes across them in the JSX.
-     * @default string[]
-     */
-    builtIns?: string[];
+   * Array of Component exports from module, that aren't included by default with the library. This plugin will automatically import them if it comes across them in the JSX.
+   * @default string[]
+   */ builtIns?: string[];
     /**
-     * This plugin leverages a heuristic for reactive wrapping and lazy evaluation of JSX expressions.
-     * @default 'effect'
-     */
-    effectWrapper?: string;
+   * This plugin leverages a heuristic for reactive wrapping and lazy evaluation of JSX expressions.
+   * @default 'effect'
+   */ effectWrapper?: string;
     /**
-     * Comment decorator string indicates the static expression, used to tell the compiler not to wrap them by effect function
-     * @default '@once'
-     */
-    staticMarker?: string;
+   * Comment decorator string indicates the static expression, used to tell the compiler not to wrap them by effect function
+   * @default '@once'
+   */ staticMarker?: string;
     /**
-     * Memos let you efficiently use a derived value in many reactive computations. This option indicates the memo function name
-     * @default 'memo'
-     */
-    memoWrapper?: string;
+   * Memos let you efficiently use a derived value in many reactive computations. This option indicates the memo function name
+   * @default 'memo'
+   */ memoWrapper?: string;
     /**
-     * Checks for properly formed HTML by checking for elements that would not be allowed in certain parent elements.
-     * @default true
-     */
-    validate?: boolean;
+   * Checks for properly formed HTML by checking for elements that would not be allowed in certain parent elements.
+   * @default true
+   */ validate?: boolean;
     /**
-     * Remove unnecessary closing tags from template strings. More info here:
-     * https://github.com/solidjs/solid/blob/main/CHANGELOG.md#smaller-templates
-     *
-     * @default false
-     */
-    omitNestedClosingTags?: boolean;
+   * Remove unnecessary closing tags from template strings. More info here:
+   * https://github.com/solidjs/solid/blob/main/CHANGELOG.md#smaller-templates
+   *
+   * @default false
+   */ omitNestedClosingTags?: boolean;
     /**
-     * Remove the last closing tag from template strings. Enabled by default even when `omitNestedClosingTags` is disabled.
-     * Can be disabled for compatibility for some browser-like environments.
-     *
-     * @default true
-     */
-    omitLastClosingTag?: boolean;
+   * Remove the last closing tag from template strings. Enabled by default even when `omitNestedClosingTags` is disabled.
+   * Can be disabled for compatibility for some browser-like environments.
+   *
+   * @default true
+   */ omitLastClosingTag?: boolean;
     /**
-     * Remove unnecessary quotes from template strings.
-     * Can be disabled for compatibility for some browser-like environments.
-     *
-     * @default true
-     */
-    omitQuotes?: boolean;
+   * Remove unnecessary quotes from template strings.
+   * Can be disabled for compatibility for some browser-like environments.
+   *
+   * @default true
+   */ omitQuotes?: boolean;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-solid",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "description": "Solid plugin for Rsbuild",
   "homepage": "https://rsbuild.rs",
   "repository": {
@@ -17,21 +17,20 @@
       "require": "./dist/index.cjs"
     }
   },
-  "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
   "files": [
     "dist"
   ],
   "dependencies": {
-    "babel-preset-solid": "^1.9.10",
+    "babel-preset-solid": "^1.9.12",
     "solid-refresh": "^0.7.8",
-    "@rsbuild/plugin-babel": "1.1.2"
+    "@rsbuild/plugin-babel": "1.2.1"
   },
   "devDependencies": {
-    "@rslib/core": "0.20.0",
+    "@rslib/core": "0.22.0",
     "@types/babel__core": "^7.20.5",
-    "typescript": "^5.9.3",
-    "@rsbuild/core": "2.0.0-beta.8",
+    "typescript": "^6.0.3",
+    "@rsbuild/core": "2.0.9",
     "@scripts/test-helper": "1.0.0"
   },
   "peerDependencies": {
@@ -47,8 +46,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
-    "build": "rslib build",
-    "dev": "rslib build -w",
-    "bump": "pnpx bumpp --no-tag"
+    "build": "rslib",
+    "dev": "rslib -w"
   }
 }