refactor: Flatten more packages (#2706)

2024-12-23 13:51:19 +03:00 · 2021-11-10 16:39:01 +09:00 · 2021-11-10 16:39:01 +09:00 · 4f70ee6d98
commit 4f70ee6d98
parent 158136fae9
628 changed files with 144 additions and 144 deletions
--- a/.github/workflows/compilation.yml
+++ b/.github/workflows/compilation.yml
@ -42,7 +42,7 @@ jobs:
      - name: Check swc_common
        run: |
-          (cd common && cargo hack check --feature-powerset --no-dev-deps)
+          (cd crates/swc_common && cargo hack check --feature-powerset --no-dev-deps)
      - name: Check swc_ecma_ast
        run: |
--- a/Cargo.toml
+++ b/Cargo.toml
@ -5,7 +5,7 @@ members = [
  "ecmascript",
  "crates/swc_ecma_plugin_ast",
  "crates/swc_babel_compat",
-  "ecmascript/jsdoc",
+  "crates/jsdoc",
  "crates/node",
  "crates/swc_plugin",
  "crates/swc_plugin_runner",
--- a/crates/ast_node/Cargo.toml
+++ b/crates/ast_node/Cargo.toml
@ -16,7 +16,7 @@ darling = "0.10"
 pmutil = "0.5.1"
 proc-macro2 = "1"
 quote = "1"
-swc_macros_common = {version = "0.3.2", path = "../common"}
+swc_macros_common = {version = "0.3.2", path = "../swc_macros_common"}
 [dependencies.syn]
 features = ["derive", "fold", "parsing", "printing"]
--- a/crates/ast_node/src/ast_node_macro.rs
+++ b/crates/ast_node/src/ast_node_macro.rs
--- a/crates/ast_node/src/enum_deserialize.rs
+++ b/crates/ast_node/src/enum_deserialize.rs
--- a/crates/ast_node/src/lib.rs
+++ b/crates/ast_node/src/lib.rs
--- a/crates/ast_node/src/spanned.rs
+++ b/crates/ast_node/src/spanned.rs
--- a/crates/enum_kind/Cargo.toml
+++ b/crates/enum_kind/Cargo.toml
@ -14,7 +14,7 @@ proc-macro = true
 [dependencies]
 pmutil = "0.5.1"
 proc-macro2 = "1"
-swc_macros_common = {version = "0.3.2", path = "../common"}
+swc_macros_common = {version = "0.3.2", path = "../swc_macros_common"}
 [dependencies.syn]
 features = ["full", "parsing", "printing", "extra-traits"]
--- a/crates/enum_kind/src/expand.rs
+++ b/crates/enum_kind/src/expand.rs
--- a/crates/enum_kind/src/input.rs
+++ b/crates/enum_kind/src/input.rs
--- a/crates/enum_kind/src/lib.rs
+++ b/crates/enum_kind/src/lib.rs
--- a/crates/enum_kind/src/parse.rs
+++ b/crates/enum_kind/src/parse.rs
--- a/crates/enum_kind/src/util.rs
+++ b/crates/enum_kind/src/util.rs
--- a/crates/enum_kind/tests/usage.rs
+++ b/crates/enum_kind/tests/usage.rs
--- a/crates/from_variant/Cargo.toml
+++ b/crates/from_variant/Cargo.toml
@ -14,7 +14,7 @@ proc-macro = true
 [dependencies]
 pmutil = "0.5.3"
 proc-macro2 = "1"
-swc_macros_common = {version = "0.3.2", path = "../common"}
+swc_macros_common = {version = "0.3.2", path = "../swc_macros_common"}
 [dependencies.syn]
 features = ["derive", "fold", "parsing", "printing"]
--- a/crates/from_variant/src/lib.rs
+++ b/crates/from_variant/src/lib.rs
--- a/ecmascript/jsdoc/Cargo.toml
+++ b/ecmascript/jsdoc/Cargo.toml
@ -12,13 +12,13 @@ version = "0.46.0"
 [dependencies]
 nom = "5.1.2"
 serde = {version = "1", features = ["derive"]}
-swc_atoms = {version = "0.2", path = "../../atoms"}
+swc_atoms = {version = "0.2", path = "../swc_atoms"}
-swc_common = {version = "0.14.0", path = "../../common"}
+swc_common = {version = "0.14.0", path = "../swc_common"}
 [dev-dependencies]
 anyhow = "1"
 dashmap = "4.0.2"
-swc_ecma_ast = {version = "0.57.0", path = "../ast"}
+swc_ecma_ast = {version = "0.57.0", path = "../../ecmascript/ast"}
-swc_ecma_parser = {version = "0.77.0", path = "../parser"}
+swc_ecma_parser = {version = "0.77.0", path = "../../ecmascript/parser"}
-testing = {version = "0.15.0", path = "../../testing"}
+testing = {version = "0.15.0", path = "../testing"}
 walkdir = "2"
--- a/ecmascript/jsdoc/src/ast.rs
+++ b/ecmascript/jsdoc/src/ast.rs
--- a/ecmascript/jsdoc/src/input.rs
+++ b/ecmascript/jsdoc/src/input.rs
--- a/ecmascript/jsdoc/src/lib.rs
+++ b/ecmascript/jsdoc/src/lib.rs
--- a/ecmascript/jsdoc/tests/fixture.rs
+++ b/ecmascript/jsdoc/tests/fixture.rs
--- a/ecmascript/jsdoc/tests/fixtures/abstracttag.debug
+++ b/ecmascript/jsdoc/tests/fixtures/abstracttag.debug
--- a/ecmascript/jsdoc/tests/fixtures/abstracttag.js
+++ b/ecmascript/jsdoc/tests/fixtures/abstracttag.js
--- a/ecmascript/jsdoc/tests/fixtures/accesstag.debug
+++ b/ecmascript/jsdoc/tests/fixtures/accesstag.debug
--- a/ecmascript/jsdoc/tests/fixtures/accesstag.js
+++ b/ecmascript/jsdoc/tests/fixtures/accesstag.js
--- a/ecmascript/jsdoc/tests/fixtures/alias.debug
+++ b/ecmascript/jsdoc/tests/fixtures/alias.debug
--- a/ecmascript/jsdoc/tests/fixtures/alias.js
+++ b/ecmascript/jsdoc/tests/fixtures/alias.js
--- a/ecmascript/jsdoc/tests/fixtures/alias2.debug
+++ b/ecmascript/jsdoc/tests/fixtures/alias2.debug
--- a/ecmascript/jsdoc/tests/fixtures/alias2.js
+++ b/ecmascript/jsdoc/tests/fixtures/alias2.js
--- a/ecmascript/jsdoc/tests/fixtures/alias3.debug
+++ b/ecmascript/jsdoc/tests/fixtures/alias3.debug
--- a/ecmascript/jsdoc/tests/fixtures/alias3.js
+++ b/ecmascript/jsdoc/tests/fixtures/alias3.js
--- a/ecmascript/jsdoc/tests/fixtures/alias4.debug
+++ b/ecmascript/jsdoc/tests/fixtures/alias4.debug
--- a/ecmascript/jsdoc/tests/fixtures/alias4.js
+++ b/ecmascript/jsdoc/tests/fixtures/alias4.js
--- a/ecmascript/jsdoc/tests/fixtures/alias5.debug
+++ b/ecmascript/jsdoc/tests/fixtures/alias5.debug
--- a/ecmascript/jsdoc/tests/fixtures/alias5.js
+++ b/ecmascript/jsdoc/tests/fixtures/alias5.js
--- a/ecmascript/jsdoc/tests/fixtures/alias6.debug
+++ b/ecmascript/jsdoc/tests/fixtures/alias6.debug
--- a/ecmascript/jsdoc/tests/fixtures/alias6.js
+++ b/ecmascript/jsdoc/tests/fixtures/alias6.js
--- a/ecmascript/jsdoc/tests/fixtures/aliasexports.debug
+++ b/ecmascript/jsdoc/tests/fixtures/aliasexports.debug
--- a/ecmascript/jsdoc/tests/fixtures/aliasexports.js
+++ b/ecmascript/jsdoc/tests/fixtures/aliasexports.js
--- a/ecmascript/jsdoc/tests/fixtures/aliasglobal.debug
+++ b/ecmascript/jsdoc/tests/fixtures/aliasglobal.debug
--- a/ecmascript/jsdoc/tests/fixtures/aliasglobal.js
+++ b/ecmascript/jsdoc/tests/fixtures/aliasglobal.js
--- a/ecmascript/jsdoc/tests/fixtures/aliasglobal2.debug
+++ b/ecmascript/jsdoc/tests/fixtures/aliasglobal2.debug
--- a/ecmascript/jsdoc/tests/fixtures/aliasglobal2.js
+++ b/ecmascript/jsdoc/tests/fixtures/aliasglobal2.js
--- a/ecmascript/jsdoc/tests/fixtures/aliasresolve.debug
+++ b/ecmascript/jsdoc/tests/fixtures/aliasresolve.debug
--- a/ecmascript/jsdoc/tests/fixtures/aliasresolve.js
+++ b/ecmascript/jsdoc/tests/fixtures/aliasresolve.js
--- a/ecmascript/jsdoc/tests/fixtures/aliasresolve2.debug
+++ b/ecmascript/jsdoc/tests/fixtures/aliasresolve2.debug
--- a/ecmascript/jsdoc/tests/fixtures/aliasresolve2.js
+++ b/ecmascript/jsdoc/tests/fixtures/aliasresolve2.js
--- a/ecmascript/jsdoc/tests/fixtures/also.debug
+++ b/ecmascript/jsdoc/tests/fixtures/also.debug
--- a/ecmascript/jsdoc/tests/fixtures/also.js
+++ b/ecmascript/jsdoc/tests/fixtures/also.js
--- a/ecmascript/jsdoc/tests/fixtures/also2.debug
+++ b/ecmascript/jsdoc/tests/fixtures/also2.debug
--- a/ecmascript/jsdoc/tests/fixtures/also2.js
+++ b/ecmascript/jsdoc/tests/fixtures/also2.js
--- a/ecmascript/jsdoc/tests/fixtures/anonymousclass.debug
+++ b/ecmascript/jsdoc/tests/fixtures/anonymousclass.debug
--- a/ecmascript/jsdoc/tests/fixtures/anonymousclass.js
+++ b/ecmascript/jsdoc/tests/fixtures/anonymousclass.js
--- a/ecmascript/jsdoc/tests/fixtures/anonymousclassparam.debug
+++ b/ecmascript/jsdoc/tests/fixtures/anonymousclassparam.debug
--- a/ecmascript/jsdoc/tests/fixtures/anonymousclassparam.js
+++ b/ecmascript/jsdoc/tests/fixtures/anonymousclassparam.js
--- a/ecmascript/jsdoc/tests/fixtures/arrowfunction.debug
+++ b/ecmascript/jsdoc/tests/fixtures/arrowfunction.debug
--- a/ecmascript/jsdoc/tests/fixtures/arrowfunction.js
+++ b/ecmascript/jsdoc/tests/fixtures/arrowfunction.js
--- a/ecmascript/jsdoc/tests/fixtures/asyncfunction.debug
+++ b/ecmascript/jsdoc/tests/fixtures/asyncfunction.debug
--- a/ecmascript/jsdoc/tests/fixtures/asyncfunction.js
+++ b/ecmascript/jsdoc/tests/fixtures/asyncfunction.js
--- a/ecmascript/jsdoc/tests/fixtures/asynctag.debug
+++ b/ecmascript/jsdoc/tests/fixtures/asynctag.debug
--- a/ecmascript/jsdoc/tests/fixtures/asynctag.js
+++ b/ecmascript/jsdoc/tests/fixtures/asynctag.js
--- a/ecmascript/jsdoc/tests/fixtures/augmentall.debug
+++ b/ecmascript/jsdoc/tests/fixtures/augmentall.debug
--- a/ecmascript/jsdoc/tests/fixtures/augmentall.js
+++ b/ecmascript/jsdoc/tests/fixtures/augmentall.js
--- a/ecmascript/jsdoc/tests/fixtures/augmentall2.debug
+++ b/ecmascript/jsdoc/tests/fixtures/augmentall2.debug
--- a/ecmascript/jsdoc/tests/fixtures/augmentall2.js
+++ b/ecmascript/jsdoc/tests/fixtures/augmentall2.js
--- a/ecmascript/jsdoc/tests/fixtures/augmentstag.debug
+++ b/ecmascript/jsdoc/tests/fixtures/augmentstag.debug
--- a/ecmascript/jsdoc/tests/fixtures/augmentstag.js
+++ b/ecmascript/jsdoc/tests/fixtures/augmentstag.js
--- a/ecmascript/jsdoc/tests/fixtures/augmentstag2.debug
+++ b/ecmascript/jsdoc/tests/fixtures/augmentstag2.debug
--- a/ecmascript/jsdoc/tests/fixtures/augmentstag2.js
+++ b/ecmascript/jsdoc/tests/fixtures/augmentstag2.js
--- a/ecmascript/jsdoc/tests/fixtures/augmentstag3.debug
+++ b/ecmascript/jsdoc/tests/fixtures/augmentstag3.debug
--- a/ecmascript/jsdoc/tests/fixtures/augmentstag3.js
+++ b/ecmascript/jsdoc/tests/fixtures/augmentstag3.js
--- a/ecmascript/jsdoc/tests/fixtures/augmentstag4.debug
+++ b/ecmascript/jsdoc/tests/fixtures/augmentstag4.debug
--- a/ecmascript/jsdoc/tests/fixtures/augmentstag4.js
+++ b/ecmascript/jsdoc/tests/fixtures/augmentstag4.js
--- a/ecmascript/jsdoc/tests/fixtures/augmentstag5.debug
+++ b/ecmascript/jsdoc/tests/fixtures/augmentstag5.debug
--- a/ecmascript/jsdoc/tests/fixtures/augmentstag5.js
+++ b/ecmascript/jsdoc/tests/fixtures/augmentstag5.js
--- a/ecmascript/jsdoc/tests/fixtures/augmentstag6.debug
+++ b/ecmascript/jsdoc/tests/fixtures/augmentstag6.debug
--- a/ecmascript/jsdoc/tests/fixtures/augmentstag6.js
+++ b/ecmascript/jsdoc/tests/fixtures/augmentstag6.js
--- a/ecmascript/jsdoc/tests/fixtures/authortag.debug
+++ b/ecmascript/jsdoc/tests/fixtures/authortag.debug
--- a/ecmascript/jsdoc/tests/fixtures/authortag.js
+++ b/ecmascript/jsdoc/tests/fixtures/authortag.js
--- a/ecmascript/jsdoc/tests/fixtures/borrowstag.debug
+++ b/ecmascript/jsdoc/tests/fixtures/borrowstag.debug
--- a/ecmascript/jsdoc/tests/fixtures/borrowstag.js
+++ b/ecmascript/jsdoc/tests/fixtures/borrowstag.js
--- a/ecmascript/jsdoc/tests/fixtures/borrowstag2.debug
+++ b/ecmascript/jsdoc/tests/fixtures/borrowstag2.debug
--- a/ecmascript/jsdoc/tests/fixtures/borrowstag2.js
+++ b/ecmascript/jsdoc/tests/fixtures/borrowstag2.js
--- a/ecmascript/jsdoc/tests/fixtures/callbacktag.debug
+++ b/ecmascript/jsdoc/tests/fixtures/callbacktag.debug
--- a/ecmascript/jsdoc/tests/fixtures/callbacktag.js
+++ b/ecmascript/jsdoc/tests/fixtures/callbacktag.js
--- a/ecmascript/jsdoc/tests/fixtures/classdesctag.debug
+++ b/ecmascript/jsdoc/tests/fixtures/classdesctag.debug
--- a/ecmascript/jsdoc/tests/fixtures/classdesctag.js
+++ b/ecmascript/jsdoc/tests/fixtures/classdesctag.js
--- a/ecmascript/jsdoc/tests/fixtures/classproperties.debug
+++ b/ecmascript/jsdoc/tests/fixtures/classproperties.debug
--- a/ecmascript/jsdoc/tests/fixtures/classproperties.js
+++ b/ecmascript/jsdoc/tests/fixtures/classproperties.js
--- a/ecmascript/jsdoc/tests/fixtures/classtag.debug
+++ b/ecmascript/jsdoc/tests/fixtures/classtag.debug
--- a/ecmascript/jsdoc/tests/fixtures/classtag.js
+++ b/ecmascript/jsdoc/tests/fixtures/classtag.js
--- a/ecmascript/jsdoc/tests/fixtures/classtag2.debug
+++ b/ecmascript/jsdoc/tests/fixtures/classtag2.debug
--- a/ecmascript/jsdoc/tests/fixtures/classtag2.js
+++ b/ecmascript/jsdoc/tests/fixtures/classtag2.js
--- a/ecmascript/jsdoc/tests/fixtures/classwithoutname.debug
+++ b/ecmascript/jsdoc/tests/fixtures/classwithoutname.debug
--- a/ecmascript/jsdoc/tests/fixtures/classwithoutname.js
+++ b/ecmascript/jsdoc/tests/fixtures/classwithoutname.js
--- a/ecmascript/jsdoc/tests/fixtures/constanttag.debug
+++ b/ecmascript/jsdoc/tests/fixtures/constanttag.debug
--- a/ecmascript/jsdoc/tests/fixtures/constanttag.js
+++ b/ecmascript/jsdoc/tests/fixtures/constanttag.js
--- a/ecmascript/jsdoc/tests/fixtures/constanttag2.debug
+++ b/ecmascript/jsdoc/tests/fixtures/constanttag2.debug
--- a/ecmascript/jsdoc/tests/fixtures/constanttag2.js
+++ b/ecmascript/jsdoc/tests/fixtures/constanttag2.js
--- a/ecmascript/jsdoc/tests/fixtures/constructortag.debug
+++ b/ecmascript/jsdoc/tests/fixtures/constructortag.debug
--- a/Show More
+++ b/Show More