feat(web): update Next.js, Web, and Node generators to not use Babel …

…by default
nrwl · May 29, 2023 · 5db0408 · 5db0408
1 parent 923e6d8
commit 5db0408
Show file tree

Hide file tree

Showing 28 changed files with 114 additions and 142 deletions.
diff --git a/docs/generated/packages/express/generators/application.json b/docs/generated/packages/express/generators/application.json
@@ -50,10 +50,16 @@
         "type": "string",
         "description": "Frontend project that needs to access this application. This sets up proxy configuration."
       },
+      "swcJest": {
+        "type": "boolean",
+        "description": "Use `@swc/jest` instead `ts-jest` for faster test compilation.",
+        "default": false
+      },
       "babelJest": {
         "type": "boolean",
         "description": "Use `babel` instead `ts-jest`.",
-        "default": false
+        "default": false,
+        "x-deprecated": "Use --swcJest instead for faster compilation"
       },
       "pascalCaseFiles": {
         "type": "boolean",

diff --git a/docs/generated/packages/node/generators/application.json b/docs/generated/packages/node/generators/application.json
@@ -54,11 +54,17 @@
         "description": "Frontend project that needs to access this application. This sets up proxy configuration.",
         "x-priority": "important"
       },
-      "babelJest": {
+      "swcJest": {
         "type": "boolean",
-        "description": "Use `babel` instead of `ts-jest`.",
+        "description": "Use `@swc/jest` instead `ts-jest` for faster test compilation.",
         "default": false
       },
+      "babelJest": {
+        "type": "boolean",
+        "description": "Use `babel` instead `ts-jest`.",
+        "default": false,
+        "x-deprecated": "Use --swcJest instead for faster compilation"
+      },
       "pascalCaseFiles": {
         "type": "boolean",
         "description": "Use pascal case file names.",

diff --git a/docs/generated/packages/react/generators/application.json b/docs/generated/packages/react/generators/application.json
@@ -92,8 +92,8 @@
         "default": false,
         "x-priority": "internal"
       },
-      "skipWorkspaceJson": {
-        "description": "Skip updating `workspace.json` with default options based on values provided to this app (e.g. babel, style).",
+      "skipNxJson": {
+        "description": "Skip updating `nx.json` with default options based on values provided to this app.",
         "type": "boolean",
         "default": false,
         "x-priority": "internal"
@@ -155,7 +155,7 @@
       "compiler": {
         "type": "string",
         "description": "The compiler to use.",
-        "enum": ["babel", "swc"],
+        "enum": ["swc", "babel"],
         "default": "babel"
       },
       "skipPackageJson": {

diff --git a/docs/generated/packages/react/generators/host.json b/docs/generated/packages/react/generators/host.json
@@ -73,7 +73,7 @@
         "default": false,
         "x-priority": "internal"
       },
-      "skipWorkspaceJson": {
+      "skipNxJson": {
         "description": "Skip updating workspace.json with default options based on values provided to this app (e.g. babel, style).",
         "type": "boolean",
         "default": false,

diff --git a/docs/generated/packages/react/generators/library.json b/docs/generated/packages/react/generators/library.json
@@ -169,7 +169,7 @@
       },
       "compiler": {
         "type": "string",
-        "enum": ["babel", "swc"],
+        "enum": ["swc", "babel"],
         "default": "babel",
         "description": "Which compiler to use. Only applies to `bundler: 'rollup'`."
       },

diff --git a/docs/generated/packages/react/generators/remote.json b/docs/generated/packages/react/generators/remote.json
@@ -78,7 +78,7 @@
         "default": false,
         "x-priority": "internal"
       },
-      "skipWorkspaceJson": {
+      "skipNxJson": {
         "description": "Skip updating workspace.json with default options based on values provided to this app (e.g. babel, style).",
         "type": "boolean",
         "default": false,

diff --git a/docs/generated/packages/web/generators/application.json b/docs/generated/packages/web/generators/application.json
@@ -43,8 +43,8 @@
       "compiler": {
         "type": "string",
         "description": "The compiler to use",
-        "enum": ["babel", "swc"],
-        "default": "babel",
+        "enum": ["swc", "babel"],
+        "default": "swc",
         "x-priority": "important"
       },
       "bundler": {

diff --git a/e2e/web/src/web.test.ts b/e2e/web/src/web.test.ts
@@ -138,7 +138,7 @@ describe('Web Components Applications', () => {
     runCLI(`build ${appName} --outputHashing none`);
 
     expect(readFile(`dist/apps/${appName}/main.js`)).toMatch(
-      /Reflect\.metadata/
+      /Foo=__decorate\(\[sealed\],Foo\)/
     );
 
     // Turn off decorator metadata
@@ -151,7 +151,7 @@ describe('Web Components Applications', () => {
     runCLI(`build ${appName} --outputHashing none`);
 
     expect(readFile(`dist/apps/${appName}/main.js`)).not.toMatch(
-      /Reflect\.metadata/
+      /Foo=__decorate\(\[sealed\],Foo\)/
     );
   }, 120000);
 

diff --git a/packages/express/src/generators/application/schema.d.ts b/packages/express/src/generators/application/schema.d.ts
@@ -10,6 +10,8 @@ export interface Schema {
   tags?: string;
   linter: Linter;
   frontendProject?: string;
+  swcJest?: boolean;
+  /** @deprecated use `swcJest` instead */
   babelJest?: boolean;
   js: boolean;
   pascalCaseFiles: boolean;

diff --git a/packages/express/src/generators/application/schema.json b/packages/express/src/generators/application/schema.json
@@ -50,10 +50,16 @@
       "type": "string",
       "description": "Frontend project that needs to access this application. This sets up proxy configuration."
     },
+    "swcJest": {
+      "type": "boolean",
+      "description": "Use `@swc/jest` instead `ts-jest` for faster test compilation.",
+      "default": false
+    },
     "babelJest": {
       "type": "boolean",
       "description": "Use `babel` instead `ts-jest`.",
-      "default": false
+      "default": false,
+      "x-deprecated": "Use --swcJest instead for faster compilation"
     },
     "pascalCaseFiles": {
       "type": "boolean",

diff --git a/packages/next/src/generators/library/library.spec.ts b/packages/next/src/generators/library/library.spec.ts
@@ -13,67 +13,6 @@ describe('next library', () => {
   let mockedInstalledCypressVersion: jest.Mock<
     ReturnType<typeof installedCypressVersion>
   > = installedCypressVersion as never;
-  it('should use "@nx/next/babel" preset in babelrc', async () => {
-    const baseOptions: Schema = {
-      name: '',
-      linter: Linter.EsLint,
-      skipFormat: false,
-      skipTsConfig: false,
-      unitTestRunner: 'jest',
-      style: 'css',
-      component: true,
-    };
-
-    const appTree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
-
-    await libraryGenerator(appTree, {
-      ...baseOptions,
-      name: 'myLib',
-    });
-    await libraryGenerator(appTree, {
-      ...baseOptions,
-      name: 'myLib2',
-      style: '@emotion/styled',
-    });
-    await libraryGenerator(appTree, {
-      ...baseOptions,
-      name: 'myLib-styled-jsx',
-      style: 'styled-jsx',
-    });
-    await libraryGenerator(appTree, {
-      ...baseOptions,
-      name: 'myLib3',
-      directory: 'myDir',
-    });
-
-    expect(readJson(appTree, 'libs/my-lib/.babelrc')).toEqual({
-      presets: ['@nx/next/babel'],
-      plugins: [],
-    });
-    expect(readJson(appTree, 'libs/my-lib2/.babelrc')).toEqual({
-      presets: [
-        [
-          '@nx/next/babel',
-          {
-            'preset-react': {
-              runtime: 'automatic',
-              importSource: '@emotion/react',
-            },
-          },
-        ],
-      ],
-      plugins: ['@emotion/babel-plugin'],
-    });
-    expect(readJson(appTree, 'libs/my-lib-styled-jsx/.babelrc')).toEqual({
-      presets: ['@nx/next/babel'],
-      plugins: [],
-    });
-    expect(readJson(appTree, 'libs/my-dir/my-lib3/.babelrc')).toEqual({
-      presets: ['@nx/next/babel'],
-      plugins: [],
-    });
-  });
-
   it('should use @nx/next images.d.ts file', async () => {
     const baseOptions: Schema = {
       name: '',

diff --git a/packages/next/src/generators/library/library.ts b/packages/next/src/generators/library/library.ts
@@ -71,36 +71,6 @@ export async function libraryGenerator(host: Tree, rawOptions: Schema) {
   );
   addTsConfigPath(host, `${options.importPath}/server`, [serverEntryPath]);
 
-  updateJson(
-    host,
-    joinPathFragments(options.projectRoot, '.babelrc'),
-    (json) => {
-      if (options.style === '@emotion/styled') {
-        json.presets = [
-          [
-            '@nx/next/babel',
-            {
-              'preset-react': {
-                runtime: 'automatic',
-                importSource: '@emotion/react',
-              },
-            },
-          ],
-        ];
-      } else if (options.style === 'styled-jsx') {
-        // next.js doesn't require the `styled-jsx/babel' plugin as it is already
-        // built-into the `next/babel` preset
-        json.presets = ['@nx/next/babel'];
-        json.plugins = (json.plugins || []).filter(
-          (x) => x !== 'styled-jsx/babel'
-        );
-      } else {
-        json.presets = ['@nx/next/babel'];
-      }
-      return json;
-    }
-  );
-
   updateJson(
     host,
     joinPathFragments(options.projectRoot, 'tsconfig.json'),

diff --git a/packages/node/src/generators/application/application.spec.ts b/packages/node/src/generators/application/application.spec.ts
@@ -343,7 +343,33 @@ describe('app', () => {
     });
   });
 
-  describe('--babelJest', () => {
+  describe('--swcJjest', () => {
+    it('should use @swc/jest for jest', async () => {
+      await applicationGenerator(tree, {
+        name: 'myNodeApp',
+        tags: 'one,two',
+        swcJest: true,
+      } as Schema);
+
+      expect(tree.read(`my-node-app/jest.config.ts`, 'utf-8'))
+        .toMatchInlineSnapshot(`
+        "/* eslint-disable */
+        export default {
+          displayName: 'my-node-app',
+          preset: '../jest.preset.js',
+          testEnvironment: 'node',
+          transform: {
+            '^.+\\\\.[tj]s$': '@swc/jest',
+          },
+          moduleFileExtensions: ['ts', 'js', 'html'],
+          coverageDirectory: '../coverage/my-node-app',
+        };
+        "
+      `);
+    });
+  });
+
+  describe('--babelJest (deprecated)', () => {
     it('should use babel for jest', async () => {
       await applicationGenerator(tree, {
         name: 'myNodeApp',
@@ -368,6 +394,7 @@ describe('app', () => {
       `);
     });
   });
+
   describe('--js flag', () => {
     it('should generate js files instead of ts files', async () => {
       await applicationGenerator(tree, {

diff --git a/packages/node/src/generators/application/application.ts b/packages/node/src/generators/application/application.ts
@@ -398,7 +398,7 @@ export async function applicationGenerator(tree: Tree, schema: Schema) {
       skipSerializers: true,
       supportTsx: options.js,
       testEnvironment: 'node',
-      compiler: 'tsc',
+      compiler: options.swcJest ? 'swc' : 'tsc',
       skipFormat: true,
     });
     tasks.push(jestTask);

diff --git a/packages/node/src/generators/application/schema.d.ts b/packages/node/src/generators/application/schema.d.ts
@@ -10,6 +10,8 @@ export interface Schema {
   linter?: Linter;
   tags?: string;
   frontendProject?: string;
+  swcJest?: boolean;
+  /** @deprecated use `swcJest` instead */
   babelJest?: boolean;
   js?: boolean;
   pascalCaseFiles?: boolean;

diff --git a/packages/node/src/generators/application/schema.json b/packages/node/src/generators/application/schema.json
@@ -54,11 +54,17 @@
       "description": "Frontend project that needs to access this application. This sets up proxy configuration.",
       "x-priority": "important"
     },
-    "babelJest": {
+    "swcJest": {
       "type": "boolean",
-      "description": "Use `babel` instead of `ts-jest`.",
+      "description": "Use `@swc/jest` instead `ts-jest` for faster test compilation.",
       "default": false
     },
+    "babelJest": {
+      "type": "boolean",
+      "description": "Use `babel` instead `ts-jest`.",
+      "default": false,
+      "x-deprecated": "Use --swcJest instead for faster compilation"
+    },
     "pascalCaseFiles": {
       "type": "boolean",
       "description": "Use pascal case file names.",

diff --git a/packages/react/src/generators/application/application.spec.ts b/packages/react/src/generators/application/application.spec.ts
@@ -849,12 +849,12 @@ describe('app', () => {
     ).toBeUndefined();
   });
 
-  describe('--skipWorkspaceJson', () => {
+  describe('--skipNxJson', () => {
     it('should update workspace with defaults when --skipprojectsConfigurations=false', async () => {
       await applicationGenerator(appTree, {
         ...schema,
         style: 'styled-components',
-        skipWorkspaceJson: false,
+        skipNxJson: false,
       });
 
       const nxJson = readNxJson(appTree);

diff --git a/packages/react/src/generators/application/lib/set-defaults.ts b/packages/react/src/generators/application/lib/set-defaults.ts
@@ -2,7 +2,7 @@ import { readNxJson, Tree, updateNxJson } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
 
 export function setDefaults(host: Tree, options: NormalizedSchema) {
-  if (options.skipWorkspaceJson) {
+  if (options.skipNxJson) {
     return;
   }
 

diff --git a/packages/react/src/generators/application/schema.d.ts b/packages/react/src/generators/application/schema.d.ts
@@ -14,7 +14,7 @@ export interface Schema {
   pascalCaseFiles?: boolean;
   classComponent?: boolean;
   routing?: boolean;
-  skipWorkspaceJson?: boolean;
+  skipNxJson?: boolean;
   js?: boolean;
   globalCss?: boolean;
   strict?: boolean;

diff --git a/packages/react/src/generators/application/schema.json b/packages/react/src/generators/application/schema.json
@@ -98,8 +98,8 @@
       "default": false,
       "x-priority": "internal"
     },
-    "skipWorkspaceJson": {
-      "description": "Skip updating `workspace.json` with default options based on values provided to this app (e.g. babel, style).",
+    "skipNxJson": {
+      "description": "Skip updating `nx.json` with default options based on values provided to this app.",
       "type": "boolean",
       "default": false,
       "x-priority": "internal"
@@ -161,7 +161,7 @@
     "compiler": {
       "type": "string",
       "description": "The compiler to use.",
-      "enum": ["babel", "swc"],
+      "enum": ["swc", "babel"],
       "default": "babel"
     },
     "skipPackageJson": {

diff --git a/packages/react/src/generators/host/schema.d.ts b/packages/react/src/generators/host/schema.d.ts
@@ -15,7 +15,7 @@ export interface Schema {
   remotes?: string[];
   setParserOptionsProject?: boolean;
   skipFormat?: boolean;
-  skipWorkspaceJson?: boolean;
+  skipNxJson?: boolean;
   ssr?: boolean;
   strict?: boolean;
   style: SupportedStyles;

diff --git a/packages/react/src/generators/host/schema.json b/packages/react/src/generators/host/schema.json
@@ -79,7 +79,7 @@
       "default": false,
       "x-priority": "internal"
     },
-    "skipWorkspaceJson": {
+    "skipNxJson": {
       "description": "Skip updating workspace.json with default options based on values provided to this app (e.g. babel, style).",
       "type": "boolean",
       "default": false,