Merge branch 'main' into fix-semantic-lifetimes

oxc-project · Jan 15, 2025 · 1684b92 · 1684b92
2 parents 1dc56bd + 04bc259
commit 1684b92
Show file tree

Hide file tree

Showing 198 changed files with 18,243 additions and 15,432 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -18,7 +18,10 @@
   "customizations": {
     "vscode": {
       "extensions": [
-        "rust-lang.rust-analyzer"
+        "rust-lang.rust-analyzer",
+        "EditorConfig.EditorConfig",
+        "tamasfe.even-better-toml",
+        "eamodio.gitlens"
       ]
     }
   },

diff --git a/.github/.generated_ast_watch_list.yml b/.github/.generated_ast_watch_list.yml
@@ -22,9 +22,6 @@ src:
   - 'crates/oxc_ast/src/generated/derive_content_eq.rs'
   - 'crates/oxc_regular_expression/src/generated/derive_content_eq.rs'
   - 'crates/oxc_syntax/src/generated/derive_content_eq.rs'
-  - 'crates/oxc_ast/src/generated/derive_content_hash.rs'
-  - 'crates/oxc_regular_expression/src/generated/derive_content_hash.rs'
-  - 'crates/oxc_syntax/src/generated/derive_content_hash.rs'
   - 'crates/oxc_ast/src/generated/derive_estree.rs'
   - 'crates/oxc_regular_expression/src/generated/derive_estree.rs'
   - 'crates/oxc_span/src/generated/derive_estree.rs'

diff --git a/.github/actions/clone-submodules/action.yml b/.github/actions/clone-submodules/action.yml
@@ -17,7 +17,7 @@ runs:
         show-progress: false
         repository: babel/babel
         path: tasks/coverage/babel
-        ref: 54a8389fa31ce4fd18b0335b05832dc1ad3cc21f
+        ref: acbc09a87016778c1551ab5e7162fdd0e70b6663
 
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       with:

diff --git a/.typos.toml b/.typos.toml
@@ -26,6 +26,7 @@ extend-exclude = [
   "tasks/transform_conformance/overrides",
   "tasks/transform_conformance/snapshots",
   "npm/oxc-wasm/oxc_wasm.js",
+  "napi/minify/test/terser.test.ts",
 ]
 
 [default]

diff --git a/Cargo.lock b/Cargo.lock