@nrwl/js 14.8.8 → 14.9.0-beta.1

package/src/executors/swc/swc.impl.js

@@ -2,14 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.swcExecutor = exports.normalizeOptions = void 0;
 const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
 const assets_1 = require("@nrwl/workspace/src/utilities/assets");
+const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
+const assets_2 = require("../../utils/assets");
 const check_dependencies_1 = require("../../utils/check-dependencies");
 const compiler_helper_dependency_1 = require("../../utils/compiler-helper-dependency");
+const inline_1 = require("../../utils/inline");
+const package_json_1 = require("../../utils/package-json");
 const compile_swc_1 = require("../../utils/swc/compile-swc");
 const get_swcrc_path_1 = require("../../utils/swc/get-swcrc-path");
-const assets_2 = require("../../utils/assets");
-const package_json_1 = require("../../utils/package-json");
+const inline_2 = require("../../utils/swc/inline");
 function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
     const outputPath = (0, path_1.join)(contextRoot, options.outputPath);
     if (options.skipTypeCheck == null) {
@@ -18,6 +22,18 @@ function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
     if (options.watch == null) {
         options.watch = false;
     }
+    // TODO: put back when inlining story is more stable
+    // if (options.external == null) {
+    //   options.external = 'all';
+    // } else if (Array.isArray(options.external) && options.external.length === 0) {
+    //   options.external = 'none';
+    // }
+    if (Array.isArray(options.external) && options.external.length > 0) {
+        const firstItem = options.external[0];
+        if (firstItem === 'all' || firstItem === 'none') {
+            options.external = firstItem;
+        }
+    }
     const files = (0, assets_1.assetGlobsToFiles)(options.assets, contextRoot, outputPath);
     const projectRootParts = projectRoot.split('/');
     // We pop the last part of the `projectRoot` to pass
@@ -26,7 +42,19 @@ function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
     // default to current directory if projectRootParts is [].
     // Eg: when a project is at the root level, outside of layout dir
     const swcCwd = projectRootParts.join('/') || '.';
-    const swcrcPath = (0, get_swcrc_path_1.getSwcrcPath)(options, contextRoot, projectRoot);
+    let swcrcPath = (0, get_swcrc_path_1.getSwcrcPath)(options, contextRoot, projectRoot);
+    try {
+        const swcrcContent = (0, devkit_1.readJsonFile)(swcrcPath);
+        // if we have path mappings setup but baseUrl isn't specified, then we're proceeding with the following logic
+        if (swcrcContent.jsc &&
+            swcrcContent.jsc.paths &&
+            !swcrcContent.jsc.baseUrl) {
+            swcrcContent.jsc.baseUrl = `./${projectDir}`;
+            swcrcPath = (0, get_swcrc_path_1.getSwcrcPath)(options, contextRoot, projectRoot, true);
+            (0, devkit_1.writeJsonFile)(swcrcPath, swcrcContent);
+        }
+    }
+    catch (e) { }
     const swcCliOptions = {
         srcPath: projectDir,
         destPath: (0, path_1.relative)((0, path_1.join)(contextRoot, swcCwd), outputPath),
@@ -34,13 +62,12 @@ function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
         swcrcPath,
     };
     return Object.assign(Object.assign({}, options), { mainOutputPath: (0, path_1.resolve)(outputPath, options.main.replace(`${projectRoot}/`, '').replace('.ts', '.js')), files, root: contextRoot, sourceRoot,
-        projectRoot,
-        outputPath, tsConfig: (0, path_1.join)(contextRoot, options.tsConfig), swcCliOptions });
+        projectRoot, originalProjectRoot: projectRoot, outputPath, tsConfig: (0, path_1.join)(contextRoot, options.tsConfig), swcCliOptions });
 }
 exports.normalizeOptions = normalizeOptions;
 function swcExecutor(_options, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* swcExecutor_1() {
-        const { sourceRoot, root } = context.workspace.projects[context.projectName];
+        const { sourceRoot, root } = context.projectsConfigurations.projects[context.projectName];
         const options = normalizeOptions(_options, context.root, sourceRoot, root);
         const { tmpTsConfig, dependencies } = (0, check_dependencies_1.checkDependencies)(context, options.tsConfig);
         if (tmpTsConfig) {
@@ -50,6 +77,21 @@ function swcExecutor(_options, context) {
         if (swcHelperDependency) {
             dependencies.push(swcHelperDependency);
         }
+        const inlineProjectGraph = (0, inline_1.handleInliningBuild)(context, options, options.tsConfig);
+        if (!(0, inline_1.isInlineGraphEmpty)(inlineProjectGraph)) {
+            options.projectRoot = '.'; // set to root of workspace to include other libs for type check
+            // remap paths for SWC compilation
+            options.swcCliOptions.srcPath = options.swcCliOptions.swcCwd;
+            options.swcCliOptions.swcCwd = '.';
+            options.swcCliOptions.destPath = options.swcCliOptions.destPath
+                .split('../')
+                .at(-1)
+                .concat('/', options.swcCliOptions.srcPath);
+            // tmp swcrc with dependencies to exclude
+            // - buildable libraries
+            // - other libraries that are not dependent on the current project
+            options.swcCliOptions.swcrcPath = (0, inline_2.generateTmpSwcrc)(inlineProjectGraph, options.swcCliOptions.swcrcPath);
+        }
         if (options.watch) {
             let disposeFn;
             process.on('SIGINT', () => disposeFn());
@@ -57,6 +99,7 @@ function swcExecutor(_options, context) {
             return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, compile_swc_1.compileSwcWatch)(context, options, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 const assetResult = yield (0, assets_2.copyAssets)(options, context);
                 const packageJsonResult = yield (0, package_json_1.copyPackageJson)(Object.assign(Object.assign({}, options), { skipTypings: !options.skipTypeCheck }), context);
+                removeTmpSwcrc(options.swcCliOptions.swcrcPath);
                 disposeFn = () => {
                     assetResult === null || assetResult === void 0 ? void 0 : assetResult.stop();
                     packageJsonResult === null || packageJsonResult === void 0 ? void 0 : packageJsonResult.stop();
@@ -67,10 +110,17 @@ function swcExecutor(_options, context) {
             return yield tslib_1.__await(yield yield tslib_1.__await((0, compile_swc_1.compileSwc)(context, options, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 yield (0, assets_2.copyAssets)(options, context);
                 yield (0, package_json_1.copyPackageJson)(Object.assign(Object.assign({}, options), { generateExportsField: true, skipTypings: !options.skipTypeCheck, extraDependencies: swcHelperDependency ? [swcHelperDependency] : [] }), context);
+                removeTmpSwcrc(options.swcCliOptions.swcrcPath);
+                (0, inline_1.postProcessInlinedDependencies)(options.outputPath, options.originalProjectRoot, inlineProjectGraph);
             }))));
         }
     });
 }
 exports.swcExecutor = swcExecutor;
+function removeTmpSwcrc(swcrcPath) {
+    if (swcrcPath.includes('tmp/') && swcrcPath.includes('.generated.swcrc')) {
+        (0, fs_extra_1.removeSync)((0, path_1.dirname)(swcrcPath));
+    }
+}
 exports.default = swcExecutor;
 //# sourceMappingURL=swc.impl.js.map

package/src/executors/swc/swc.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"swc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/swc/swc.impl.ts"],"names":[],"mappings":";;;;AACA,iEAG8C;AAC9C,+BAA+C;AAE/C,uEAAmE;AACnE,uFAGgD;AAKhD,6DAA0E;AAC1E,mEAA8D;AAC9D,+CAAgD;AAChD,2DAA2D;AAE3D,SAAgB,gBAAgB,CAC9B,OAA2B,EAC3B,WAAmB,EACnB,UAAmB,EACnB,WAAoB;IAEpB,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAEzD,IAAI,OAAO,CAAC,aAAa,IAAI,IAAI,EAAE;QACjC,OAAO,CAAC,aAAa,GAAG,KAAK,CAAC;KAC/B;IAED,IAAI,OAAO,CAAC,KAAK,IAAI,IAAI,EAAE;QACzB,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;KACvB;IAED,MAAM,KAAK,GAAsB,IAAA,0BAAiB,EAChD,OAAO,CAAC,MAAM,EACd,WAAW,EACX,UAAU,CACX,CAAC;IAEF,MAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAChD,oDAAoD;IACpD,yEAAyE;IACzE,MAAM,UAAU,GAAG,gBAAgB,CAAC,GAAG,EAAE,CAAC;IAC1C,0DAA0D;IAC1D,iEAAiE;IACjE,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC;IACjD,MAAM,SAAS,GAAG,IAAA,6BAAY,EAAC,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IAElE,MAAM,aAAa,GAAG;QACpB,OAAO,EAAE,UAAU;QACnB,QAAQ,EAAE,IAAA,eAAQ,EAAC,IAAA,WAAI,EAAC,WAAW,EAAE,MAAM,CAAC,EAAE,UAAU,CAAC;QACzD,MAAM;QACN,SAAS;KACV,CAAC;IAEF,OAAO,gCACF,OAAO,KACV,cAAc,EAAE,IAAA,cAAO,EACrB,UAAU,EACV,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,WAAW,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAClE,EACD,KAAK,EACL,IAAI,EAAE,WAAW,EACjB,UAAU;QACV,WAAW;QACX,UAAU,EACV,QAAQ,EAAE,IAAA,WAAI,EAAC,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,EAC7C,aAAa,GACkB,CAAC;AACpC,CAAC;AApDD,4CAoDC;AAED,SAAuB,WAAW,CAChC,QAA4B,EAC5B,OAAwB;;QAExB,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC7E,MAAM,OAAO,GAAG,gBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAC3E,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,IAAA,sCAAiB,EACrD,OAAO,EACP,OAAO,CAAC,QAAQ,CACjB,CAAC;QAEF,IAAI,WAAW,EAAE;YACf,OAAO,CAAC,QAAQ,GAAG,WAAW,CAAC;SAChC;QAED,MAAM,mBAAmB,GAAG,IAAA,gDAAmB,EAC7C,6CAAgB,CAAC,GAAG,EACpB,OAAO,CAAC,aAAa,CAAC,SAAS,EAC/B,YAAY,EACZ,OAAO,CAAC,YAAY,CACrB,CAAC;QAEF,IAAI,mBAAmB,EAAE;YACvB,YAAY,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;SACxC;QAED,IAAI,OAAO,CAAC,KAAK,EAAE;YACjB,IAAI,SAAqB,CAAC;YAC1B,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC;YACxC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC;YAEzC,6BAAO,sBAAA,KAAK,CAAC,CAAC,yBAAA,sBAAA,IAAA,6BAAe,EAAC,OAAO,EAAE,OAAO,EAAE,GAAS,EAAE;gBACzD,MAAM,WAAW,GAAG,MAAM,IAAA,mBAAU,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACvD,MAAM,iBAAiB,GAAG,MAAM,IAAA,8BAAe,kCAExC,OAAO,KACV,WAAW,EAAE,CAAC,OAAO,CAAC,aAAa,KAErC,OAAO,CACR,CAAC;gBACF,SAAS,GAAG,GAAG,EAAE;oBACf,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,EAAE,CAAC;oBACpB,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,IAAI,EAAE,CAAC;gBAC5B,CAAC,CAAC;YACJ,CAAC,CAAA,CAAC,CAAA,CAAA,CAAA,EAAC;SACJ;aAAM;YACL,6BAAO,4BAAM,IAAA,wBAAU,EAAC,OAAO,EAAE,OAAO,EAAE,GAAS,EAAE;gBACnD,MAAM,IAAA,mBAAU,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACnC,MAAM,IAAA,8BAAe,kCAEd,OAAO,KACV,oBAAoB,EAAE,IAAI,EAC1B,WAAW,EAAE,CAAC,OAAO,CAAC,aAAa,EACnC,iBAAiB,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,EAAE,KAErE,OAAO,CACR,CAAC;YACJ,CAAC,CAAA,CAAC,CAAA,EAAC;SACJ;IACH,CAAC;CAAA;AA3DD,kCA2DC;AAED,kBAAe,WAAW,CAAC"}
+{"version":3,"file":"swc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/swc/swc.impl.ts"],"names":[],"mappings":"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"}

package/src/executors/tsc/schema.json

@@ -1,4 +1,6 @@
 {
+  "version": 2,
+  "outputCapture": "direct-nodejs",
   "title": "Typescript Build Target",
   "description": "Builds using TypeScript.",
   "cli": "nx",
@@ -49,11 +51,12 @@
       "default": [],
       "items": {
         "$ref": "#/definitions/transformerPattern"
-      }
+      },
+      "x-priority": "important"
     },
     "updateBuildableProjectDepsInPackageJson": {
       "type": "boolean",
-      "description": "Whether to update the buildable project dependencies in `package.json`.",
+      "description": "Whether to update the buildable project dependencies in the build output package.json.",
       "default": true
     },
     "buildableProjectDepsInPackageJsonType": {
@@ -61,6 +64,35 @@
       "description": "When `updateBuildableProjectDepsInPackageJson` is `true`, this adds dependencies to either `peerDependencies` or `dependencies`.",
       "enum": ["dependencies", "peerDependencies"],
       "default": "peerDependencies"
+    },
+    "external": {
+      "description": "A list projects to be treated as external. This feature is experimental",
+      "oneOf": [
+        {
+          "type": "string",
+          "enum": ["all", "none"]
+        },
+        {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      ]
+    },
+    "externalBuildTargets": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "description": "List of target names that annotate a build target for a project",
+      "default": ["build"]
+    },
+    "generateLockfile": {
+      "type": "boolean",
+      "description": "Generate a lockfile (e.g. yarn.lock) that matches the workspace lockfile to ensure package versions match.",
+      "default": false,
+      "x-priority": "internal"
     }
   },
   "required": ["main", "outputPath", "tsConfig"],
@@ -119,5 +151,6 @@
         }
       ]
     }
-  }
+  },
+  "examplesFile": "../../../docs/tsc-examples.md"
 }

package/src/executors/tsc/tsc.impl.d.ts

@@ -1,10 +1,7 @@
 import { ExecutorContext } from '@nrwl/devkit';
-import { TypeScriptCompilationOptions } from '@nrwl/workspace/src/utilities/typescript/compilation';
+import type { TypeScriptCompilationOptions } from '@nrwl/workspace/src/utilities/typescript/compilation';
 import { ExecutorOptions, NormalizedExecutorOptions } from '../../utils/schema';
 export declare function normalizeOptions(options: ExecutorOptions, contextRoot: string, sourceRoot: string, projectRoot: string): NormalizedExecutorOptions;
 export declare function createTypeScriptCompilationOptions(normalizedOptions: NormalizedExecutorOptions, context: ExecutorContext): TypeScriptCompilationOptions;
-export declare function tscExecutor(_options: ExecutorOptions, context: ExecutorContext): AsyncGenerator<{
-    success: boolean;
-    outfile: string;
-}, any, undefined>;
+export declare function tscExecutor(_options: ExecutorOptions, context: ExecutorContext): AsyncGenerator<import("../../utils/typescript/compile-typescript-files").TypescriptCompilationResult, any, undefined>;
 export default tscExecutor;

package/src/executors/tsc/tsc.impl.js

@@ -4,12 +4,13 @@ exports.tscExecutor = exports.createTypeScriptCompilationOptions = exports.norma
 const tslib_1 = require("tslib");
 const assets_1 = require("@nrwl/workspace/src/utilities/assets");
 const path_1 = require("path");
+const copy_assets_handler_1 = require("../../utils/assets/copy-assets-handler");
 const check_dependencies_1 = require("../../utils/check-dependencies");
 const compiler_helper_dependency_1 = require("../../utils/compiler-helper-dependency");
-const copy_assets_handler_1 = require("../../utils/assets/copy-assets-handler");
+const inline_1 = require("../../utils/inline");
+const update_package_json_1 = require("../../utils/package-json/update-package-json");
 const compile_typescript_files_1 = require("../../utils/typescript/compile-typescript-files");
 const load_ts_transformers_1 = require("../../utils/typescript/load-ts-transformers");
-const update_package_json_1 = require("../../utils/package-json/update-package-json");
 const watch_for_single_file_changes_1 = require("../../utils/watch-for-single-file-changes");
 function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
     const outputPath = (0, path_1.join)(contextRoot, options.outputPath);
@@ -19,6 +20,18 @@ function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
     if (options.watch == null) {
         options.watch = false;
     }
+    // TODO: put back when inlining story is more stable
+    // if (options.external == null) {
+    //   options.external = 'all';
+    // } else if (Array.isArray(options.external) && options.external.length === 0) {
+    //   options.external = 'none';
+    // }
+    if (Array.isArray(options.external) && options.external.length > 0) {
+        const firstItem = options.external[0];
+        if (firstItem === 'all' || firstItem === 'none') {
+            options.external = firstItem;
+        }
+    }
     const files = (0, assets_1.assetGlobsToFiles)(options.assets, contextRoot, outputPath);
     return Object.assign(Object.assign({}, options), { root: contextRoot, sourceRoot,
         projectRoot,
@@ -47,7 +60,7 @@ function createTypeScriptCompilationOptions(normalizedOptions, context) {
 exports.createTypeScriptCompilationOptions = createTypeScriptCompilationOptions;
 function tscExecutor(_options, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* tscExecutor_1() {
-        const { sourceRoot, root } = context.workspace.projects[context.projectName];
+        const { sourceRoot, root } = context.projectsConfigurations.projects[context.projectName];
         const options = normalizeOptions(_options, context.root, sourceRoot, root);
         const { projectRoot, tmpTsConfig, target, dependencies } = (0, check_dependencies_1.checkDependencies)(context, _options.tsConfig);
         if (tmpTsConfig) {
@@ -63,20 +76,29 @@ function tscExecutor(_options, context) {
             outputDir: _options.outputPath,
             assets: _options.assets,
         });
+        const tsCompilationOptions = createTypeScriptCompilationOptions(options, context);
+        const inlineProjectGraph = (0, inline_1.handleInliningBuild)(context, options, tsCompilationOptions.tsConfig);
+        if (!(0, inline_1.isInlineGraphEmpty)(inlineProjectGraph)) {
+            tsCompilationOptions.rootDir = '.';
+        }
+        const typescriptCompilation = (0, compile_typescript_files_1.compileTypeScriptFiles)(options, tsCompilationOptions, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            yield assetHandler.processAllAssetsOnce();
+            (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies);
+            (0, inline_1.postProcessInlinedDependencies)(tsCompilationOptions.outputPath, tsCompilationOptions.projectRoot, inlineProjectGraph);
+        }));
         if (options.watch) {
             const disposeWatchAssetChanges = yield tslib_1.__await(assetHandler.watchAndProcessOnAssetChange());
-            const disposePackageJsonChanges = yield tslib_1.__await((0, watch_for_single_file_changes_1.watchForSingleFileChanges)((0, path_1.join)(context.root, projectRoot), 'package.json', () => (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies)));
-            const handleTermination = () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                yield disposeWatchAssetChanges();
-                yield disposePackageJsonChanges();
+            const disposePackageJsonChanges = yield tslib_1.__await((0, watch_for_single_file_changes_1.watchForSingleFileChanges)(context.projectName, options.projectRoot, 'package.json', () => (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies)));
+            const handleTermination = (exitCode) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                yield typescriptCompilation.close();
+                disposeWatchAssetChanges();
+                disposePackageJsonChanges();
+                process.exit(exitCode);
             });
-            process.on('SIGINT', () => handleTermination());
-            process.on('SIGTERM', () => handleTermination());
+            process.on('SIGINT', () => handleTermination(128 + 2));
+            process.on('SIGTERM', () => handleTermination(128 + 15));
         }
-        return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, compile_typescript_files_1.compileTypeScriptFiles)(options, createTypeScriptCompilationOptions(options, context), () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            yield assetHandler.processAllAssetsOnce();
-            (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies);
-        }))))));
+        return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(typescriptCompilation.iterator))));
     });
 }
 exports.tscExecutor = tscExecutor;

package/src/executors/tsc/tsc.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"tsc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/tsc/tsc.impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tsc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/tsc/tsc.impl.ts"],"names":[],"mappings":"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"}

package/src/generators/convert-to-swc/convert-to-swc.js

@@ -33,7 +33,7 @@ function updateProjectBuildTargets(tree, projectConfiguration, projectName, proj
     (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
 }
 function checkSwcDependencies(tree, projectConfiguration) {
-    const isSwcrcPresent = tree.exists((0, path_1.join)(projectConfiguration.root, '.lib.swcrc'));
+    const isSwcrcPresent = tree.exists((0, path_1.join)(projectConfiguration.root, '.swcrc'));
     const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
     const projectPackageJsonPath = (0, path_1.join)(projectConfiguration.root, 'package.json');
     const projectPackageJson = (0, devkit_1.readJson)(tree, projectPackageJsonPath);
@@ -49,9 +49,7 @@ function checkSwcDependencies(tree, projectConfiguration) {
         (0, add_swc_dependencies_1.addSwcDependencies)(tree);
     }
     if (!hasSwcHelpers) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {
-            '@swc/helpers': versions_1.swcHelpersVersion,
-        }, {}, projectPackageJsonPath);
+        (0, devkit_1.addDependenciesToPackageJson)(tree, { '@swc/helpers': versions_1.swcHelpersVersion }, {}, projectPackageJsonPath);
     }
     return () => {
         if (!hasSwcDependency) {

package/src/generators/convert-to-swc/convert-to-swc.js.map

@@ -1 +1 @@
-{"version":3,"file":"convert-to-swc.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/convert-to-swc/convert-to-swc.ts"],"names":[],"mappings":";;;;AAAA,yCASsB;AACtB,+BAA4B;AAC5B,mEAA8D;AAC9D,+EAA0E;AAC1E,mDAAyD;AAGzD,SAAsB,qBAAqB,CACzC,IAAU,EACV,MAAmC;;QAEnC,MAAM,OAAO,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACzC,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAE7E,yBAAyB,CACvB,IAAI,EACJ,oBAAoB,EACpB,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,OAAO,CAChB,CAAC;QACF,OAAO,oBAAoB,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;IAC1D,CAAC;CAAA;AAdD,sDAcC;AAED,SAAS,gBAAgB,CACvB,MAAmC;IAEnC,MAAM,OAAO,qBAAQ,MAAM,CAAE,CAAC;IAE9B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,OAAO,GAAG,CAAC,OAAO,CAAC,CAAC;KAC7B;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,yBAAyB,CAChC,IAAU,EACV,oBAA0C,EAC1C,WAAmB,EACnB,cAAwB;IAExB,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE;QACnC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACjE,IAAI,CAAC,mBAAmB,IAAI,mBAAmB,CAAC,QAAQ,KAAK,cAAc;YACzE,SAAS;QACX,mBAAmB,CAAC,QAAQ,GAAG,cAAc,CAAC;KAC/C;IAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,oBAAoB,CAC3B,IAAU,EACV,oBAA0C;IAE1C,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAChC,IAAA,WAAI,EAAC,oBAAoB,CAAC,IAAI,EAAE,YAAY,CAAC,CAC9C,CAAC;IAEF,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACnD,MAAM,sBAAsB,GAAG,IAAA,WAAI,EACjC,oBAAoB,CAAC,IAAI,EACzB,cAAc,CACf,CAAC;IACF,MAAM,kBAAkB,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;IAElE,MAAM,gBAAgB,GACpB,WAAW,CAAC,YAAY,IAAI,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAEpE,MAAM,aAAa,GACjB,kBAAkB,CAAC,YAAY;QAC/B,kBAAkB,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAElD,IAAI,cAAc,IAAI,gBAAgB,IAAI,aAAa;QAAE,OAAO;IAEhE,IAAI,CAAC,cAAc,EAAE;QACnB,IAAA,6BAAY,EAAC,IAAI,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAAC;KAC/C;IAED,IAAI,CAAC,gBAAgB,EAAE;QACrB,IAAA,yCAAkB,EAAC,IAAI,CAAC,CAAC;KAC1B;IAED,IAAI,CAAC,aAAa,EAAE;QAClB,IAAA,qCAA4B,EAC1B,IAAI,EACJ;YACE,cAAc,EAAE,4BAAiB;SAClC,EACD,EAAE,EACF,sBAAsB,CACvB,CAAC;KACH;IAED,OAAO,GAAG,EAAE;QACV,IAAI,CAAC,gBAAgB,EAAE;YACrB,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;SAC3B;IACH,CAAC,CAAC;AACJ,CAAC;AAED,kBAAe,qBAAqB,CAAC;AACxB,QAAA,qBAAqB,GAAG,IAAA,2BAAkB,EAAC,qBAAqB,CAAC,CAAC"}
+{"version":3,"file":"convert-to-swc.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/convert-to-swc/convert-to-swc.ts"],"names":[],"mappings":";;;;AAAA,yCASsB;AACtB,+BAA4B;AAC5B,mEAA8D;AAC9D,+EAA0E;AAC1E,mDAAyD;AAGzD,SAAsB,qBAAqB,CACzC,IAAU,EACV,MAAmC;;QAEnC,MAAM,OAAO,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACzC,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAE7E,yBAAyB,CACvB,IAAI,EACJ,oBAAoB,EACpB,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,OAAO,CAChB,CAAC;QACF,OAAO,oBAAoB,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;IAC1D,CAAC;CAAA;AAdD,sDAcC;AAED,SAAS,gBAAgB,CACvB,MAAmC;IAEnC,MAAM,OAAO,qBAAQ,MAAM,CAAE,CAAC;IAE9B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,OAAO,GAAG,CAAC,OAAO,CAAC,CAAC;KAC7B;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,yBAAyB,CAChC,IAAU,EACV,oBAA0C,EAC1C,WAAmB,EACnB,cAAwB;IAExB,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE;QACnC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACjE,IAAI,CAAC,mBAAmB,IAAI,mBAAmB,CAAC,QAAQ,KAAK,cAAc;YACzE,SAAS;QACX,mBAAmB,CAAC,QAAQ,GAAG,cAAc,CAAC;KAC/C;IAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,oBAAoB,CAC3B,IAAU,EACV,oBAA0C;IAE1C,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,oBAAoB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IAE9E,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACnD,MAAM,sBAAsB,GAAG,IAAA,WAAI,EACjC,oBAAoB,CAAC,IAAI,EACzB,cAAc,CACf,CAAC;IACF,MAAM,kBAAkB,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;IAElE,MAAM,gBAAgB,GACpB,WAAW,CAAC,YAAY,IAAI,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAEpE,MAAM,aAAa,GACjB,kBAAkB,CAAC,YAAY;QAC/B,kBAAkB,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAElD,IAAI,cAAc,IAAI,gBAAgB,IAAI,aAAa;QAAE,OAAO;IAEhE,IAAI,CAAC,cAAc,EAAE;QACnB,IAAA,6BAAY,EAAC,IAAI,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAAC;KAC/C;IAED,IAAI,CAAC,gBAAgB,EAAE;QACrB,IAAA,yCAAkB,EAAC,IAAI,CAAC,CAAC;KAC1B;IAED,IAAI,CAAC,aAAa,EAAE;QAClB,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,cAAc,EAAE,4BAAiB,EAAE,EACrC,EAAE,EACF,sBAAsB,CACvB,CAAC;KACH;IAED,OAAO,GAAG,EAAE;QACV,IAAI,CAAC,gBAAgB,EAAE;YACrB,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;SAC3B;IACH,CAAC,CAAC;AACJ,CAAC;AAED,kBAAe,qBAAqB,CAAC;AACxB,QAAA,qBAAqB,GAAG,IAAA,2BAAkB,EAAC,qBAAqB,CAAC,CAAC"}

package/src/generators/init/files/__fileName__

@@ -0,0 +1,20 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "rootDir": ".",
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "importHelpers": true,
+    "target": "es2015",
+    "module": "esnext",
+    "lib": ["es2017", "dom"],
+    "skipLibCheck": true,
+    "skipDefaultLibCheck": true,
+    "baseUrl": ".",
+    "paths": {}
+  },
+  "exclude": ["node_modules", "tmp"]
+}

package/src/generators/init/init.d.ts

@@ -1,3 +1,5 @@
-export declare function initGenerator(): Promise<void>;
+import { GeneratorCallback, Tree } from '@nrwl/devkit';
+import { InitSchema } from './schema';
+export declare function initGenerator(tree: Tree, schema: InitSchema): Promise<GeneratorCallback>;
 export default initGenerator;
-export declare const initSchematic: (generatorOptions: any) => (tree: any, context: any) => Promise<any>;
+export declare const initSchematic: (generatorOptions: InitSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/init/init.js

@@ -3,9 +3,66 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initSchematic = exports.initGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-function initGenerator() {
+const ts_config_1 = require("../../utils/typescript/ts-config");
+const versions_1 = require("../../utils/versions");
+let formatTaskAdded = false;
+function initGenerator(tree, schema) {
+    var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        devkit_1.logger.info('This is a placeholder for @nrwl/js:init generator. If you want to create a library, use @nrwl/js:lib instead');
+        // add tsconfig.base.json
+        if (!(0, ts_config_1.getRootTsConfigFileName)(tree)) {
+            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files'), '.', {
+                fileName: (_a = schema.tsConfigName) !== null && _a !== void 0 ? _a : 'tsconfig.base.json',
+            });
+        }
+        const devDependencies = {
+            '@nrwl/js': versions_1.nxVersion,
+            prettier: versions_1.prettierVersion,
+        };
+        if (!schema.js) {
+            devDependencies['typescript'] = versions_1.typescriptVersion;
+        }
+        if (!tree.exists(`.prettierrc`)) {
+            (0, devkit_1.writeJson)(tree, '.prettierrc', {
+                singleQuote: true,
+            });
+        }
+        if (!tree.exists(`.prettierignore`)) {
+            tree.write('.prettierignore', (0, devkit_1.stripIndents) `
+        # Add files here to ignore them from prettier formatting
+        /dist
+        /coverage
+      `);
+        }
+        if (tree.exists('.vscode/extensions.json')) {
+            (0, devkit_1.updateJson)(tree, '.vscode/extensions.json', (json) => {
+                var _a;
+                (_a = json.recommendations) !== null && _a !== void 0 ? _a : (json.recommendations = []);
+                const extension = 'esbenp.prettier-vscode';
+                if (!json.recommendations.includes(extension)) {
+                    json.recommendations.push(extension);
+                }
+                return json;
+            });
+        }
+        const installTask = !schema.skipPackageJson
+            ? (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies)
+            : () => { };
+        return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            yield installTask();
+            // Run Prettier once on all non-ignored files because some files may not be changed in the tree. e.g. nx.json
+            // TODO(jack): Once we create @nrwl/prettier:init we can move this logic there with --formatExistingFiles option.
+            if (!formatTaskAdded) {
+                formatTaskAdded = true;
+                try {
+                    const prettierCli = yield Promise.resolve().then(() => require('prettier/cli'));
+                    yield prettierCli.run(['.', '--write']);
+                }
+                catch (_b) {
+                    // If --skipPackageJson is passed then prettier is not installed.
+                }
+            }
+        });
     });
 }
 exports.initGenerator = initGenerator;

package/src/generators/init/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,yCAA0D;AAE1D,SAAsB,aAAa;;QACjC,eAAM,CAAC,IAAI,CACT,8GAA8G,CAC/G,CAAC;IACJ,CAAC;CAAA;AAJD,sCAIC;AAED,kBAAe,aAAa,CAAC;AAChB,QAAA,aAAa,GAAG,IAAA,2BAAkB,EAAC,aAAa,CAAC,CAAC"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,yCAUsB;AACtB,gEAA2E;AAC3E,mDAI8B;AAG9B,IAAI,eAAe,GAAG,KAAK,CAAC;AAE5B,SAAsB,aAAa,CACjC,IAAU,EACV,MAAkB;;;QAElB,yBAAyB;QACzB,IAAI,CAAC,IAAA,mCAAuB,EAAC,IAAI,CAAC,EAAE;YAClC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,SAAS,CAAC,EAAE,GAAG,EAAE;gBAChE,QAAQ,EAAE,MAAA,MAAM,CAAC,YAAY,mCAAI,oBAAoB;aACtD,CAAC,CAAC;SACJ;QACD,MAAM,eAAe,GAAG;YACtB,UAAU,EAAE,oBAAS;YACrB,QAAQ,EAAE,0BAAe;SAC1B,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;YACd,eAAe,CAAC,YAAY,CAAC,GAAG,4BAAiB,CAAC;SACnD;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;YAC/B,IAAA,kBAAS,EAAC,IAAI,EAAE,aAAa,EAAE;gBAC7B,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;YACnC,IAAI,CAAC,KAAK,CACR,iBAAiB,EACjB,IAAA,qBAAY,EAAA;;;;OAIX,CACF,CAAC;SACH;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,EAAE;YAC1C,IAAA,mBAAU,EAAC,IAAI,EAAE,yBAAyB,EAAE,CAAC,IAAI,EAAE,EAAE;;gBACnD,MAAA,IAAI,CAAC,eAAe,oCAApB,IAAI,CAAC,eAAe,GAAK,EAAE,EAAC;gBAC5B,MAAM,SAAS,GAAG,wBAAwB,CAAC;gBAC3C,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;oBAC7C,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;iBACtC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;SACJ;QAED,MAAM,WAAW,GAAG,CAAC,MAAM,CAAC,eAAe;YACzC,CAAC,CAAC,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,eAAe,CAAC;YACzD,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;QAEb,OAAO,GAAS,EAAE;YAChB,MAAM,WAAW,EAAE,CAAC;YAEpB,6GAA6G;YAC7G,iHAAiH;YACjH,IAAI,CAAC,eAAe,EAAE;gBACpB,eAAe,GAAG,IAAI,CAAC;gBACvB,IAAI;oBACF,MAAM,WAAW,GAAG,2CAAa,cAAc,EAAC,CAAC;oBACjD,MAAM,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC;iBACzC;gBAAC,WAAM;oBACN,iEAAiE;iBAClE;aACF;QACH,CAAC,CAAA,CAAC;;CACH;AAjED,sCAiEC;AAED,kBAAe,aAAa,CAAC;AAEhB,QAAA,aAAa,GAAG,IAAA,2BAAkB,EAAC,aAAa,CAAC,CAAC"}

package/src/generators/init/schema.d.ts

@@ -0,0 +1,6 @@
+export interface InitSchema {
+  js?: boolean;
+  skipFormat?: boolean;
+  skipPackageJson?: boolean;
+  tsConfigName?: string;
+}

package/src/generators/init/schema.json

@@ -3,5 +3,28 @@
   "$id": "NxTypescriptInit",
   "cli": "nx",
   "title": "Init nrwl/js",
-  "description": "Init generator placeholder for nrwl/js."
+  "description": "Init generator placeholder for nrwl/js.",
+  "properties": {
+    "js": {
+      "type": "boolean",
+      "default": false,
+      "description": "Use JavaScript instead of TypeScript"
+    },
+    "skipFormat": {
+      "type": "boolean",
+      "aliases": ["skip-format"],
+      "description": "Skip formatting files.",
+      "x-priority": "internal"
+    },
+    "skipPackageJson": {
+      "type": "boolean",
+      "description": "Skip adding package.json dependencies",
+      "x-priority": "internal"
+    },
+    "tsConfigName": {
+      "type": "string",
+      "description": "Customize the generated tsconfig file name.",
+      "x-priority": "internal"
+    }
+  }
 }

package/src/generators/library/files/jest-config/jest.config.__ext__

@@ -4,8 +4,15 @@
 // Reading the SWC compilation config and remove the "exclude"
 // for the test files to be compiled by SWC
 const { exclude: _, ...swcJestConfig } = JSON.parse(
-  readFileSync(`${__dirname}/.lib.swcrc`, 'utf-8')
+  readFileSync(`${__dirname}/.swcrc`, 'utf-8')
 );
+
+// disable .swcrc look-up by SWC core because we're passing in swcJestConfig ourselves.
+// If we do not disable this, SWC Core will read .swcrc and won't transform our test files due to "exclude"
+if (swcJestConfig.swcrc === undefined) {
+    swcJestConfig.swcrc = false;
+}
+
 <% if(js) {%>module.exports =<% } else { %>export default<% } %> {
   displayName: '<%= project %>',
   preset: '<%= offsetFromRoot %>jest.preset.js',

package/src/generators/library/files/lib/tsconfig.lib.json__tmpl__

@@ -5,6 +5,6 @@
     "declaration": true,
     "types": ["node"]
   },
-  "include": ["**/*.ts"<% if (js) { %>, "**/*.js"<% } %>],
-  "exclude": ["jest.config.ts", "**/*.spec.ts", "**/*.test.ts"<% if (js) { %>, "**/*.spec.js", "**/*.test.js"<% } %>]
+  "include": ["src/**/*.ts"<% if (js) { %>, "src/**/*.js"<% } %>],
+  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"<% if (js) { %>, "src/**/*.spec.js", "src/**/*.test.js"<% } %>]
 }