fixup

vercel · Sep 3, 2022 · 162d7c6 · 162d7c6
1 parent 7f34d7c
commit 162d7c6
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/packages/next-swc/crates/core/tests/fixture.rs b/packages/next-swc/crates/core/tests/fixture.rs
@@ -11,9 +11,9 @@ use next_swc::{
 use std::path::PathBuf;
 use swc_core::{
     common::{chain, comments::SingleThreadedComments, FileName, Mark},
-    parser::{EsConfig, Syntax},
-    testing_transform::{test, test_fixture},
-    transforms::react::jsx,
+    ecma::parser::{EsConfig, Syntax},
+    ecma::transforms::react::jsx,
+    ecma::transforms::testing::{test, test_fixture},
 };
 use testing::fixture;
 
@@ -86,7 +86,7 @@ fn next_ssg_fixture(input: PathBuf) {
             let jsx = jsx::<SingleThreadedComments>(
                 tr.cm.clone(),
                 None,
-                swc_core::transforms::react::Options {
+                swc_core::ecma::transforms::react::Options {
                     next: false.into(),
                     runtime: None,
                     import_source: Some("".into()),

diff --git a/packages/next-swc/crates/core/tests/full.rs b/packages/next-swc/crates/core/tests/full.rs
@@ -3,8 +3,8 @@ use serde::de::DeserializeOwned;
 use std::path::{Path, PathBuf};
 use swc_core::{
     base::Compiler,
-    parser::{Syntax, TsConfig},
-    transforms::pass::noop,
+    ecma::parser::{Syntax, TsConfig},
+    ecma::transforms::pass::noop,
 };
 use testing::{NormalizedOutput, Tester};
 

diff --git a/packages/next-swc/crates/core/tests/telemetry.rs b/packages/next-swc/crates/core/tests/telemetry.rs
@@ -9,7 +9,7 @@ use once_cell::sync::Lazy;
 use swc_core::{
     base::{try_with_handler, Compiler},
     common::{FileName, FilePathMapping, SourceMap},
-    transforms::pass::noop,
+    ecma::transforms::pass::noop,
 };
 
 static COMPILER: Lazy<Arc<Compiler>> = Lazy::new(|| {

diff --git a/packages/next-swc/crates/napi/src/bundle/mod.rs b/packages/next-swc/crates/napi/src/bundle/mod.rs
@@ -8,21 +8,21 @@ use once_cell::sync::Lazy;
 use serde::Deserialize;
 use std::{collections::HashMap, path::PathBuf, sync::Arc};
 use swc_core::{
-    ast::*,
-    atoms::JsWord,
     base::{config::SourceMapsConfig, try_with_handler, TransformOutput},
     bundler::{Bundler, ModuleData, ModuleRecord},
     common::{
         collections::AHashMap,
         errors::{ColorConfig, Handler},
         BytePos, FileName, SourceMap, Span,
     },
-    loader::{
+    ecma::ast::*,
+    ecma::atoms::JsWord,
+    ecma::loader::{
         resolvers::{lru::CachingResolver, node::NodeModulesResolver},
         TargetEnv, NODE_BUILTINS,
     },
-    parser::{lexer::Lexer, EsConfig, Parser, StringInput, Syntax},
-    visit::{noop_visit_type, Visit, VisitWith},
+    ecma::parser::{lexer::Lexer, EsConfig, Parser, StringInput, Syntax},
+    ecma::visit::{noop_visit_type, Visit, VisitWith},
 };
 
 #[js_function(1)]

diff --git a/packages/next-swc/crates/napi/src/transform.rs b/packages/next-swc/crates/napi/src/transform.rs
@@ -45,7 +45,7 @@ use std::{
 use swc_core::{
     base::{try_with_handler, Compiler, TransformOutput},
     common::{errors::ColorConfig, FileName},
-    transforms::pass::noop,
+    ecma::transforms::pass::noop,
 };
 
 /// Input to transform

diff --git a/packages/next-swc/crates/styled_jsx/tests/fixture.rs b/packages/next-swc/crates/styled_jsx/tests/fixture.rs
@@ -60,7 +60,7 @@ fn styled_jsx_fixture(input: PathBuf) {
 }
 
 pub struct DropSpan;
-impl swc_core::visit::VisitMut for DropSpan {
+impl swc_core::ecma::visit::VisitMut for DropSpan {
     fn visit_mut_span(&mut self, span: &mut Span) {
         *span = DUMMY_SP
     }

diff --git a/packages/next-swc/crates/wasm/src/lib.rs b/packages/next-swc/crates/wasm/src/lib.rs
@@ -9,7 +9,7 @@ use wasm_bindgen_futures::future_to_promise;
 use swc_core::{
     base::{config::JsMinifyOptions, config::ParseOptions, try_with_handler, Compiler},
     common::{comments::Comments, errors::ColorConfig, FileName, FilePathMapping, SourceMap},
-    transforms::pass::noop,
+    ecma::transforms::pass::noop,
 };
 
 fn convert_err(err: Error) -> JsValue {