feat(core): update swc/register (#21755)

nrwl · Feb 9, 2024 · f3cdce0 · f3cdce0
1 parent 5911ca6
commit f3cdce0
Show file tree

Hide file tree

Showing 11 changed files with 181 additions and 193 deletions.
diff --git a/package.json b/package.json
@@ -104,7 +104,7 @@
     "@supabase/supabase-js": "^2.26.0",
     "@svgr/rollup": "^8.0.1",
     "@svgr/webpack": "^8.0.1",
-    "@swc-node/register": "1.6.8",
+    "@swc-node/register": "1.8.0",
     "@swc/cli": "0.1.62",
     "@swc/core": "^1.3.85",
     "@swc/jest": "^0.2.20",

diff --git a/packages/devkit/src/utils/config-utils.ts b/packages/devkit/src/utils/config-utils.ts
@@ -1,4 +1,4 @@
-import { dirname, extname, join, relative } from 'path';
+import { dirname, extname, join } from 'path';
 import { existsSync, readdirSync } from 'fs';
 import { requireNx } from '../../nx';
 
@@ -21,12 +21,7 @@ export async function loadConfigFile<T extends object = any>(
         ? join(dirname(configFilePath), 'tsconfig.json')
         : getRootTsConfigPath();
       if (tsConfigPath) {
-        const unregisterTsProject = registerTsProject(
-          tsConfigPath,
-          undefined,
-          // TODO(@AgentEnder): Remove this hack to make sure that e2e loads properly for next.js
-          relative(workspaceRoot, dirname(configFilePath)) === 'e2e'
-        );
+        const unregisterTsProject = registerTsProject(tsConfigPath);
         try {
           module = await load(configFilePath);
         } finally {

diff --git a/packages/js/migrations.json b/packages/js/migrations.json
@@ -145,6 +145,15 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "18.0.4": {
+      "version": "18.0.4-beta.0",
+      "packages": {
+        "@swc-node/register": {
+          "version": "~1.8.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }
diff --git a/packages/js/src/utils/versions.ts b/packages/js/src/utils/versions.ts
@@ -5,7 +5,7 @@ export const prettierVersion = '^2.6.2';
 export const swcCliVersion = '~0.1.62';
 export const swcCoreVersion = '~1.3.85';
 export const swcHelpersVersion = '~0.5.2';
-export const swcNodeVersion = '~1.6.7';
+export const swcNodeVersion = '~1.8.0';
 export const tsLibVersion = '^2.3.0';
 export const typesNodeVersion = '18.16.9';
 export const verdaccioVersion = '^5.0.4';

diff --git a/packages/next/migrations.json b/packages/next/migrations.json
@@ -92,6 +92,15 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "18.0.4": {
+      "version": "18.0.4-beta.0",
+      "packages": {
+        "@swc-node/register": {
+          "version": "~1.8.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }
diff --git a/packages/next/src/utils/versions.ts b/packages/next/src/utils/versions.ts
@@ -11,4 +11,4 @@ export const tsLibVersion = '^2.3.0';
 export const swcCliVersion = '~0.1.62';
 export const swcCoreVersion = '~1.3.85';
 export const swcHelpersVersion = '~0.5.2';
-export const swcNodeVersion = '~1.6.7';
+export const swcNodeVersion = '~1.8.0';
diff --git a/packages/nx/package.json b/packages/nx/package.json
@@ -68,7 +68,7 @@
     "ora": "5.3.0"
   },
   "peerDependencies": {
-    "@swc-node/register": "^1.6.7",
+    "@swc-node/register": "^1.8.0",
     "@swc/core": "^1.3.85"
   },
   "peerDependenciesMeta": {

diff --git a/packages/nx/src/plugins/js/utils/register.ts b/packages/nx/src/plugins/js/utils/register.ts
@@ -32,31 +32,17 @@ export function registerTsProject(tsConfigPath: string): () => void;
  * @returns cleanup function
  * @deprecated This signature will be removed in Nx v19. You should pass the full path to the tsconfig in the first argument.
  */
+export function registerTsProject(path: string, configFilename: string);
 export function registerTsProject(
   path: string,
-  configFilename: string,
-  /**
-   * @deprecated Do not use this.. it's a 1-off exception
-   */
-  useForSwcEnvironmentVariable?: boolean
-);
-export function registerTsProject(
-  path: string,
-  configFilename?: string,
-  /**
-   * @deprecated Do not use this.. it's a 1-off exception
-   */
-  useForSwcEnvironmentVariable?: boolean
+  configFilename?: string
 ): () => void {
   const tsConfigPath = configFilename ? join(path, configFilename) : path;
   const compilerOptions: CompilerOptions = readCompilerOptions(tsConfigPath);
 
   const cleanupFunctions: ((...args: unknown[]) => unknown)[] = [
     registerTsConfigPaths(tsConfigPath),
-    registerTranspiler(
-      compilerOptions,
-      useForSwcEnvironmentVariable ? tsConfigPath : undefined
-    ),
+    registerTranspiler(compilerOptions),
   ];
 
   // Add ESM support for `.ts` files.
@@ -80,24 +66,14 @@ export function registerTsProject(
 }
 
 export function getSwcTranspiler(
-  compilerOptions: CompilerOptions,
-  tsConfigPath?: string
+  compilerOptions: CompilerOptions
 ): (...args: unknown[]) => unknown {
   type ISwcRegister = typeof import('@swc-node/register/register')['register'];
 
   // These are requires to prevent it from registering when it shouldn't
   const register = require('@swc-node/register/register')
     .register as ISwcRegister;
 
-  if (tsConfigPath) {
-    process.env.SWC_NODE_PROJECT = tsConfigPath;
-  } else {
-    let rootTsConfig = join(workspaceRoot, 'tsconfig.base.json');
-    if (existsSync(rootTsConfig)) {
-      process.env.SWC_NODE_PROJECT = rootTsConfig;
-    }
-  }
-
   const cleanupFn = register(compilerOptions);
 
   return typeof cleanupFn === 'function' ? cleanupFn : () => {};
@@ -127,10 +103,7 @@ export function getTsNodeTranspiler(
   };
 }
 
-export function getTranspiler(
-  compilerOptions: CompilerOptions,
-  tsConfigPath?: string
-) {
+export function getTranspiler(compilerOptions: CompilerOptions) {
   const preferTsNode = process.env.NX_PREFER_TS_NODE === 'true';
 
   if (!ts) {
@@ -144,7 +117,7 @@ export function getTranspiler(
   compilerOptions.skipLibCheck = true;
 
   if (swcNodeInstalled && !preferTsNode) {
-    return () => getSwcTranspiler(compilerOptions, tsConfigPath);
+    return () => getSwcTranspiler(compilerOptions);
   }
 
   // We can fall back on ts-node if it's available
@@ -162,11 +135,10 @@ export function getTranspiler(
  * @returns cleanup method
  */
 export function registerTranspiler(
-  compilerOptions: CompilerOptions,
-  tsConfigPath?: string
+  compilerOptions: CompilerOptions
 ): () => void {
   // Function to register transpiler that returns cleanup function
-  const transpiler = getTranspiler(compilerOptions, tsConfigPath);
+  const transpiler = getTranspiler(compilerOptions);
 
   if (!transpiler) {
     warnNoTranspiler();

diff --git a/packages/storybook/src/generators/configuration/__snapshots__/configuration.spec.ts.snap b/packages/storybook/src/generators/configuration/__snapshots__/configuration.spec.ts.snap
@@ -98,7 +98,7 @@ exports[`@nx/storybook:configuration for Storybook v7 dependencies should add an
     "@storybook/jest": "^0.2.3",
     "@storybook/test-runner": "^0.13.0",
     "@storybook/testing-library": "^0.2.2",
-    "@swc-node/register": "~1.6.7",
+    "@swc-node/register": "~1.8.0",
     "@swc/core": "~1.3.85",
     "@swc/helpers": "~0.5.2",
     "@types/jest": "^29.4.0",

diff --git a/packages/vue/src/generators/library/__snapshots__/library.spec.ts.snap b/packages/vue/src/generators/library/__snapshots__/library.spec.ts.snap
@@ -179,7 +179,7 @@ exports[`lib should add vue, vite and vitest to package.json 1`] = `
     "@nx/vite": "0.0.1",
     "@nx/vue": "0.0.1",
     "@nx/web": "0.0.1",
-    "@swc-node/register": "~1.6.7",
+    "@swc-node/register": "~1.8.0",
     "@swc/core": "~1.3.85",
     "@swc/helpers": "~0.5.2",
     "@typescript-eslint/eslint-plugin": "^6.13.2",