rsbuild-pipe 1.0.3 → 1.0.5

package/.editorconfig

@@ -0,0 +1,31 @@
+# ↓告诉EditorConfig插件，这是根文件，不用继续往上查找。
+root = true
+
+# ↓匹配全部文件。
+[*]
+# ↓使用`utf-8`字符集。
+charset=utf-8
+# ↓结尾换行符，可选`lf`、`cr`、`crlf`。
+end_of_line=lf
+# ↓在文件结尾插入新行。
+insert_final_newline=true
+# ↓缩进的样式为空格。
+indent_style=space
+# ↓缩进为2。
+indent_size=2
+# ↓行最大长度为100。
+max_line_length = 100
+
+# ↓匹配以`.yml`、`.yaml`、`.json`结尾的文件。
+[*.{yml,yaml,json}]
+indent_style = space
+indent_size = 2
+
+# ↓匹配以`.md`结尾的文件。
+[*.md]
+# ↓
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab
+

package/README.md

@@ -3,7 +3,15 @@
 rsbuild开发和打包管道
 
 ## Change Log
-v1.0.0
+
+### v1.0.5
+```
+upgrade rsbuild version 0.7.10
+
+将rsbuild.extend.config.ts中的getCesiumEngineConfig改成getNodePolyfillConfig
 ```
 
+### v1.0.4
+```
+upgrade rsbuild version 0.7.9
 ```

package/lib/rsbuild.base.config.ts

@@ -1,10 +1,10 @@
 import { mergeRsbuildConfig, type RsbuildConfig } from '@rsbuild/core';
 import { pluginReact, type PluginReactOptions } from '@rsbuild/plugin-react';
-import { pluginSvgr, PluginSvgrOptions } from "@rsbuild/plugin-svgr";
-import { pluginSass, PluginSassOptions } from "@rsbuild/plugin-sass";
-import { pluginLess, PluginLessOptions } from "@rsbuild/plugin-less";
-import { pluginTypeCheck, PluginTypeCheckerOptions } from '@rsbuild/plugin-type-check';
-import { pluginBasicSsl } from '@rsbuild/plugin-basic-ssl';
+import { pluginSvgr, type PluginSvgrOptions } from "@rsbuild/plugin-svgr";
+import { pluginSass, type PluginSassOptions } from "@rsbuild/plugin-sass";
+import { pluginLess, type PluginLessOptions } from "@rsbuild/plugin-less";
+import { pluginTypeCheck, type PluginTypeCheckerOptions } from '@rsbuild/plugin-type-check';
+import { pluginBasicSsl, type PluginBasicSslOptions } from '@rsbuild/plugin-basic-ssl';
 
 export * as helper from "./helper";
 export * from "@rsbuild/core";
@@ -20,6 +20,7 @@ export const isProd = process.env.NODE_ENV === 'production'; // 是否为生成
 interface GetBaseConfigParams {
   rsbuildConfig?: RsbuildConfig,
   pluginBasicSslEnable?: boolean,   // 是否使用插件: @rsbuild/plugin-basic-ssl
+  pluginBasicSslOptions?: PluginBasicSslOptions,
   pluginReactEnable?: boolean,   // 是否使用插件: @rsbuild/plugin-react
   pluginReactOptions?: PluginReactOptions,
   pluginSvgrEnable?: boolean,   // 是否使用插件: @rsbuild/plugin-svgr
@@ -36,6 +37,7 @@ export const getBaseConfig = (params: GetBaseConfigParams = {}):RsbuildConfig =>
   const { 
     rsbuildConfig = {}, 
     pluginBasicSslEnable = false, 
+    pluginBasicSslOptions = {}, 
     pluginReactEnable = true, 
     pluginReactOptions = {},
     pluginSvgrEnable = true, 
@@ -107,7 +109,7 @@ export const getBaseConfig = (params: GetBaseConfigParams = {}):RsbuildConfig =>
       pluginLessEnable ? pluginLess(pluginLessOptions) : null,
 
       // 是否使用自签名的https证书
-      pluginBasicSslEnable ? pluginBasicSsl() : null,
+      pluginBasicSslEnable ? pluginBasicSsl(pluginBasicSslOptions) : null,
     ],
   }, rsbuildConfig);
 }

package/lib/rsbuild.extend.config.ts

@@ -1,7 +1,7 @@
-import { pluginNodePolyfill } from '@rsbuild/plugin-node-polyfill';
-import { pluginBabel, PluginBabelOptions } from '@rsbuild/plugin-babel';
+import { pluginNodePolyfill, type PluginNodePolyfillOptions } from '@rsbuild/plugin-node-polyfill';
+import { pluginBabel, type PluginBabelOptions } from '@rsbuild/plugin-babel';
 
-import { isProd, helper, type RsbuildConfig } from './rsbuild.base.config';
+import { isProd, helper, deepmerge, type RsbuildConfig } from './rsbuild.base.config';
 const path = require("path");
 const fs = require("fs");
 
@@ -43,29 +43,60 @@ export const getBabelConfig = (params: GetBabelConfigParams = {}): RsbuildConfig
   }
 }
 
+interface GetNodePolyfillParams {
+  nodePolyfillOptions?: PluginNodePolyfillOptions,
+  cesiumEngine?: {
+    enable?: boolean,   // 是否开启cesium配置
+    options: {
+      srcDirPath: string,   // cesium engine的基础目录路基
+      distDirPath: string,  // 目标路径
+      modifyCodeEnable?: boolean,  // 是否允许修改源代码
+    }
+  }
+}
+
 /**
- * 配置cesium engine
+ * 配置node-polyfill
  */
-export const getCesiumEngineConfig = ({ srcDirPath, distDirPath, modifyCodeEnable = true }: {
-  srcDirPath: string,   // cesium engine的基础目录路基
-  distDirPath: string,  // 目标路径
-  modifyCodeEnable?: boolean,  // 是否允许修改源代码
-}): RsbuildConfig => {
-  // const cesiumEngineBase = '../vendor/node_modules/@cesium/engine'; // cesium engine的源码目录
-  // const distDir = "static"; // 目标目录
+export const getNodePolyfillConfig = ({nodePolyfillOptions = {}, cesiumEngine }: GetNodePolyfillParams): RsbuildConfig => {
+  const config: RsbuildConfig = {};
+
+  // 配置cesiumEngine
+  if (cesiumEngine) {
+    const { enable = true, options } = cesiumEngine;
+
+    if (enable) {
+      const { srcDirPath, distDirPath, modifyCodeEnable = true } = options;
+      config.output = {
+        copy: [
+          // { from: path.join(srcDirPath, 'Build/Workers'), to: distDirPath+'/Workers' },
+          { from: path.join(srcDirPath, 'Source/Assets'), to: distDirPath + '/Assets' },
+          { from: path.join(srcDirPath, 'Build/ThirdParty'), to: distDirPath + '/ThirdParty' },
+        ],
+      }
 
-  const config: RsbuildConfig = {
-    output: {
-      copy: [
-        // { from: path.join(srcDirPath, 'Build/Workers'), to: distDirPath+'/Workers' },
-        { from: path.join(srcDirPath, 'Source/Assets'), to: distDirPath + '/Assets' },
-        { from: path.join(srcDirPath, 'Build/ThirdParty'), to: distDirPath + '/ThirdParty' },
-      ],
-    },
-    plugins: [
-      pluginNodePolyfill({
+      config.tools = {
+        rspack: {
+          // 注意: rsbuild编译代码时import.meta不支持，暂时将import.meta替换成'{}'空对象
+          // plugins: [
+          //   new rspack.DefinePlugin({
+          //     'import.meta': '{}'
+          //   })
+          // ],
+          module: {
+            rules: [
+              // 添加.glsl文件转为字符串
+              {
+                test: /\.glsl$/,
+                type: 'asset/source',
+              },
+            ]
+          }
+        }
+      }
+
+      nodePolyfillOptions = deepmerge(nodePolyfillOptions, {
         globals: {
-          // @ts-ignore
           https: false,
           http: false,
           zlib: false,
@@ -76,94 +107,77 @@ export const getCesiumEngineConfig = ({ srcDirPath, distDirPath, modifyCodeEnabl
           stream: false,
         }
       })
-    ],
 
-    tools: {
-      rspack: {
-        // 注意: rsbuild编译代码时import.meta不支持，暂时将import.meta替换成'{}'空对象
-        // plugins: [
-        //   new rspack.DefinePlugin({
-        //     'import.meta': '{}'
-        //   })
-        // ],
-        module: {
-          rules: [
-            // 添加.glsl文件转为字符串
-            {
-              test: /\.glsl$/,
-              type: 'asset/source',
-            },
-          ]
+
+      if (modifyCodeEnable) {
+        //***********************************修改源码start****************************************
+        /*
+          //d frontToBack添加try catch的原因, 调用Cesium.DrawCommand并传入Cesium.PASS.TRANSLUCENT(半透明物体)时，在监听点击或鼠标移动事件等时, 会报错: TypeError: Cannot read properties of undefined (reading 'distanceSquaredTo')
+          // 这样会影响程序的运行，所以暂时添加try catch来抑制异常的抛出
+          new Cesium.DrawCommand({
+            ...
+            ...
+            pass: Cesium.PASS.TRANSLUCENT,
+          });
+        */
+        const fs = require('fs');
+        const srcFilePath = `${srcDirPath}/Source/Scene/Scene.js`;
+        const data = fs.readFileSync(srcFilePath, 'utf-8');
+        const replaced = data.replace(`function frontToBack(a, b, position) {
+      // When distances are equal equal favor sorting b before a. This gives render priority to commands later in the list.
+      return (
+        a.boundingVolume.distanceSquaredTo(position) -
+        b.boundingVolume.distanceSquaredTo(position) +
+        CesiumMath.EPSILON12
+      );
+    }`, `function frontToBack(a, b, position) {
+      // When distances are equal equal favor sorting b before a. This gives render priority to commands later in the list.
+      try{
+        return (
+          a.boundingVolume.distanceSquaredTo(position) -
+          b.boundingVolume.distanceSquaredTo(position) +
+          CesiumMath.EPSILON12
+        );
+      }catch(e){
+    
+      }
+    }`);
+    
+        fs.writeFileSync(srcFilePath, replaced, 'utf-8')
+      }
+    
+    
+      // TODO: 开发环境下copy Build/Workers正常，生成环境下打包copy Build/Workers会报如下错误:
+      //   × JavaScript parsing error: 'import', and 'export' cannot be used outside of module code
+      //     ╭─[24:1]
+      //  24 │  */
+      //  25 │ 
+      //  26 │ import {
+      //     · ──────
+      //  27 │   defined_default
+      //  28 │ } from "./chunk-YBKFS53K.js";
+      //     ╰────
+      // 所以在生成环境下打包不器用copy Build/Workers, 而是采用打包换成后再将Build/Workers放到指定目录中, 
+      // copy过程暂时发到package.json scripts build命令中了，请参照
+    
+      if (!isProd) {
+        if (config.output?.copy) {
+          (config.output?.copy as any[]).push({
+            from: path.join(srcDirPath, 'Build/Workers'), to: distDirPath + '/Workers'
+          })
         }
+      } else {
+        setTimeout(() => {
+          const dist = path.join(path.resolve('./'), "dist/" + distDirPath + "/Workers");
+          if (!fs.existsSync(dist)) fs.mkdirSync(dist, { recursive: true });
+          helper.copy(path.join(srcDirPath, 'Build/Workers'), dist)
+        }, 3000)
       }
-    },
-  }
-
-
-  if (modifyCodeEnable) {
-    //***********************************修改源码start****************************************
-    /*
-      //d frontToBack添加try catch的原因, 调用Cesium.DrawCommand并传入Cesium.PASS.TRANSLUCENT(半透明物体)时，在监听点击或鼠标移动事件等时, 会报错: TypeError: Cannot read properties of undefined (reading 'distanceSquaredTo')
-      // 这样会影响程序的运行，所以暂时添加try catch来抑制异常的抛出
-      new Cesium.DrawCommand({
-        ...
-        ...
-        pass: Cesium.PASS.TRANSLUCENT,
-      });
-    */
-    const fs = require('fs');
-    const srcFilePath = `${srcDirPath}/Source/Scene/Scene.js`;
-    const data = fs.readFileSync(srcFilePath, 'utf-8');
-    const replaced = data.replace(`function frontToBack(a, b, position) {
-  // When distances are equal equal favor sorting b before a. This gives render priority to commands later in the list.
-  return (
-    a.boundingVolume.distanceSquaredTo(position) -
-    b.boundingVolume.distanceSquaredTo(position) +
-    CesiumMath.EPSILON12
-  );
-}`, `function frontToBack(a, b, position) {
-  // When distances are equal equal favor sorting b before a. This gives render priority to commands later in the list.
-  try{
-    return (
-      a.boundingVolume.distanceSquaredTo(position) -
-      b.boundingVolume.distanceSquaredTo(position) +
-      CesiumMath.EPSILON12
-    );
-  }catch(e){
-
-  }
-}`);
-
-    fs.writeFileSync(srcFilePath, replaced, 'utf-8')
-  }
-
-
-  // TODO: 开发环境下copy Build/Workers正常，生成环境下打包copy Build/Workers会报如下错误:
-  //   × JavaScript parsing error: 'import', and 'export' cannot be used outside of module code
-  //     ╭─[24:1]
-  //  24 │  */
-  //  25 │ 
-  //  26 │ import {
-  //     · ──────
-  //  27 │   defined_default
-  //  28 │ } from "./chunk-YBKFS53K.js";
-  //     ╰────
-  // 所以在生成环境下打包不器用copy Build/Workers, 而是采用打包换成后再将Build/Workers放到指定目录中, 
-  // copy过程暂时发到package.json scripts build命令中了，请参照
-
-  if (!isProd) {
-    if (config.output?.copy) {
-      (config.output?.copy as any[]).push({
-        from: path.join(srcDirPath, 'Build/Workers'), to: distDirPath + '/Workers'
-      })
     }
-  } else {
-    setTimeout(() => {
-      const dist = path.join(path.resolve('./'), "dist/" + distDirPath + "/Workers");
-      if (!fs.existsSync(dist)) fs.mkdirSync(dist, { recursive: true });
-      helper.copy(path.join(srcDirPath, 'Build/Workers'), dist)
-    }, 3000)
   }
 
+  // 添加node-polyfill插件
+  config.plugins = [pluginNodePolyfill(nodePolyfillOptions)]
+
   return config;
 }

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "rsbuild-pipe",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "author": "chencheng <daniel_txy@163.com>",
   "description": "rsbuild pipe",
   "main": "index",
   "dependencies": {
-    "@rsbuild/core": "0.7.6",
-    "@rsbuild/plugin-babel": "0.7.6",
-    "@rsbuild/plugin-basic-ssl": "0.7.6",
-    "@rsbuild/plugin-less": "0.7.6",
-    "@rsbuild/plugin-node-polyfill": "0.7.6",
-    "@rsbuild/plugin-react": "0.7.6",
-    "@rsbuild/plugin-sass": "0.7.6",
-    "@rsbuild/plugin-svgr": "0.7.6",
-    "@rsbuild/plugin-type-check": "0.7.6",
-    "@types/node": "20.14.2",
+    "@rsbuild/core": "0.7.10",
+    "@rsbuild/plugin-babel": "0.7.10",
+    "@rsbuild/plugin-basic-ssl": "0.7.10",
+    "@rsbuild/plugin-less": "0.7.10",
+    "@rsbuild/plugin-node-polyfill": "0.7.10",
+    "@rsbuild/plugin-react": "0.7.10",
+    "@rsbuild/plugin-sass": "0.7.10",
+    "@rsbuild/plugin-svgr": "0.7.10",
+    "@rsbuild/plugin-type-check": "0.7.10",
+    "@types/node": "20.14.11",
     "deepmerge": "4.3.1",
-    "sass": "^1.77.5"
+    "sass": "1.77.8"
   },
   "repository": {
     "type": "git",