@nrwl/js 13.8.3 → 13.8.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (82) hide show
  1. package/executors.json +0 -10
  2. package/generators.json +0 -14
  3. package/migrations.json +14 -1
  4. package/package.json +5 -5
  5. package/src/executors/swc/schema.json +18 -1
  6. package/src/executors/swc/swc.impl.js +16 -12
  7. package/src/executors/swc/swc.impl.js.map +1 -1
  8. package/src/executors/tsc/schema.json +11 -0
  9. package/src/executors/tsc/tsc.impl.js +3 -3
  10. package/src/executors/tsc/tsc.impl.js.map +1 -1
  11. package/src/generators/convert-to-swc/convert-to-swc.js +1 -1
  12. package/src/generators/convert-to-swc/convert-to-swc.js.map +1 -1
  13. package/src/generators/library/files/jest-config/jest.config.js__tmpl__ +17 -0
  14. package/src/generators/library/files/{README.md → lib/README.md} +0 -0
  15. package/src/generators/{application/files → library/files/lib}/package.json__tmpl__ +0 -0
  16. package/src/generators/library/files/{src → lib/src}/index.ts__tmpl__ +0 -0
  17. package/src/generators/{application/files/src/app → library/files/lib/src/lib}/__fileName__.spec.ts__tmpl__ +0 -0
  18. package/src/generators/{application/files/src/app → library/files/lib/src/lib}/__fileName__.ts__tmpl__ +0 -0
  19. package/src/generators/library/files/{tsconfig.json__tmpl__ → lib/tsconfig.json__tmpl__} +0 -0
  20. package/src/generators/library/files/{tsconfig.lib.json__tmpl__ → lib/tsconfig.lib.json__tmpl__} +0 -0
  21. package/src/generators/library/library.d.ts +14 -4
  22. package/src/generators/library/library.js +210 -3
  23. package/src/generators/library/library.js.map +1 -1
  24. package/src/generators/library/schema.json +5 -0
  25. package/src/index.d.ts +0 -1
  26. package/src/index.js +1 -3
  27. package/src/index.js.map +1 -1
  28. package/src/migrations/update-13-8-5/update-node-executor.d.ts +2 -0
  29. package/src/migrations/update-13-8-5/update-node-executor.js +28 -0
  30. package/src/migrations/update-13-8-5/update-node-executor.js.map +1 -0
  31. package/src/migrations/update-13-8-5/update-swcrc.d.ts +2 -0
  32. package/src/migrations/update-13-8-5/update-swcrc.js +35 -0
  33. package/src/migrations/update-13-8-5/update-swcrc.js.map +1 -0
  34. package/src/utils/check-dependencies.d.ts +4 -1
  35. package/src/utils/check-dependencies.js +4 -0
  36. package/src/utils/check-dependencies.js.map +1 -1
  37. package/src/utils/schema.d.ts +10 -8
  38. package/src/utils/swc/add-swc-config.d.ts +1 -0
  39. package/src/utils/swc/add-swc-config.js +13 -5
  40. package/src/utils/swc/add-swc-config.js.map +1 -1
  41. package/src/utils/swc/compile-swc.js +5 -8
  42. package/src/utils/swc/compile-swc.js.map +1 -1
  43. package/src/utils/typescript/compile-typescript-files.js +2 -2
  44. package/src/utils/typescript/compile-typescript-files.js.map +1 -1
  45. package/src/utils/typescript/{load-ts-plugins.d.ts → load-ts-transformers.d.ts} +1 -1
  46. package/src/utils/typescript/{load-ts-plugins.js → load-ts-transformers.js} +4 -4
  47. package/src/utils/typescript/load-ts-transformers.js.map +1 -0
  48. package/src/utils/update-package-json.d.ts +4 -1
  49. package/src/utils/update-package-json.js +10 -9
  50. package/src/utils/update-package-json.js.map +1 -1
  51. package/src/utils/versions.d.ts +3 -3
  52. package/src/utils/versions.js +4 -4
  53. package/src/utils/versions.js.map +1 -1
  54. package/src/executors/node/compat.d.ts +0 -2
  55. package/src/executors/node/compat.js +0 -6
  56. package/src/executors/node/compat.js.map +0 -1
  57. package/src/executors/node/node-with-require-overrides.d.ts +0 -5
  58. package/src/executors/node/node-with-require-overrides.js +0 -20
  59. package/src/executors/node/node-with-require-overrides.js.map +0 -1
  60. package/src/executors/node/node.impl.d.ts +0 -5
  61. package/src/executors/node/node.impl.js +0 -142
  62. package/src/executors/node/node.impl.js.map +0 -1
  63. package/src/executors/node/schema.d.ts +0 -16
  64. package/src/executors/node/schema.json +0 -72
  65. package/src/generators/application/application.d.ts +0 -5
  66. package/src/generators/application/application.js +0 -17
  67. package/src/generators/application/application.js.map +0 -1
  68. package/src/generators/application/files/README.md +0 -19
  69. package/src/generators/application/files/src/index.ts__tmpl__ +0 -3
  70. package/src/generators/application/files/tsconfig.app.json__tmpl__ +0 -10
  71. package/src/generators/application/files/tsconfig.json__tmpl__ +0 -14
  72. package/src/generators/application/schema.json +0 -99
  73. package/src/generators/library/files/package.json__tmpl__ +0 -5
  74. package/src/generators/library/files/src/lib/__fileName__.spec.ts__tmpl__ +0 -7
  75. package/src/generators/library/files/src/lib/__fileName__.ts__tmpl__ +0 -3
  76. package/src/utils/project-generator.d.ts +0 -12
  77. package/src/utils/project-generator.js +0 -203
  78. package/src/utils/project-generator.js.map +0 -1
  79. package/src/utils/swc/add-temp-swcrc.d.ts +0 -2
  80. package/src/utils/swc/add-temp-swcrc.js +0 -27
  81. package/src/utils/swc/add-temp-swcrc.js.map +0 -1
  82. package/src/utils/typescript/load-ts-plugins.js.map +0 -1
package/executors.json CHANGED
@@ -10,11 +10,6 @@
10
10
  "implementation": "./src/executors/swc/swc.impl",
11
11
  "schema": "./src/executors/swc/schema.json",
12
12
  "description": "Build a project using SWC"
13
- },
14
- "node": {
15
- "implementation": "./src/executors/node/node.impl",
16
- "schema": "./src/executors/node/schema.json",
17
- "description": "Build Node.js applications"
18
13
  }
19
14
  },
20
15
  "builders": {
@@ -27,11 +22,6 @@
27
22
  "implementation": "./src/executors/swc/compat",
28
23
  "schema": "./src/executors/swc/schema.json",
29
24
  "description": "Build a project using SWC"
30
- },
31
- "node": {
32
- "implementation": "./src/executors/node/compat",
33
- "schema": "./src/executors/node/schema.json",
34
- "description": "Build Node.js applications"
35
25
  }
36
26
  }
37
27
  }
package/generators.json CHANGED
@@ -9,13 +9,6 @@
9
9
  "x-type": "library",
10
10
  "description": "Create a library"
11
11
  },
12
- "application": {
13
- "factory": "./src/generators/application/application#applicationSchematic",
14
- "schema": "./src/generators/application/schema.json",
15
- "aliases": ["app"],
16
- "x-type": "application",
17
- "description": "Create a application"
18
- },
19
12
  "convert-to-swc": {
20
13
  "factory": "./src/generators/convert-to-swc/convert-to-swc#convertToSwcSchematic",
21
14
  "schema": "./src/generators/convert-to-swc/schema.json",
@@ -32,13 +25,6 @@
32
25
  "x-type": "library",
33
26
  "description": "Create a library"
34
27
  },
35
- "application": {
36
- "factory": "./src/generators/application/application#applicationGenerator",
37
- "schema": "./src/generators/application/schema.json",
38
- "aliases": ["app"],
39
- "x-type": "application",
40
- "description": "Create a application"
41
- },
42
28
  "convert-to-swc": {
43
29
  "factory": "./src/generators/convert-to-swc/convert-to-swc#convertToSwcGenerator",
44
30
  "schema": "./src/generators/convert-to-swc/schema.json",
package/migrations.json CHANGED
@@ -1,4 +1,17 @@
1
1
  {
2
- "generators": {},
2
+ "generators": {
3
+ "update-node-executor": {
4
+ "cli": "nx",
5
+ "version": "13.8.5-beta.1",
6
+ "description": "Renames @nrwl/js:node to @nrwl/node:node",
7
+ "factory": "./src/migrations/update-13-8-5/update-node-executor"
8
+ },
9
+ "update-swcrc": {
10
+ "cli": "nx",
11
+ "version": "13.8.5-beta.1",
12
+ "description": "Adjust .swcrc to .lib.swcrc",
13
+ "factory": "./src/migrations/update-13-8-5/update-swcrc"
14
+ }
15
+ },
3
16
  "packageJsonUpdates": {}
4
17
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/js",
3
- "version": "13.8.3",
3
+ "version": "13.8.5",
4
4
  "description": "JavaScript Plugin for Nx",
5
5
  "repository": {
6
6
  "type": "git",
@@ -31,10 +31,10 @@
31
31
  "executors": "./executors.json",
32
32
  "builders": "./executors.json",
33
33
  "dependencies": {
34
- "@nrwl/workspace": "13.8.3",
35
- "@nrwl/devkit": "13.8.3",
36
- "@nrwl/jest": "13.8.3",
37
- "@nrwl/linter": "13.8.3",
34
+ "@nrwl/workspace": "13.8.5",
35
+ "@nrwl/devkit": "13.8.5",
36
+ "@nrwl/jest": "13.8.5",
37
+ "@nrwl/linter": "13.8.5",
38
38
  "@parcel/watcher": "2.0.4",
39
39
  "chalk": "4.1.0",
40
40
  "fast-glob": "^3.2.7",
@@ -38,7 +38,24 @@
38
38
  "swcExclude": {
39
39
  "type": "array",
40
40
  "description": "List of SWC Glob/Regex to be excluded from compilation (https://swc.rs/docs/configuration/compilation#exclude)",
41
- "default": ["./src/**/.*.spec.ts$", "./**/.*.js$"]
41
+ "default": [
42
+ "./src/**/.*.spec.ts$",
43
+ "./**/.*.spec.ts$",
44
+ "./src/**/jest-setup.ts$",
45
+ "./**/jest-setup.ts$",
46
+ "./**/.*.js$"
47
+ ]
48
+ },
49
+ "updateBuildableProjectDepsInPackageJson": {
50
+ "type": "boolean",
51
+ "description": "Whether to update the buildable project dependencies in package.json.",
52
+ "default": true
53
+ },
54
+ "buildableProjectDepsInPackageJsonType": {
55
+ "type": "string",
56
+ "description": "When `updateBuildableProjectDepsInPackageJson` is `true`, this adds dependencies to either `peerDependencies` or `dependencies`.",
57
+ "enum": ["dependencies", "peerDependencies"],
58
+ "default": "peerDependencies"
42
59
  }
43
60
  },
44
61
  "required": ["main", "outputPath", "tsConfig"],
@@ -6,7 +6,6 @@ const assets_1 = require("@nrwl/workspace/src/utilities/assets");
6
6
  const path_1 = require("path");
7
7
  const check_dependencies_1 = require("../../utils/check-dependencies");
8
8
  const copy_assets_handler_1 = require("../../utils/copy-assets-handler");
9
- const add_temp_swcrc_1 = require("../../utils/swc/add-temp-swcrc");
10
9
  const compile_swc_1 = require("../../utils/swc/compile-swc");
11
10
  const update_package_json_1 = require("../../utils/update-package-json");
12
11
  const watch_for_single_file_changes_1 = require("../../utils/watch-for-single-file-changes");
@@ -19,27 +18,32 @@ function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
19
18
  options.watch = false;
20
19
  }
21
20
  const files = (0, assets_1.assetGlobsToFiles)(options.assets, contextRoot, outputPath);
21
+ const projectRootParts = projectRoot.split('/');
22
+ // We pop the last part of the `projectRoot` to pass
23
+ // the last part (projectDir) and the remainder (projectRootParts) to swc
24
+ const projectDir = projectRootParts.pop();
25
+ const swcCwd = projectRootParts.join('/');
22
26
  const swcCliOptions = {
23
- projectDir: projectRoot.split('/').pop(),
24
- // TODO: assume consumers put their code in `src`
25
- destPath: `${(0, path_1.relative)(projectRoot, options.outputPath)}/src`,
27
+ srcPath: projectDir,
28
+ destPath: (0, path_1.relative)((0, path_1.join)(contextRoot, swcCwd), outputPath),
29
+ swcCwd,
30
+ swcrcPath: (0, path_1.join)(contextRoot, projectRoot, '.lib.swcrc'),
26
31
  };
27
- return Object.assign(Object.assign({}, options), { swcrcPath: (0, path_1.join)(projectRoot, '.swcrc'), mainOutputPath: (0, path_1.resolve)(outputPath, options.main.replace(`${projectRoot}/`, '').replace('.ts', '.js')), files, root: contextRoot, sourceRoot,
32
+ return Object.assign(Object.assign({}, options), { mainOutputPath: (0, path_1.resolve)(outputPath, options.main.replace(`${projectRoot}/`, '').replace('.ts', '.js')), files, root: contextRoot, sourceRoot,
28
33
  projectRoot,
29
34
  outputPath, tsConfig: (0, path_1.join)(contextRoot, options.tsConfig), swcCliOptions });
30
35
  }
31
- function processAssetsAndPackageJsonOnce(assetHandler, options, projectRoot) {
36
+ function processAssetsAndPackageJsonOnce(assetHandler, options, context, target, dependencies) {
32
37
  return () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
33
38
  yield assetHandler.processAllAssetsOnce();
34
- (0, update_package_json_1.updatePackageJson)(options.main, options.outputPath, projectRoot, !options.skipTypeCheck);
39
+ (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies, !options.skipTypeCheck);
35
40
  });
36
41
  }
37
42
  function swcExecutor(_options, context) {
38
43
  return (0, tslib_1.__asyncGenerator)(this, arguments, function* swcExecutor_1() {
39
44
  const { sourceRoot, root } = context.workspace.projects[context.projectName];
40
45
  const options = normalizeOptions(_options, context.root, sourceRoot, root);
41
- options.swcrcPath = (0, add_temp_swcrc_1.addTempSwcrc)(options);
42
- const { tmpTsConfig, projectRoot } = (0, check_dependencies_1.checkDependencies)(context, options.tsConfig);
46
+ const { tmpTsConfig, projectRoot, target, dependencies } = (0, check_dependencies_1.checkDependencies)(context, options.tsConfig);
43
47
  if (tmpTsConfig) {
44
48
  options.tsConfig = tmpTsConfig;
45
49
  }
@@ -51,7 +55,7 @@ function swcExecutor(_options, context) {
51
55
  });
52
56
  if (options.watch) {
53
57
  const disposeWatchAssetChanges = yield (0, tslib_1.__await)(assetHandler.watchAndProcessOnAssetChange());
54
- const disposePackageJsonChanges = yield (0, 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.main, options.outputPath, projectRoot, !options.skipTypeCheck)));
58
+ const disposePackageJsonChanges = yield (0, 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, !options.skipTypeCheck)));
55
59
  process.on('exit', () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
56
60
  yield disposeWatchAssetChanges();
57
61
  yield disposePackageJsonChanges();
@@ -60,10 +64,10 @@ function swcExecutor(_options, context) {
60
64
  yield disposeWatchAssetChanges();
61
65
  yield disposePackageJsonChanges();
62
66
  }));
63
- return yield (0, tslib_1.__await)(yield (0, tslib_1.__await)(yield* (0, tslib_1.__asyncDelegator)((0, tslib_1.__asyncValues)((0, compile_swc_1.compileSwcWatch)(context, options, processAssetsAndPackageJsonOnce(assetHandler, options, projectRoot))))));
67
+ return yield (0, tslib_1.__await)(yield (0, tslib_1.__await)(yield* (0, tslib_1.__asyncDelegator)((0, tslib_1.__asyncValues)((0, compile_swc_1.compileSwcWatch)(context, options, processAssetsAndPackageJsonOnce(assetHandler, options, context, target, dependencies))))));
64
68
  }
65
69
  else {
66
- return yield (0, tslib_1.__await)(yield yield (0, tslib_1.__await)((0, compile_swc_1.compileSwc)(context, options, processAssetsAndPackageJsonOnce(assetHandler, options, projectRoot))));
70
+ return yield (0, tslib_1.__await)(yield yield (0, tslib_1.__await)((0, compile_swc_1.compileSwc)(context, options, processAssetsAndPackageJsonOnce(assetHandler, options, context, target, dependencies))));
67
71
  }
68
72
  });
69
73
  }
@@ -1 +1 @@
1
- {"version":3,"file":"swc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/swc/swc.impl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"swc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/swc/swc.impl.ts"],"names":[],"mappings":"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"}
@@ -36,6 +36,17 @@
36
36
  "items": {
37
37
  "$ref": "#/definitions/transformerPattern"
38
38
  }
39
+ },
40
+ "updateBuildableProjectDepsInPackageJson": {
41
+ "type": "boolean",
42
+ "description": "Whether to update the buildable project dependencies in package.json.",
43
+ "default": true
44
+ },
45
+ "buildableProjectDepsInPackageJsonType": {
46
+ "type": "string",
47
+ "description": "When `updateBuildableProjectDepsInPackageJson` is `true`, this adds dependencies to either `peerDependencies` or `dependencies`.",
48
+ "enum": ["dependencies", "peerDependencies"],
49
+ "default": "peerDependencies"
39
50
  }
40
51
  },
41
52
  "required": ["main", "outputPath", "tsConfig"],
@@ -25,7 +25,7 @@ function tscExecutor(_options, context) {
25
25
  return (0, tslib_1.__asyncGenerator)(this, arguments, function* tscExecutor_1() {
26
26
  const { sourceRoot, root } = context.workspace.projects[context.projectName];
27
27
  const options = normalizeOptions(_options, context.root, sourceRoot, root);
28
- const { projectRoot, tmpTsConfig } = (0, check_dependencies_1.checkDependencies)(context, _options.tsConfig);
28
+ const { projectRoot, tmpTsConfig, target, dependencies } = (0, check_dependencies_1.checkDependencies)(context, _options.tsConfig);
29
29
  if (tmpTsConfig) {
30
30
  options.tsConfig = tmpTsConfig;
31
31
  }
@@ -37,7 +37,7 @@ function tscExecutor(_options, context) {
37
37
  });
38
38
  if (options.watch) {
39
39
  const disposeWatchAssetChanges = yield (0, tslib_1.__await)(assetHandler.watchAndProcessOnAssetChange());
40
- const disposePackageJsonChanged = yield (0, 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.main, options.outputPath, projectRoot)));
40
+ const disposePackageJsonChanged = yield (0, 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)));
41
41
  process.on('exit', () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
42
42
  yield disposeWatchAssetChanges();
43
43
  yield disposePackageJsonChanged();
@@ -49,7 +49,7 @@ function tscExecutor(_options, context) {
49
49
  }
50
50
  return yield (0, tslib_1.__await)(yield (0, tslib_1.__await)(yield* (0, tslib_1.__asyncDelegator)((0, tslib_1.__asyncValues)((0, compile_typescript_files_1.compileTypeScriptFiles)(options, context, () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
51
51
  yield assetHandler.processAllAssetsOnce();
52
- (0, update_package_json_1.updatePackageJson)(options.main, options.outputPath, projectRoot);
52
+ (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies);
53
53
  }))))));
54
54
  });
55
55
  }
@@ -1 +1 @@
1
- {"version":3,"file":"tsc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/tsc/tsc.impl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tsc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/tsc/tsc.impl.ts"],"names":[],"mappings":"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"}
@@ -32,7 +32,7 @@ function updateProjectBuildTargets(tree, projectConfiguration, projectName, proj
32
32
  (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
33
33
  }
34
34
  function checkSwcDependencies(tree, projectConfiguration) {
35
- const isSwcrcPresent = tree.exists((0, path_1.join)(projectConfiguration.root, '.swcrc'));
35
+ const isSwcrcPresent = tree.exists((0, path_1.join)(projectConfiguration.root, '.lib.swcrc'));
36
36
  const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
37
37
  const hasSwcDependency = packageJson.dependencies && packageJson.dependencies['@swc/core'];
38
38
  if (isSwcrcPresent && hasSwcDependency)
@@ -1 +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,yCAQsB;AACtB,+BAA4B;AAC5B,mEAA8D;AAC9D,+EAA0E;AAG1E,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;QAEF,OAAO,oBAAoB,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;IAC1D,CAAC;CAAA;AAfD,sDAeC;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,gBAAgB,GACpB,WAAW,CAAC,YAAY,IAAI,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAEpE,IAAI,cAAc,IAAI,gBAAgB;QAAE,OAAO;IAE/C,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,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"}
1
+ {"version":3,"file":"convert-to-swc.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/convert-to-swc/convert-to-swc.ts"],"names":[],"mappings":";;;;AAAA,yCAQsB;AACtB,+BAA4B;AAC5B,mEAA8D;AAC9D,+EAA0E;AAG1E,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;QAEF,OAAO,oBAAoB,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;IAC1D,CAAC;CAAA;AAfD,sDAeC;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,gBAAgB,GACpB,WAAW,CAAC,YAAY,IAAI,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAEpE,IAAI,cAAc,IAAI,gBAAgB;QAAE,OAAO;IAE/C,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,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"}
@@ -0,0 +1,17 @@
1
+ const fs = require('fs');
2
+
3
+ // Reading the SWC compilation config and remove the "exclude"
4
+ // for the test files to be compiled by SWC
5
+ const { exclude: _, ...swcJestConfig } = JSON.parse(
6
+ fs.readFileSync(`${__dirname}/.lib.swcrc`, 'utf-8')
7
+ );
8
+
9
+ module.exports = {
10
+ displayName: '<%= project %>',
11
+ preset: '<%= offsetFromRoot %>jest.preset.js',
12
+ transform: {
13
+ '^.+\\.[tj]s$': ['@swc/jest', swcJestConfig],
14
+ },
15
+ moduleFileExtensions: ['ts', 'js', 'html'],
16
+ coverageDirectory: '<%= offsetFromRoot %>coverage/<%= projectRoot %>'
17
+ };
@@ -1,5 +1,15 @@
1
- import { Tree } from '@nrwl/devkit';
2
- import { GeneratorSchema } from '../../utils/schema';
3
- export declare function libraryGenerator(tree: Tree, schema: GeneratorSchema): Promise<import("@nrwl/devkit").GeneratorCallback>;
1
+ import { GeneratorCallback, Tree } from '@nrwl/devkit';
2
+ import { LibraryGeneratorSchema } from '../../utils/schema';
3
+ export declare function libraryGenerator(tree: Tree, schema: LibraryGeneratorSchema): Promise<GeneratorCallback>;
4
+ export declare function projectGenerator(tree: Tree, schema: LibraryGeneratorSchema, destinationDir: string, filesDir: string): Promise<GeneratorCallback>;
5
+ export interface NormalizedSchema extends LibraryGeneratorSchema {
6
+ name: string;
7
+ fileName: string;
8
+ projectRoot: string;
9
+ projectDirectory: string;
10
+ parsedTags: string[];
11
+ importPath?: string;
12
+ }
13
+ export declare function addLint(tree: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;
4
14
  export default libraryGenerator;
5
- export declare const librarySchematic: (options: GeneratorSchema) => (tree: any, context: any) => Promise<any>;
15
+ export declare const librarySchematic: (options: LibraryGeneratorSchema) => (tree: any, context: any) => Promise<any>;
@@ -1,17 +1,224 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.librarySchematic = exports.libraryGenerator = void 0;
3
+ exports.librarySchematic = exports.addLint = exports.projectGenerator = exports.libraryGenerator = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const devkit_1 = require("@nrwl/devkit");
6
+ const jest_1 = require("@nrwl/jest");
7
+ const linter_1 = require("@nrwl/linter");
8
+ const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
6
9
  const path_1 = require("path");
7
- const project_generator_1 = require("../../utils/project-generator");
10
+ const add_swc_config_1 = require("../../utils/swc/add-swc-config");
11
+ const add_swc_dependencies_1 = require("../../utils/swc/add-swc-dependencies");
8
12
  function libraryGenerator(tree, schema) {
9
13
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
10
14
  const { libsDir } = (0, devkit_1.getWorkspaceLayout)(tree);
11
- return (0, project_generator_1.projectGenerator)(tree, schema, libsDir, (0, path_1.join)(__dirname, './files'), 'library');
15
+ return projectGenerator(tree, schema, libsDir, (0, path_1.join)(__dirname, './files'));
12
16
  });
13
17
  }
14
18
  exports.libraryGenerator = libraryGenerator;
19
+ function projectGenerator(tree, schema, destinationDir, filesDir) {
20
+ return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
21
+ const options = normalizeOptions(tree, schema, destinationDir);
22
+ createFiles(tree, options, `${filesDir}/lib`);
23
+ addProject(tree, options, destinationDir);
24
+ if (!schema.skipTsConfig) {
25
+ updateRootTsConfig(tree, options);
26
+ }
27
+ const tasks = [];
28
+ if (options.linter !== 'none') {
29
+ const lintCallback = yield addLint(tree, options);
30
+ tasks.push(lintCallback);
31
+ }
32
+ if (options.unitTestRunner === 'jest') {
33
+ const jestCallback = yield addJest(tree, options);
34
+ tasks.push(jestCallback);
35
+ if (options.compiler === 'swc') {
36
+ replaceJestConfig(tree, options, `${filesDir}/jest-config`);
37
+ }
38
+ }
39
+ if (!options.skipFormat) {
40
+ yield (0, devkit_1.formatFiles)(tree);
41
+ }
42
+ return (0, run_tasks_in_serial_1.runTasksInSerial)(...tasks);
43
+ });
44
+ }
45
+ exports.projectGenerator = projectGenerator;
46
+ function addProject(tree, options, destinationDir) {
47
+ const projectConfiguration = {
48
+ root: options.projectRoot,
49
+ sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
50
+ targets: {},
51
+ tags: options.parsedTags,
52
+ };
53
+ if (options.buildable && options.config != 'npm-scripts') {
54
+ projectConfiguration.targets.build = {
55
+ executor: `@nrwl/js:${options.compiler}`,
56
+ outputs: ['{options.outputPath}'],
57
+ options: {
58
+ outputPath: `dist/${destinationDir}/${options.projectDirectory}`,
59
+ main: `${options.projectRoot}/src/index` + (options.js ? '.js' : '.ts'),
60
+ tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
61
+ assets: [`${options.projectRoot}/*.md`],
62
+ },
63
+ };
64
+ if (options.compiler === 'swc' && options.skipTypeCheck) {
65
+ projectConfiguration.targets.build.options.skipTypeCheck = true;
66
+ }
67
+ }
68
+ if (options.config === 'workspace') {
69
+ (0, devkit_1.addProjectConfiguration)(tree, options.name, projectConfiguration, false);
70
+ }
71
+ else if (options.config === 'project') {
72
+ (0, devkit_1.addProjectConfiguration)(tree, options.name, projectConfiguration, true);
73
+ }
74
+ else {
75
+ (0, devkit_1.addProjectConfiguration)(tree, options.name, {
76
+ root: projectConfiguration.root,
77
+ tags: projectConfiguration.tags,
78
+ targets: {},
79
+ }, true);
80
+ }
81
+ }
82
+ function addLint(tree, options) {
83
+ return (0, linter_1.lintProjectGenerator)(tree, {
84
+ project: options.name,
85
+ linter: options.linter,
86
+ skipFormat: true,
87
+ tsConfigPaths: [
88
+ (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'),
89
+ ],
90
+ eslintFilePatterns: [
91
+ `${options.projectRoot}/**/*.${options.js ? 'js' : 'ts'}`,
92
+ ],
93
+ setParserOptionsProject: options.setParserOptionsProject,
94
+ });
95
+ }
96
+ exports.addLint = addLint;
97
+ function updateTsConfig(tree, options) {
98
+ (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.projectRoot, 'tsconfig.json'), (json) => {
99
+ if (options.strict) {
100
+ json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { forceConsistentCasingInFileNames: true, strict: true, noImplicitOverride: true, noPropertyAccessFromIndexSignature: true, noImplicitReturns: true, noFallthroughCasesInSwitch: true });
101
+ }
102
+ return json;
103
+ });
104
+ }
105
+ function createFiles(tree, options, filesDir) {
106
+ const { className, name, propertyName } = (0, devkit_1.names)(options.name);
107
+ (0, devkit_1.generateFiles)(tree, filesDir, options.projectRoot, Object.assign(Object.assign({}, options), { dot: '.', className,
108
+ name,
109
+ propertyName, js: !!options.js, cliCommand: 'nx', strict: undefined, tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), buildable: options.buildable === true, hasUnitTestRunner: options.unitTestRunner !== 'none' }));
110
+ if (options.buildable && options.compiler === 'swc') {
111
+ (0, add_swc_dependencies_1.addSwcDependencies)(tree);
112
+ (0, add_swc_config_1.addSwcConfig)(tree, options.projectRoot);
113
+ }
114
+ if (options.unitTestRunner === 'none') {
115
+ tree.delete((0, path_1.join)(options.projectRoot, 'src/lib', `${options.fileName}.spec.ts`));
116
+ tree.delete((0, path_1.join)(options.projectRoot, 'src/app', `${options.fileName}.spec.ts`));
117
+ }
118
+ if (options.js) {
119
+ (0, devkit_1.toJS)(tree);
120
+ }
121
+ const packageJsonPath = (0, path_1.join)(options.projectRoot, 'package.json');
122
+ if (options.config === 'npm-scripts') {
123
+ (0, devkit_1.updateJson)(tree, packageJsonPath, (json) => {
124
+ json.scripts = {
125
+ build: "echo 'implement build'",
126
+ test: "echo 'implement test'",
127
+ };
128
+ return json;
129
+ });
130
+ }
131
+ else if (!options.buildable) {
132
+ tree.delete(packageJsonPath);
133
+ }
134
+ updateTsConfig(tree, options);
135
+ }
136
+ function addJest(tree, options) {
137
+ return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
138
+ return yield (0, jest_1.jestProjectGenerator)(tree, {
139
+ project: options.name,
140
+ setupFile: 'none',
141
+ supportTsx: false,
142
+ skipSerializers: true,
143
+ testEnvironment: options.testEnvironment,
144
+ skipFormat: true,
145
+ compiler: options.compiler,
146
+ });
147
+ });
148
+ }
149
+ function replaceJestConfig(tree, options, filesDir) {
150
+ // remove the generated jest config by Jest generator
151
+ tree.delete((0, path_1.join)(options.projectRoot, 'jest.config.js'));
152
+ // replace with JS:SWC specific jest config
153
+ (0, devkit_1.generateFiles)(tree, filesDir, options.projectRoot, {
154
+ tmpl: '',
155
+ project: options.name,
156
+ offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
157
+ projectRoot: options.projectRoot,
158
+ });
159
+ }
160
+ function normalizeOptions(tree, options, destinationDir) {
161
+ var _a;
162
+ if (options.publishable) {
163
+ if (!options.importPath) {
164
+ throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
165
+ }
166
+ options.buildable = true;
167
+ }
168
+ if (options.config === 'npm-scripts') {
169
+ options.unitTestRunner = 'none';
170
+ options.linter = linter_1.Linter.None;
171
+ options.buildable = false;
172
+ }
173
+ (_a = options.compiler) !== null && _a !== void 0 ? _a : (options.compiler = 'tsc');
174
+ if (options.compiler === 'swc' && options.skipTypeCheck == null) {
175
+ options.skipTypeCheck = false;
176
+ }
177
+ const name = (0, devkit_1.names)(options.name).fileName;
178
+ const projectDirectory = options.directory
179
+ ? `${(0, devkit_1.names)(options.directory).fileName}/${name}`
180
+ : name;
181
+ if (!options.unitTestRunner && options.config !== 'npm-scripts') {
182
+ options.unitTestRunner = 'jest';
183
+ }
184
+ if (!options.linter && options.config !== 'npm-scripts') {
185
+ options.linter = linter_1.Linter.EsLint;
186
+ }
187
+ const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');
188
+ const fileName = getCaseAwareFileName({
189
+ fileName: options.simpleModuleName ? name : projectName,
190
+ pascalCaseFiles: options.pascalCaseFiles,
191
+ });
192
+ const { npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
193
+ const projectRoot = (0, devkit_1.joinPathFragments)(destinationDir, projectDirectory);
194
+ const parsedTags = options.tags
195
+ ? options.tags.split(',').map((s) => s.trim())
196
+ : [];
197
+ const defaultImportPath = `@${npmScope}/${projectDirectory}`;
198
+ const importPath = options.importPath || defaultImportPath;
199
+ return Object.assign(Object.assign({}, options), { fileName, name: projectName, projectRoot,
200
+ projectDirectory,
201
+ parsedTags,
202
+ importPath });
203
+ }
204
+ function getCaseAwareFileName(options) {
205
+ const normalized = (0, devkit_1.names)(options.fileName);
206
+ return options.pascalCaseFiles ? normalized.className : normalized.fileName;
207
+ }
208
+ function updateRootTsConfig(host, options) {
209
+ (0, devkit_1.updateJson)(host, 'tsconfig.base.json', (json) => {
210
+ const c = json.compilerOptions;
211
+ c.paths = c.paths || {};
212
+ delete c.paths[options.name];
213
+ if (c.paths[options.importPath]) {
214
+ throw new Error(`You already have a library using the import path "${options.importPath}". Make sure to specify a unique one.`);
215
+ }
216
+ c.paths[options.importPath] = [
217
+ (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
218
+ ];
219
+ return json;
220
+ });
221
+ }
15
222
  exports.default = libraryGenerator;
16
223
  exports.librarySchematic = (0, devkit_1.convertNxGenerator)(libraryGenerator);
17
224
  //# sourceMappingURL=library.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,yCAA4E;AAC5E,+BAA4B;AAC5B,qEAAiE;AAGjE,SAAsB,gBAAgB,CAAC,IAAU,EAAE,MAAuB;;QACxE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;QAC7C,OAAO,IAAA,oCAAgB,EACrB,IAAI,EACJ,MAAM,EACN,OAAO,EACP,IAAA,WAAI,EAAC,SAAS,EAAE,SAAS,CAAC,EAC1B,SAAS,CACV,CAAC;IACJ,CAAC;CAAA;AATD,4CASC;AAED,kBAAe,gBAAgB,CAAC;AACnB,QAAA,gBAAgB,GAAG,IAAA,2BAAkB,EAAC,gBAAgB,CAAC,CAAC"}
1
+ {"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/library/library.ts"],"names":[],"mappings":"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"}
@@ -77,6 +77,11 @@
77
77
  "description": "Whether to enable tsconfig strict mode or not.",
78
78
  "default": true
79
79
  },
80
+ "publishable": {
81
+ "type": "boolean",
82
+ "default": false,
83
+ "description": "Generate a publishable library."
84
+ },
80
85
  "buildable": {
81
86
  "type": "boolean",
82
87
  "default": true,
package/src/index.d.ts CHANGED
@@ -1,4 +1,3 @@
1
1
  export * from './utils/typescript/print-diagnostics';
2
2
  export * from './utils/typescript/run-type-check';
3
3
  export { libraryGenerator } from './generators/library/library';
4
- export { applicationGenerator } from './generators/application/application';