fix(js): adjust how to pass information down to swc cli (#8298)

docs/angular/api-js/executors/swc.md

@@ -43,6 +43,12 @@ Type: `boolean`
 
 Whether to skip TypeScript type checking.
 
+### swcExclude
+
+Type: `array`
+
+List of SWC Glob/Regex to be excluded from compilation (https://swc.rs/docs/configuration/compilation#exclude)
+
 ### watch
 
 Default: `false`

docs/node/api-js/executors/swc.md

@@ -43,6 +43,12 @@ Type: `boolean`
 
 Whether to skip TypeScript type checking.
 
+### swcExclude
+
+Type: `array`
+
+List of SWC Glob/Regex to be excluded from compilation (https://swc.rs/docs/configuration/compilation#exclude)
+
 ### watch
 
 Default: `false`

docs/react/api-js/executors/swc.md

@@ -43,6 +43,12 @@ Type: `boolean`
 
 Whether to skip TypeScript type checking.
 
+### swcExclude
+
+Type: `array`
+
+List of SWC Glob/Regex to be excluded from compilation (https://swc.rs/docs/configuration/compilation#exclude)
+
 ### watch
 
 Default: `false`

e2e/js/src/js.spec.ts

@@ -158,6 +158,54 @@ describe('js e2e', () => {
   // expect(runCommand(`serve ${app} --watch=false`)).toContain(`Running ${lib}`)
   // }, 120000);
 
+  it('should create/build/test js:swc lib', async () => {
+    const lib = uniq('lib');
+    runCLI(`generate @nrwl/js:lib ${lib} --buildable --compiler=swc`);
+
+    const libPackageJson = readJson(`libs/${lib}/package.json`);
+    expect(libPackageJson.scripts).toBeUndefined();
+    expect((await runCLIAsync(`test ${lib}`)).combinedOutput).toContain(
+      'Ran all test suites'
+    );
+    expect((await runCLIAsync(`test ${lib}`)).combinedOutput).toContain(
+      'match the cache'
+    );
+
+    expect(runCLI(`build ${lib}`)).toContain(
+      'Successfully compiled: 2 files with swc'
+    );
+    checkFilesExist(
+      `dist/libs/${lib}/package.json`,
+      `dist/libs/${lib}/src/index.js`,
+      `dist/libs/${lib}/src/lib/${lib}.js`
+    );
+  });
+
+  it('should create/build/test js:swc lib with nested directories', async () => {
+    const lib = uniq('lib');
+    runCLI(
+      `generate @nrwl/js:lib ${lib} --directory=dir --buildable --compiler=swc`
+    );
+
+    const libPackageJson = readJson(`libs/dir/${lib}/package.json`);
+    expect(libPackageJson.scripts).toBeUndefined();
+    expect((await runCLIAsync(`test dir-${lib}`)).combinedOutput).toContain(
+      'Ran all test suites'
+    );
+    expect((await runCLIAsync(`test dir-${lib}`)).combinedOutput).toContain(
+      'match the cache'
+    );
+
+    expect(runCLI(`build dir-${lib}`)).toContain(
+      'Successfully compiled: 2 files with swc'
+    );
+    checkFilesExist(
+      `dist/libs/dir/${lib}/package.json`,
+      `dist/libs/dir/${lib}/src/index.js`,
+      `dist/libs/dir/${lib}/src/lib/dir-${lib}.js`
+    );
+  });
+
   describe('convert js:tsc to js:swc', () => {
     it('should convert apps', async () => {
       const app = uniq('app');

packages/js/src/executors/swc/schema.json

@@ -34,6 +34,11 @@
       "type": "boolean",
       "description": "Whether to skip TypeScript type checking.",
       "default": false
+    },
+    "swcExclude": {
+      "type": "array",
+      "description": "List of SWC Glob/Regex to be excluded from compilation (https://swc.rs/docs/configuration/compilation#exclude)",
+      "default": ["./src/**/.*.spec.ts$", "./**/.*.js$"]
     }
   },
   "required": ["main", "outputPath", "tsConfig"],

packages/js/src/executors/swc/swc.impl.ts

@@ -4,7 +4,7 @@ import {
   copyAssetFiles,
   FileInputOutput,
 } from '@nrwl/workspace/src/utilities/assets';
-import { join, resolve } from 'path';
+import { join, relative, resolve } from 'path';
 import { eachValueFrom } from 'rxjs-for-await';
 import { map } from 'rxjs/operators';
 import { checkDependencies } from '../../utils/check-dependencies';
@@ -13,6 +13,7 @@ import {
   NormalizedSwcExecutorOptions,
   SwcExecutorOptions,
 } from '../../utils/schema';
+import { addTempSwcrc } from '../../utils/swc/add-temp-swcrc';
 import { compileSwc } from '../../utils/swc/compile-swc';
 import { updatePackageJson } from '../../utils/update-package-json';
 
@@ -38,6 +39,12 @@ export function normalizeOptions(
     outputPath
   );
 
+  const swcCliOptions = {
+    projectDir: projectRoot.split('/').pop(),
+    // TODO: assume consumers put their code in `src`
+    destPath: `${relative(projectRoot, options.outputPath)}/src`,
+  };
+
   return {
     ...options,
     swcrcPath: join(projectRoot, '.swcrc'),
@@ -51,6 +58,7 @@ export function normalizeOptions(
     projectRoot,
     outputPath,
     tsConfig: join(contextRoot, options.tsConfig),
+    swcCliOptions,
   } as NormalizedSwcExecutorOptions;
 }
 
@@ -65,6 +73,7 @@ export async function* swcExecutor(
     sourceRoot,
     root
   );
+  normalizedOptions.swcrcPath = addTempSwcrc(normalizedOptions);
   const { tmpTsConfig, projectRoot } = checkDependencies(
     context,
     options.tsConfig

packages/js/src/utils/schema.d.ts

@@ -48,12 +48,20 @@ export interface NormalizedExecutorOptions extends ExecutorOptions {
 
 export interface SwcExecutorOptions extends ExecutorOptions {
   skipTypeCheck?: boolean;
+  swcExclude?: string[];
+}
+
+export interface SwcCliOptions {
+  projectDir: string;
+  destPath: string;
 }
 
 export interface NormalizedSwcExecutorOptions
   extends NormalizedExecutorOptions {
+  swcExclude: string[];
   skipTypeCheck: boolean;
   swcrcPath: string;
+  swcCliOptions: SwcCliOptions;
 }
 
 export interface ExecutorEvent {

packages/js/src/utils/swc/add-swc-config.ts

@@ -1,7 +1,5 @@
 // TODO(chau): change back to 2015 when https://github.com/swc-project/swc/issues/1108 is solved
 // target: 'es2015'
-// TODO(chau): "exclude" is required here to exclude spec files as --ignore cli option is not working atm
-// Open issue: https://github.com/swc-project/cli/issues/20
 import { Tree } from '@nrwl/devkit';
 import { join } from 'path';
 
@@ -25,8 +23,7 @@ const swcOptionsString = () => `{
     "type": "commonjs",
     "strict": true,
     "noInterop": true
-  },
-  "exclude": ["./src/**/.*.spec.ts$", "./**/.*.js$"]
+  }
 }`;
 
 export function addSwcConfig(tree: Tree, projectDir: string) {

packages/js/src/utils/swc/add-temp-swcrc.ts

@@ -0,0 +1,35 @@
+import { readJsonFile, writeJsonFile } from '@nrwl/devkit';
+import { unlinkSync } from 'fs';
+import { join } from 'path';
+import { NormalizedSwcExecutorOptions } from '../schema';
+
+// TODO(chau): "exclude" is required here to exclude spec files as --ignore cli option is not working atm
+// Open issue: https://github.com/swc-project/cli/issues/20
+export function addTempSwcrc(options: NormalizedSwcExecutorOptions) {
+  const tmpPath = join(
+    options.root,
+    'tmp',
+    options.projectRoot,
+    '.swcrc.generated'
+  );
+  const swcrcJson = readJsonFile(join(options.projectRoot, '.swcrc'));
+
+  process.on('exit', cleanUpSwcrc(tmpPath));
+
+  writeJsonFile(tmpPath, {
+    ...swcrcJson,
+    exclude: options.swcExclude,
+  });
+
+  return tmpPath;
+}
+
+function cleanUpSwcrc(tmpPath: string) {
+  return () => {
+    try {
+      if (tmpPath) {
+        unlinkSync(tmpPath);
+      }
+    } catch (e) {}
+  };
+}

packages/js/src/utils/swc/compile-swc.ts

@@ -1,8 +1,7 @@
 import { ExecutorContext, logger } from '@nrwl/devkit';
 import { exec, execSync } from 'child_process';
 import { EMPTY, Observable, zip } from 'rxjs';
-import { concatMap, map, tap } from 'rxjs/operators';
-import { normalizeTsCompilationOptions } from '../normalize-ts-compilation-options';
+import { concatMap, map } from 'rxjs/operators';
 import { NormalizedSwcExecutorOptions } from '../schema';
 import { printDiagnostics } from '../typescript/print-diagnostics';
 import {
@@ -16,23 +15,9 @@ export function compileSwc(
   normalizedOptions: NormalizedSwcExecutorOptions,
   postCompilationCallback: () => Promise<void>
 ) {
-  const tsOptions = {
-    outputPath: normalizedOptions.outputPath,
-    projectName: context.projectName,
-    projectRoot: normalizedOptions.projectRoot,
-    tsConfig: normalizedOptions.tsConfig,
-    watch: normalizedOptions.watch,
-  };
-  const outDir = tsOptions.outputPath.replace(`/${tsOptions.projectRoot}`, '');
-
-  const normalizedTsOptions = normalizeTsCompilationOptions(tsOptions);
-  logger.log(`Compiling with SWC for ${normalizedTsOptions.projectName}...`);
-  const srcPath = normalizedTsOptions.projectRoot;
-  const destPath = normalizedTsOptions.outputPath.replace(
-    `/${normalizedTsOptions.projectName}`,
-    ''
-  );
-  let swcCmd = `npx swc ${srcPath} -d ${destPath} --source-maps --config-file=${normalizedOptions.swcrcPath}`;
+  logger.log(`Compiling with SWC for ${context.projectName}...`);
+  const srcPath = `../${normalizedOptions.swcCliOptions.projectDir}`;
+  let swcCmd = `npx swc ${srcPath} -d ${normalizedOptions.swcCliOptions.destPath} --source-maps --no-swcrc --config-file=${normalizedOptions.swcrcPath}`;
 
   const postCompilationOperator = () =>
     concatMap(({ success }) => {
@@ -45,17 +30,23 @@ export function compileSwc(
   const compile$ = new Observable<{ success: boolean }>((subscriber) => {
     if (normalizedOptions.watch) {
       swcCmd += ' --watch';
-      const watchProcess = createSwcWatchProcess(swcCmd, (success) => {
-        subscriber.next({ success });
-      });
+      const watchProcess = createSwcWatchProcess(
+        swcCmd,
+        normalizedOptions.projectRoot,
+        (success) => {
+          subscriber.next({ success });
+        }
+      );
 
       return () => {
         watchProcess.close();
         subscriber.complete();
       };
     }
 
-    const swcCmdLog = execSync(swcCmd).toString();
+    const swcCmdLog = execSync(swcCmd, {
+      cwd: normalizedOptions.projectRoot,
+    }).toString();
     logger.log(swcCmdLog.replace(/\n/, ''));
     subscriber.next({ success: swcCmdLog.includes('Successfully compiled') });
 
@@ -68,6 +59,14 @@ export function compileSwc(
     return compile$.pipe(postCompilationOperator());
   }
 
+  const tsOptions = {
+    outputPath: normalizedOptions.outputPath,
+    projectName: context.projectName,
+    projectRoot: normalizedOptions.projectRoot,
+    tsConfig: normalizedOptions.tsConfig,
+    watch: normalizedOptions.watch,
+  };
+  const outDir = tsOptions.outputPath.replace(`/${tsOptions.projectRoot}`, '');
   const typeCheck$ = new Observable<{ success: boolean }>((subscriber) => {
     const typeCheckOptions: TypeCheckOptions = {
       mode: 'emitDeclarationOnly',
@@ -136,9 +135,10 @@ export function compileSwc(
 
 function createSwcWatchProcess(
   swcCmd: string,
+  cwd: string,
   callback: (success: boolean) => void
 ) {
-  const watchProcess = exec(swcCmd);
+  const watchProcess = exec(swcCmd, { cwd });
 
   watchProcess.stdout.on('data', (data) => {
     process.stdout.write(data);