next/dynamic: Accept pagesDir (#29055)

* Add pages_dir * Add `pages_dir` to `next/dynamic` pass * Dep * Fix next/dynamic psss * Fix * Update test refs * Add a test
vercel · Sep 13, 2021 · fd2af14 · fd2af14
1 parent c38e702
commit fd2af14
Show file tree

Hide file tree

Showing 9 changed files with 307 additions and 246 deletions.
diff --git a/packages/next/build/swc/Cargo.lock b/packages/next/build/swc/Cargo.lock
diff --git a/packages/next/build/swc/Cargo.toml b/packages/next/build/swc/Cargo.toml
@@ -24,6 +24,7 @@ swc_ecma_preset_env = "0.42"
 fxhash = "0.2.1"
 retain_mut = "0.1.3"
 log = "0.4.14"
+pathdiff = "0.2.0"
 
 
 [build-dependencies]

diff --git a/packages/next/build/swc/src/next_dynamic.rs b/packages/next/build/swc/src/next_dynamic.rs
diff --git a/packages/next/build/swc/src/transform.rs b/packages/next/build/swc/src/transform.rs
@@ -37,7 +37,7 @@ use crate::{
 use anyhow::{Context as _, Error};
 use napi::{CallContext, Env, JsBoolean, JsObject, JsString, Task};
 use serde::Deserialize;
-use std::sync::Arc;
+use std::{path::PathBuf, sync::Arc};
 use swc::{try_with_handler, Compiler, TransformOutput};
 use swc_common::{chain, pass::Optional, FileName, SourceFile};
 use swc_ecmascript::ast::Program;
@@ -51,13 +51,16 @@ pub enum Input {
 }
 
 #[derive(Debug, Deserialize)]
-#[serde(deny_unknown_fields, rename_all = "camelCase")]
+#[serde(rename_all = "camelCase")]
 pub struct TransformOptions {
     #[serde(flatten)]
-    swc: swc::config::Options,
+    pub swc: swc::config::Options,
 
     #[serde(default)]
     pub disable_next_ssg: bool,
+
+    #[serde(default)]
+    pub pages_dir: Option<PathBuf>,
 }
 
 pub struct TransformTask {
@@ -78,7 +81,7 @@ impl Task for TransformTask {
                         hook_optimizer(),
                         Optional::new(next_ssg(), !self.options.disable_next_ssg),
                         amp_attributes(),
-                        next_dynamic(s.name.clone()),
+                        next_dynamic(s.name.clone(), self.options.pages_dir.clone()),
                     );
                     self.c.process_js_with_custom_pass(
                         s.clone(),
@@ -175,3 +178,12 @@ pub fn transform_sync(cx: CallContext) -> napi::Result<JsObject> {
         ))
     })
 }
+
+#[test]
+fn test_deser() {
+    const JSON_STR: &str = r#"{"jsc":{"parser":{"syntax":"ecmascript","dynamicImport":true,"jsx":true},"transform":{"react":{"runtime":"automatic","pragma":"React.createElement","pragmaFrag":"React.Fragment","throwIfNamespace":true,"development":false,"useBuiltins":true}},"target":"es5"},"filename":"/Users/timneutkens/projects/next.js/packages/next/dist/client/next.js","sourceMaps":false,"sourceFileName":"/Users/timneutkens/projects/next.js/packages/next/dist/client/next.js"}"#;
+
+    let tr: TransformOptions = serde_json::from_str(&JSON_STR).unwrap();
+
+    println!("{:#?}", tr);
+}
diff --git a/packages/next/build/swc/tests/fixture.rs b/packages/next/build/swc/tests/fixture.rs
@@ -5,8 +5,8 @@ use std::path::PathBuf;
 use swc_common::{chain, comments::SingleThreadedComments, FileName};
 use swc_ecma_transforms_testing::{test, test_fixture};
 use swc_ecmascript::{
-  parser::{EsConfig, Syntax},
-  transforms::react::jsx,
+    parser::{EsConfig, Syntax},
+    transforms::react::jsx,
 };
 use testing::fixture;
 
@@ -18,59 +18,60 @@ mod next_dynamic;
 mod next_ssg;
 
 fn syntax() -> Syntax {
-  Syntax::Es(EsConfig {
-    jsx: true,
-    dynamic_import: true,
-    ..Default::default()
-  })
+    Syntax::Es(EsConfig {
+        jsx: true,
+        dynamic_import: true,
+        ..Default::default()
+    })
 }
 
 #[fixture("tests/fixture/amp/**/input.js")]
 fn amp_attributes_fixture(input: PathBuf) {
-  let output = input.parent().unwrap().join("output.js");
-  test_fixture(syntax(), &|_tr| amp_attributes(), &input, &output);
+    let output = input.parent().unwrap().join("output.js");
+    test_fixture(syntax(), &|_tr| amp_attributes(), &input, &output);
 }
 
 #[fixture("tests/fixture/next-dynamic/**/input.js")]
 fn next_dynamic_fixture(input: PathBuf) {
-  let output = input.parent().unwrap().join("output.js");
-  test_fixture(
-    syntax(),
-    &|_tr| {
-      next_dynamic(FileName::Real(PathBuf::from(
-        "/some-project/src/some-file.js",
-      )))
-    },
-    &input,
-    &output,
-  );
+    let output = input.parent().unwrap().join("output.js");
+    test_fixture(
+        syntax(),
+        &|_tr| {
+            next_dynamic(
+                FileName::Real(PathBuf::from("/some-project/src/some-file.js")),
+                Some("/some-project/src".into()),
+            )
+        },
+        &input,
+        &output,
+    );
 }
 
 #[fixture("tests/fixture/ssg/**/input.js")]
 fn next_ssg_fixture(input: PathBuf) {
-  let output = input.parent().unwrap().join("output.js");
-  test_fixture(
-    syntax(),
-    &|tr| {
-      let jsx = jsx::<SingleThreadedComments>(
-        tr.cm.clone(),
-        None,
-        swc_ecmascript::transforms::react::Options {
-          next: false,
-          runtime: None,
-          import_source: "".into(),
-          pragma: "__jsx".into(),
-          pragma_frag: "__jsxFrag".into(),
-          throw_if_namespace: false,
-          development: false,
-          use_builtins: true,
-          use_spread: true,
-          refresh: Default::default(),
+    let output = input.parent().unwrap().join("output.js");
+    test_fixture(
+        syntax(),
+        &|tr| {
+            let jsx = jsx::<SingleThreadedComments>(
+                tr.cm.clone(),
+                None,
+                swc_ecmascript::transforms::react::Options {
+                    next: false,
+                    runtime: None,
+                    import_source: "".into(),
+                    pragma: "__jsx".into(),
+                    pragma_frag: "__jsxFrag".into(),
+                    throw_if_namespace: false,
+                    development: false,
+                    use_builtins: true,
+                    use_spread: true,
+                    refresh: Default::default(),
+                },
+            );
+            chain!(next_ssg(), jsx)
         },
-      );
-      chain!(next_ssg(), jsx)
-    },
-    &input,
-    &output,
-  );
+        &input,
+        &output,
+    );
 }
diff --git a/packages/next/build/swc/tests/fixture/next-dynamic/duplicated-imports/output.js b/packages/next/build/swc/tests/fixture/next-dynamic/duplicated-imports/output.js
@@ -3,12 +3,12 @@ import dynamic2 from 'next/dynamic'
 const DynamicComponent1 = dynamic1(() => import('../components/hello1'), {
   loadableGenerated: {
     webpack: () => [require.resolveWeak('/some-project/src/some-file.js')],
-    modules: ['/some-project/src/some-file.js -> ' + '../components/hello1'],
+    modules: ['some-file.js -> ' + '../components/hello1'],
   },
 })
 const DynamicComponent2 = dynamic2(() => import('../components/hello2'), {
   loadableGenerated: {
     webpack: () => [require.resolveWeak('/some-project/src/some-file.js')],
-    modules: ['/some-project/src/some-file.js -> ' + '../components/hello2'],
+    modules: ['some-file.js -> ' + '../components/hello2'],
   },
 })
diff --git a/packages/next/build/swc/tests/fixture/next-dynamic/member-with-same-name/output.js b/packages/next/build/swc/tests/fixture/next-dynamic/member-with-same-name/output.js
@@ -1,10 +1,9 @@
 import dynamic from 'next/dynamic'
 import somethingElse from 'something-else'
-
 const DynamicComponent = dynamic(() => import('../components/hello'), {
   loadableGenerated: {
     webpack: () => [require.resolveWeak('/some-project/src/some-file.js')],
-    modules: ['/some-project/src/some-file.js -> ' + '../components/hello'],
+    modules: ['some-file.js -> ' + '../components/hello'],
   },
 })
 somethingElse.dynamic('should not be transformed')
diff --git a/packages/next/build/swc/tests/fixture/next-dynamic/no-options/output.js b/packages/next/build/swc/tests/fixture/next-dynamic/no-options/output.js
@@ -1,8 +1,7 @@
 import dynamic from 'next/dynamic'
-
 const DynamicComponent = dynamic(() => import('../components/hello'), {
   loadableGenerated: {
     webpack: () => [require.resolveWeak('/some-project/src/some-file.js')],
-    modules: ['/some-project/src/some-file.js -> ' + '../components/hello'],
+    modules: ['some-file.js -> ' + '../components/hello'],
   },
 })
diff --git a/packages/next/build/swc/tests/fixture/next-dynamic/with-options/output.js b/packages/next/build/swc/tests/fixture/next-dynamic/with-options/output.js
@@ -1,12 +1,13 @@
 import dynamic from 'next/dynamic'
-
 const DynamicComponentWithCustomLoading = dynamic(
   () => import('../components/hello'),
-  { loading: () => <p>...</p> },
+  {
+    loading: () => <p>...</p>,
+  },
   {
     loadableGenerated: {
       webpack: () => [require.resolveWeak('/some-project/src/some-file.js')],
-      modules: ['/some-project/src/some-file.js -> ' + '../components/hello'],
+      modules: ['some-file.js -> ' + '../components/hello'],
     },
     loading: () => <p>...</p>,
   }