rsbuild-pipe 1.0.0 → 1.0.2

package/lib/rsbuild.base.config.ts

@@ -1,6 +1,8 @@
 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';
 
@@ -22,6 +24,10 @@ interface GetBaseConfigParams {
   pluginReactOptions?: PluginReactOptions,
   pluginSvgrEnable?: boolean,   // 是否使用插件: @rsbuild/plugin-svgr
   pluginSvgrOptions?: PluginSvgrOptions,
+  pluginSassEnable?: boolean,   // 是否使用插件: @rsbuild/plugin-sass
+  pluginSassOptions?: PluginSassOptions,
+  pluginLessEnable?: boolean,   // 是否使用插件: @rsbuild/plugin-less
+  pluginLessOptions?: PluginLessOptions,
   pluginTypeCheckEnable?: boolean,   // 是否使用插件: @rsbuild/plugin-type-check
   pluginTypeCheckerOptions?: PluginTypeCheckerOptions,
 };
@@ -34,6 +40,10 @@ export const getBaseConfig = (params: GetBaseConfigParams = {}):RsbuildConfig =>
     pluginReactOptions = {},
     pluginSvgrEnable = true, 
     pluginSvgrOptions = {},
+    pluginSassEnable = true, 
+    pluginSassOptions = {},
+    pluginLessEnable = true, 
+    pluginLessOptions = {},
     pluginTypeCheckEnable = true, 
     pluginTypeCheckerOptions = {},
   } = params;
@@ -74,7 +84,7 @@ export const getBaseConfig = (params: GetBaseConfigParams = {}):RsbuildConfig =>
       // react插件true
       pluginReactEnable ? pluginReact(pluginReactOptions) : null,
 
-      // typescript 语法检查,注意语法错误只能在命令行中输出，不能再页面中输出
+      // typescript 语法检查,注意语法错误只能在命令行中输出，不能支持less，scss再页面中输出
       pluginTypeCheckEnable ? pluginTypeCheck(deepmerge({
         forkTsCheckerOptions: {
           async: true,
@@ -90,6 +100,12 @@ export const getBaseConfig = (params: GetBaseConfigParams = {}):RsbuildConfig =>
         mixedImport: true,
       }, pluginSvgrOptions)) : null,
 
+      // 支持sass，scss
+      pluginSassEnable ? pluginSass(pluginSassOptions) : null,
+
+      // 支持less
+      pluginLessEnable ? pluginLess(pluginLessOptions) : null,
+
       // 是否使用自签名的https证书
       pluginBasicSslEnable ? pluginBasicSsl() : null,
     ],

package/lib/rsbuild.extend.config.ts

@@ -1,21 +1,21 @@
 import { pluginNodePolyfill } from '@rsbuild/plugin-node-polyfill';
 import { pluginBabel, PluginBabelOptions } from '@rsbuild/plugin-babel';
 
-import { isProd, rspack, helper, type RsbuildConfig } from './rsbuild.base.config';
+import { isProd, helper, type RsbuildConfig } from './rsbuild.base.config';
 const path = require("path");
 const fs = require("fs");
 
-interface GetBabelConfigParams{
+interface GetBabelConfigParams {
   styledJsxEnabled?: boolean,
-  modifyConfig?:(config:PluginBabelOptions["babelLoaderOptions"]) => PluginBabelOptions["babelLoaderOptions"],
+  modifyConfig?: (config: PluginBabelOptions["babelLoaderOptions"]) => PluginBabelOptions["babelLoaderOptions"],
 }
 
 /**
  * 参数文档配置: https://rsbuild.dev/zh/plugins/list/plugin-babel
  * 获取babel配置
  */
-export const getBabelConfig = (params:GetBabelConfigParams = {}): RsbuildConfig => {
-  const {styledJsxEnabled = true, modifyConfig} = params;
+export const getBabelConfig = (params: GetBabelConfigParams = {}): RsbuildConfig => {
+  const { styledJsxEnabled = true, modifyConfig } = params;
 
   return {
     plugins: [
@@ -23,7 +23,7 @@ export const getBabelConfig = (params:GetBabelConfigParams = {}): RsbuildConfig
       pluginBabel({
         babelLoaderOptions: (config) => {
           // 添加styled-jsx的使用
-          if(styledJsxEnabled) config.plugins?.push([
+          if (styledJsxEnabled) config.plugins?.push([
             "styled-jsx/babel",
             {
               "vendorPrefixes": true,     // 为css自动添加前缀
@@ -34,7 +34,7 @@ export const getBabelConfig = (params:GetBabelConfigParams = {}): RsbuildConfig
             }
           ]);
 
-          if(modifyConfig) modifyConfig(config)
+          if (modifyConfig) modifyConfig(config)
         },
       }),
     ]
@@ -44,9 +44,10 @@ export const getBabelConfig = (params:GetBabelConfigParams = {}): RsbuildConfig
 /**
  * 配置cesium engine
  */
-export const getCesiumEngineConfig = ({ srcDirPath, distDirPath }: {
+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"; // 目标目录
@@ -78,11 +79,11 @@ export const getCesiumEngineConfig = ({ srcDirPath, distDirPath }: {
     tools: {
       rspack: {
         // 注意: rsbuild编译代码时import.meta不支持，暂时将import.meta替换成'{}'空对象
-        plugins: [
-          new rspack.DefinePlugin({
-            'import.meta': '{}'
-          })
-        ],
+        // plugins: [
+        //   new rspack.DefinePlugin({
+        //     'import.meta': '{}'
+        //   })
+        // ],
         module: {
           rules: [
             // 添加.glsl文件转为字符串
@@ -96,6 +97,45 @@ export const getCesiumEngineConfig = ({ srcDirPath, distDirPath }: {
     },
   }
 
+
+  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]
@@ -108,19 +148,18 @@ export const getCesiumEngineConfig = ({ srcDirPath, distDirPath }: {
   //     ╰────
   // 所以在生成环境下打包不器用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{
+  } else {
     setTimeout(() => {
-      // console.log("1111111111111111111111111111111111111111111111111111111");
-      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)
+      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)
   }
 

package/package.json

@@ -1,18 +1,20 @@
 {
   "name": "rsbuild-pipe",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "author": "chencheng <daniel_txy@163.com>",
   "description": "rsbuild pipe",
   "main": "index",
   "dependencies": {
-    "@rsbuild/core": "0.6.15",
-    "@rsbuild/plugin-babel": "0.6.15",
-    "@rsbuild/plugin-basic-ssl": "0.6.15",
-    "@rsbuild/plugin-node-polyfill": "0.6.15",
-    "@rsbuild/plugin-react": "0.6.15",
-    "@rsbuild/plugin-svgr": "0.6.15",
-    "@rsbuild/plugin-type-check": "0.6.15",
-    "@types/node": "20.12.12",
+    "@rsbuild/core": "0.7.1",
+    "@rsbuild/plugin-babel": "0.7.1",
+    "@rsbuild/plugin-basic-ssl": "0.7.1",
+    "@rsbuild/plugin-less": "0.7.1",
+    "@rsbuild/plugin-node-polyfill": "0.7.1",
+    "@rsbuild/plugin-react": "0.7.1",
+    "@rsbuild/plugin-sass": "0.7.1",
+    "@rsbuild/plugin-svgr": "0.7.1",
+    "@rsbuild/plugin-type-check": "0.7.1",
+    "@types/node": "20.12.13",
     "deepmerge": "4.3.1"
   },
   "repository": {