Merge branch 'source'

ice-lab · Nov 22, 2024 · 7773548 · 7773548
2 parents 9828160 + 4c4909c
commit 7773548
Show file tree

Hide file tree

Showing 15 changed files with 734 additions and 870 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,6 +7,23 @@ members = [
   "packages/remove-side-effect"
 ]
 
+[workspace.dependencies]
+anyhow                      = "1.0.83"
+fxhash                      = "0.2.1"
+serde                       = "1.0.203"
+serde_json                  = "1.0.117"
+swc_atoms                   = "2.0.0"
+swc_common                  = "1.0.0"
+swc_core                    = "1.0.0"
+swc_ecma_ast                = "1.0.0"
+swc_ecma_parser             = "1.0.0"
+swc_ecma_utils              = "1.0.0"
+swc_ecma_visit              = "1.0.0"
+swc_plugin_macro            = "1.0.0"
+swc_plugin_proxy            = "1.0.0"
+testing                     = "1.0.0"
+tracing                     = "0.1.40"
+
 [profile.release]
 # This removes more dead code
 codegen-units = 1

diff --git a/packages/keep-export/Cargo.toml b/packages/keep-export/Cargo.toml
@@ -7,19 +7,20 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-serde = "1"
-fxhash= "0.2.1"
-easy-error = "1.0.0"
-tracing = { version="0.1.34", features = ["release_max_level_info"] }
-swc_core = {version = "0.79.56", features = [
+serde ={ workspace = true }
+fxhash= { workspace = true }
+tracing = { workspace = true, features = ["release_max_level_info"] }
+swc_core = { workspace = true, features = [
   "ecma_plugin_transform",
   "ecma_utils",
   "ecma_visit",
   "ecma_ast",
   "common",
 ]}
-swc_common = { version = "0.31.18", features = ["concurrent"] }
-serde_json = {version = "1", features = ["unbounded_depth"]}
+swc_common = { workspace = true, features = ["concurrent"] }
+serde_json = { workspace = true, features = ["unbounded_depth"]}
+swc_plugin_macro = { workspace = true }
+swc_plugin_proxy = { workspace = true }
 
 [dev-dependencies]
-testing = "0.33.21"
+testing = { workspace = true }
diff --git a/packages/keep-export/package.json b/packages/keep-export/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@ice/swc-plugin-keep-export",
-    "version": "0.2.0",
+    "version": "0.3.0",
     "license": "MIT",
     "keywords": ["swc-plugin"],
     "main": "swc_plugin_keep_export.wasm",

diff --git a/packages/keep-export/src/lib.rs b/packages/keep-export/src/lib.rs
@@ -1,20 +1,20 @@
+#![allow(clippy::not_unsafe_ptr_arg_deref)]
 use fxhash::FxHashSet;
 use std::mem::take;
 use swc_common::pass::{Repeat, Repeated};
 use swc_common::DUMMY_SP;
-use swc_core::{
-    ecma::{
-        ast::*,
-        visit::{Fold, FoldWith, noop_fold_type},
-    },
-    plugin::{plugin_transform, proxies::TransformPluginProgramMetadata},
+use swc_core::ecma::{
+    ast::*,
+    visit::{Fold, FoldWith, noop_fold_type},
 };
+use swc_plugin_proxy::TransformPluginProgramMetadata;
+use swc_plugin_macro::plugin_transform;
 
 /// Note: This paths requires running `resolver` **before** running this.
 pub fn keep_exprs(keep_exports: Vec<String>) -> impl Fold {
     Repeat::new(KeepExportsExprs {
         state: State {
-            keep_exports: keep_exports,
+            keep_exports,
             ..Default::default()
         },
         in_lhs_of_var: false,
@@ -379,7 +379,7 @@ impl Fold for KeepExportsExprs {
                     tracing::trace!(
                         "Dropping import `{}{:?}` because it should be removed",
                         local.sym,
-                        local.span.ctxt
+                        local.span
                     );
 
                     self.state.should_run_again = true;
@@ -421,7 +421,7 @@ impl Fold for KeepExportsExprs {
                 specifiers:  Vec::new(),
                 src: None,
                 type_only: false,
-                asserts: None
+                with: None
             })));
         }
 
@@ -509,7 +509,7 @@ impl Fold for KeepExportsExprs {
                         tracing::trace!(
                             "Dropping var `{}{:?}` because it should be removed",
                             name.id.sym,
-                            name.id.span.ctxt
+                            name.id.span
                         );
 
                         return Pat::Invalid(Invalid { span: DUMMY_SP });
@@ -630,26 +630,6 @@ impl Fold for KeepExportsExprs {
     }
 }
 
-
-/// An example plugin function with macro support.
-/// `plugin_transform` macro interop pointers into deserialized structs, as well
-/// as returning ptr back to host.
-///
-/// It is possible to opt out from macro by writing transform fn manually via
-/// `__plugin_process_impl(
-///     ast_ptr: *const u8,
-///     ast_ptr_len: i32,
-///     config_str_ptr: *const u8,
-///     config_str_ptr_len: i32,
-///     context_str_ptr: *const u8,
-///     context_str_ptr_len: i32) ->
-///     i32 /*  0 for success, fail otherwise.
-///             Note this is only for internal pointer interop result,
-///             not actual transform result */
-///
-/// if plugin need to handle low-level ptr directly. However, there are
-/// important steps manually need to be performed like sending transformed
-/// results back to host. Refer swc_plugin_macro how does it work internally.
 #[plugin_transform]
 pub fn process_transform(program: Program, _metadata: TransformPluginProgramMetadata) -> Program {
     let tr = serde_json::from_str::<Vec<String>>(

diff --git a/packages/keep-platform/Cargo.toml b/packages/keep-platform/Cargo.toml
@@ -7,20 +7,21 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-serde = "1"
-fxhash= "0.2.1"
+serde = { workspace = true }
+fxhash= { workspace = true }
 lazy_static = "1.4.0"
-easy-error = "1.0.0"
-tracing = { version="0.1.34", features = ["release_max_level_info"] }
-swc_core = { version = "0.79.56", features = [
+tracing = { workspace = true, features = ["release_max_level_info"] }
+swc_core = { workspace = true, features = [
   "ecma_plugin_transform",
   "ecma_utils",
   "ecma_visit",
   "ecma_ast",
   "common",
 ]}
-swc_common = { version = "0.31.18", features = ["concurrent"] }
-serde_json = {version = "1", features = ["unbounded_depth"]}
+swc_common = { workspace = true, features = ["concurrent"] }
+serde_json = { workspace = true, features = ["unbounded_depth"]}
+swc_plugin_macro = { workspace = true }
+swc_plugin_proxy = { workspace = true }
 
 [dev-dependencies]
-testing = "0.33.21"
+testing = "1.0.0"
diff --git a/packages/keep-platform/package.json b/packages/keep-platform/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@ice/swc-plugin-keep-platform",
-    "version": "0.2.0",
+    "version": "0.3.0",
     "license": "MIT",
     "keywords": ["swc-plugin"],
     "main": "swc_plugin_keep_platform.wasm",

diff --git a/packages/keep-platform/src/lib.rs b/packages/keep-platform/src/lib.rs
@@ -1,15 +1,14 @@
 use lazy_static::lazy_static;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
-use swc_common::DUMMY_SP;
-use swc_core::{
-    ecma::{
-        ast::*,
-        atoms::JsWord,
-        visit::{Fold, FoldWith},
-    },
-    plugin::{plugin_transform, proxies::TransformPluginProgramMetadata},
+use swc_common::{SyntaxContext, DUMMY_SP};
+use swc_core::ecma::{
+    ast::*,
+    atoms::JsWord,
+    visit::{Fold, FoldWith},
 };
+use swc_plugin_proxy::TransformPluginProgramMetadata;
+use swc_plugin_macro::plugin_transform;
 
 #[derive(Debug, Deserialize, Default, Clone)]
 pub struct KeepPlatformPatcher {
@@ -169,18 +168,18 @@ fn insert_decls_into_module_items(decls: Vec<VarDeclarator>, module_items: &mut
                 span: DUMMY_SP,
                 kind: VarDeclKind::Var,
                 declare: false,
-                decls: decls,
+                decls,
+                ctxt: SyntaxContext::empty()
             })))),
         )
     }
 }
 
 // Create Ident by jsword.
-fn create_jsword_ident(value: &str) -> Ident {
-    Ident {
+fn create_jsword_ident(value: &str) -> IdentName {
+    IdentName {
         span: DUMMY_SP,
-        sym: JsWord::from(value),
-        optional: Default::default(),
+        sym: JsWord::from(value)
     }
 }
 

diff --git a/packages/node-transform/Cargo.toml b/packages/node-transform/Cargo.toml
@@ -7,19 +7,20 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-serde = "1"
-fxhash= "0.2.1"
-easy-error = "1.0.0"
-tracing = { version="0.1.34", features = ["release_max_level_info"] }
-swc_core = { version = "0.79.56", features = [
+serde = { workspace = true }
+fxhash= { workspace = true }
+tracing = { workspace = true, features = ["release_max_level_info"] }
+swc_core = { workspace = true, features = [
   "ecma_plugin_transform",
   "ecma_utils",
   "ecma_visit",
   "ecma_ast",
   "common",
 ]}
-swc_common = { version = "0.31.18", features = ["concurrent"] }
-serde_json = {version = "1", features = ["unbounded_depth"]}
+swc_common = { workspace = true, features = ["concurrent"] }
+serde_json = { workspace = true, features = ["unbounded_depth"]}
+swc_plugin_macro = { workspace = true }
+swc_plugin_proxy = { workspace = true }
 
 [dev-dependencies]
-testing = "0.33.21"
+testing = { workspace = true }
diff --git a/packages/node-transform/package.json b/packages/node-transform/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@ice/swc-plugin-node-transform",
-    "version": "0.2.0",
+    "version": "0.3.0",
     "license": "MIT",
     "keywords": ["swc-plugin"],
     "main": "swc_plugin_node_transform.wasm",