[chore] Use rspack

crates/swc-plugin-gem/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swc-plugin-gem",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "swc plugin for Gem",
   "keywords": [
     "swc-plugin",

crates/swc-plugin-gem/src/visitors/hmr.rs

@@ -14,9 +14,9 @@ use swc_core::{
     quote,
 };
 use swc_ecma_ast::{
-    BlockStmt, BlockStmtOrExpr, Callee, Class, ClassMember, ClassMethod, ClassProp, Expr,
-    ExprOrSpread, Function, Ident, IdentName, Lit, MemberExpr, MemberProp, ModuleItem, Param,
-    PropName, ThisExpr,
+    ArrowExpr, BlockStmt, BlockStmtOrExpr, Callee, Class, ClassMember, ClassMethod, ClassProp,
+    Expr, ExprOrSpread, Function, Ident, IdentName, Lit, MemberExpr, MemberProp, ModuleItem, Param,
+    Pat, PropName, RestPat, ThisExpr,
 };
 
 static DASH_REG: Lazy<Regex> = Lazy::new(|| Regex::new(r"-").unwrap());
@@ -98,6 +98,15 @@ fn gen_shadow_member(
     })
 }
 
+fn gen_proxy_arg() -> Vec<Pat> {
+    vec![Pat::Rest(RestPat {
+        arg: Box::new(Pat::Ident("args".into())),
+        dot3_token: DUMMY_SP,
+        span: DUMMY_SP,
+        type_ann: None,
+    })]
+}
+
 fn gen_proxy_body(shadow_ident: &IdentName) -> BlockStmt {
     let this_expr = Expr::Member(MemberExpr {
         obj: Box::new(Expr::This(ThisExpr { span: DUMMY_SP })),
@@ -107,25 +116,50 @@ fn gen_proxy_body(shadow_ident: &IdentName) -> BlockStmt {
     BlockStmt {
         stmts: vec![quote!(
             "
-            return $expr.bind(this)(...arguments);
+            return $expr.bind(this)(...args);
             " as Stmt,
             expr: Expr = this_expr
         )],
         ..Default::default()
     }
 }
 
+fn replace_to_proxy_function(
+    func: &mut Function,
+    shadow_ident: &IdentName,
+) -> (Option<BlockStmt>, Vec<Param>) {
+    (
+        mem::replace(&mut func.body, gen_proxy_body(&shadow_ident).into()),
+        mem::replace(
+            &mut func.params,
+            gen_proxy_arg().drain(..).map(|x| x.into()).collect(),
+        ),
+    )
+}
+
+fn replace_to_proxy_arrow(
+    func: &mut ArrowExpr,
+    shadow_ident: &IdentName,
+) -> (Box<BlockStmtOrExpr>, Vec<Param>) {
+    (
+        mem::replace(
+            &mut func.body,
+            Box::new(BlockStmtOrExpr::BlockStmt(gen_proxy_body(&shadow_ident))),
+        ),
+        mem::replace(&mut func.params, gen_proxy_arg())
+            .drain(..)
+            .map(|x| x.into())
+            .collect(),
+    )
+}
+
 fn transform_fn(node: ClassMember, key: &str) -> (ClassMember, Option<ClassMember>) {
     // TODO: 支持计算属性名
     match node {
         ClassMember::Method(mut method) => {
             if let Some(origin_ident) = method.key.as_ident() {
                 let shadow_ident = get_shadow_ident(origin_ident, key, false);
-                let body = mem::replace(
-                    &mut method.function.body,
-                    gen_proxy_body(&shadow_ident).into(),
-                );
-                let params = method.function.params.drain(..).collect();
+                let (body, params) = replace_to_proxy_function(&mut method.function, &shadow_ident);
                 let is_async = method.function.is_async;
                 (
                     ClassMember::Method(ClassMethod { ..method }),
@@ -145,11 +179,7 @@ fn transform_fn(node: ClassMember, key: &str) -> (ClassMember, Option<ClassMembe
             let origin_ident = IdentName::new(method.key.name, DUMMY_SP);
             let private_ident = PropName::Ident(get_private_ident(&origin_ident, key));
             let shadow_ident = get_shadow_ident(&origin_ident, key, true);
-            let body = mem::replace(
-                &mut method.function.body,
-                gen_proxy_body(&shadow_ident).into(),
-            );
-            let params = method.function.params.drain(..).collect();
+            let (body, params) = replace_to_proxy_function(&mut method.function, &shadow_ident);
             let is_async = method.function.is_async;
             (
                 ClassMember::Method(ClassMethod {
@@ -174,14 +204,10 @@ fn transform_fn(node: ClassMember, key: &str) -> (ClassMember, Option<ClassMembe
         }
         ClassMember::ClassProp(mut prop) => {
             if let Some(ref mut v) = prop.value {
-                if let Some(func) = v.as_mut_arrow() {
+                if let Some(mut func) = v.as_mut_arrow() {
                     let origin_ident = prop.key.as_ident().unwrap();
                     let shadow_ident = get_shadow_ident(origin_ident, key, false);
-                    let body = mem::replace(
-                        &mut func.body,
-                        Box::new(BlockStmtOrExpr::BlockStmt(gen_proxy_body(&shadow_ident))),
-                    );
-                    let params = func.params.drain(..).map(|x| x.into()).collect();
+                    let (body, params) = replace_to_proxy_arrow(&mut func, &shadow_ident);
                     let is_async = func.is_async;
                     if let BlockStmtOrExpr::BlockStmt(body) = *body {
                         return (
@@ -203,13 +229,9 @@ fn transform_fn(node: ClassMember, key: &str) -> (ClassMember, Option<ClassMembe
             let origin_ident = IdentName::new(prop.key.name, DUMMY_SP);
             let private_ident = PropName::Ident(get_private_ident(&origin_ident, key));
             if let Some(ref mut v) = prop.value {
-                if let Some(func) = v.as_mut_arrow() {
+                if let Some(mut func) = v.as_mut_arrow() {
                     let shadow_ident = get_shadow_ident(&origin_ident, key, true);
-                    let body = mem::replace(
-                        &mut func.body,
-                        Box::new(BlockStmtOrExpr::BlockStmt(gen_proxy_body(&shadow_ident))),
-                    );
-                    let params = func.params.drain(..).map(|x| x.into()).collect();
+                    let (body, params) = replace_to_proxy_arrow(&mut func, &shadow_ident);
                     let is_async = func.is_async;
                     if let BlockStmtOrExpr::BlockStmt(body) = *body {
                         return (

crates/swc-plugin-gem/tests/fixture/hmr/input.ts

@@ -1,21 +1,22 @@
 // @ts-nocheck
 @customElement('my-element')
 class MyElement extends GemElement {
+  @emitter change;
   @effect([])
   method(arg) {
     console.log('method');
   }
   @effect([])
   field = (arg) => {
     console.log('field');
-  }
+  };
   @effect([])
   #method(arg) {
     console.log('#method');
   }
-  @effect([])
+  @effect((i) => [i.#field])
   #field = (arg) => {
     console.log('#field');
-  }
+  };
   #content;
-}
+}

crates/swc-plugin-gem/tests/fixture/hmr/output.ts

@@ -1,33 +1,34 @@
 // @ts-nocheck
 @customElement('my-element')
 class MyElement extends GemElement {
+  @emitter change;
   _hmr_public_my_element_method(arg) {
     console.log('method');
   }
   @effect([])
-  method() {
-    return this._hmr_public_my_element_method.bind(this)(...arguments);
+  method(...args) {
+    return this._hmr_public_my_element_method.bind(this)(...args);
   }
   _hmr_public_my_element_field(arg) {
     console.log('field');
   }
   @effect([])
-  field = () => {
-    return this._hmr_public_my_element_field.bind(this)(...arguments);
+  field = (...args) => {
+    return this._hmr_public_my_element_field.bind(this)(...args);
   };
   _hmr_private_my_element_method(arg) {
     console.log('#method');
   }
   @effect([])
-  _private_my_element_method() {
-    return this._hmr_private_my_element_method.bind(this)(...arguments);
+  _private_my_element_method(...args) {
+    return this._hmr_private_my_element_method.bind(this)(...args);
   }
   _hmr_private_my_element_field(arg) {
     console.log('#field');
   }
-  @effect([])
-  _private_my_element_field = () => {
-    return this._hmr_private_my_element_field.bind(this)(...arguments);
+  @effect((i) => [i._private_my_element_field])
+  _private_my_element_field = (...args) => {
+    return this._hmr_private_my_element_field.bind(this)(...args);
   };
   _private_my_element_content;
 }

packages/gem-devtools/package.json

@@ -5,8 +5,8 @@
   "description": "Gem devtools",
   "scripts": {
     "update:version": "node ./scripts/update.js",
-    "serve": "vite",
-    "build": "vite build",
+    "serve": "rsbuild dev",
+    "build": "rsbuild build",
     "watch": "pnpm build --watch",
     "build:zip": "pnpm build && web-ext build",
     "browser": "web-ext run --target=chromium --target=firefox-desktop",
@@ -18,8 +18,8 @@
   },
   "devDependencies": {
     "@gemjs/config": "^2.1.0",
+    "@rsbuild/core": "^1.1.10",
     "@types/webextension-polyfill": "^0.10.7",
-    "vite": "^5.2.10",
     "web-ext": "^7.8.0"
   },
   "author": "mantou132",

packages/gem-devtools/rsbuild.config.ts

@@ -0,0 +1,43 @@
+// swc 还是谁有 bug，装饰器没有生效
+
+import { defineConfig } from '@rsbuild/core';
+
+export default defineConfig(({}) => ({
+  html: {
+    template: './src/template.html',
+  },
+  source: {
+    // 触发更新
+    preEntry: './src/manifest.json',
+    entry: {
+      test: './src/test.ts',
+      sidebarpanel: './src/sidebarpanel.ts',
+      devtools: './src/devtools.ts',
+      // not support module
+      content: {
+        import: './src/content.ts',
+        html: false,
+      },
+    },
+  },
+  output: {
+    copy: [{ from: './src/manifest.json' }],
+    distPath: {
+      root: 'extension',
+      js: '.',
+    },
+    filename: {
+      js: '[name].js',
+    },
+    dataUriLimit: 0,
+    sourceMap: true,
+  },
+  performance: {
+    chunkSplit: {},
+  },
+  resolve: {
+    alias: {
+      src: '',
+    },
+  },
+}));

packages/gem-devtools/src/chrome-polyfill.js

@@ -0,0 +1,24 @@
+const getAny = () => {
+  // constructable
+  function anonymous() {
+    return getAny();
+  }
+  Object.defineProperties(anonymous, {
+    length: { writable: true },
+    name: { writable: true },
+  });
+  return new Proxy(anonymous, {
+    get(target, key) {
+      if (key === Symbol.toPrimitive) return () => '';
+      return target[key] || (target[key] = getAny());
+    },
+  });
+};
+globalThis.chrome = globalThis.browser = new Proxy(
+  {},
+  {
+    get() {
+      return getAny();
+    },
+  },
+);

packages/gem-devtools/src/content.ts

@@ -1,10 +1,3 @@
-// 作为静态资源输出
-// eslint-disable-next-line import/no-duplicates
-import './manifest.json?url';
-// 实时更新
-// eslint-disable-next-line import/no-duplicates
-import './manifest.json';
-
 type DevToolsHookStore = {
   customElementMap: Map<string, CustomElementConstructor>;
   currentElementsMap: Map<string, Element>;

packages/gem-devtools/src/template.html

@@ -0,0 +1,4 @@
+<!doctype html>
+<head>
+  <meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no" />
+</head>

packages/gem-devtools/src/test.ts

@@ -1,3 +1,4 @@
+import './chrome-polyfill';
 import { html, render } from '@mantou/gem';
 
 import { panelStore, PanelStore } from './store';