@nrwl/js 13.8.2 → 13.8.4

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 (58) hide show
  1. package/executors.json +0 -10
  2. package/generators.json +0 -14
  3. package/migrations.json +8 -1
  4. package/package.json +5 -5
  5. package/src/executors/swc/schema.json +18 -1
  6. package/src/executors/swc/swc.impl.js +17 -11
  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/library/library.d.ts +12 -2
  12. package/src/generators/library/library.js +190 -3
  13. package/src/generators/library/library.js.map +1 -1
  14. package/src/index.d.ts +0 -1
  15. package/src/index.js +1 -3
  16. package/src/index.js.map +1 -1
  17. package/src/migrations/update-13-9-0/update-node-executor.d.ts +2 -0
  18. package/src/migrations/update-13-9-0/update-node-executor.js +28 -0
  19. package/src/migrations/update-13-9-0/update-node-executor.js.map +1 -0
  20. package/src/utils/check-dependencies.d.ts +4 -1
  21. package/src/utils/check-dependencies.js +4 -0
  22. package/src/utils/check-dependencies.js.map +1 -1
  23. package/src/utils/copy-assets-handler.js +2 -1
  24. package/src/utils/copy-assets-handler.js.map +1 -1
  25. package/src/utils/schema.d.ts +5 -7
  26. package/src/utils/swc/compile-swc.js +5 -8
  27. package/src/utils/swc/compile-swc.js.map +1 -1
  28. package/src/utils/update-package-json.d.ts +4 -1
  29. package/src/utils/update-package-json.js +10 -9
  30. package/src/utils/update-package-json.js.map +1 -1
  31. package/src/utils/versions.d.ts +3 -3
  32. package/src/utils/versions.js +4 -4
  33. package/src/utils/versions.js.map +1 -1
  34. package/src/executors/node/compat.d.ts +0 -2
  35. package/src/executors/node/compat.js +0 -6
  36. package/src/executors/node/compat.js.map +0 -1
  37. package/src/executors/node/node-with-require-overrides.d.ts +0 -5
  38. package/src/executors/node/node-with-require-overrides.js +0 -20
  39. package/src/executors/node/node-with-require-overrides.js.map +0 -1
  40. package/src/executors/node/node.impl.d.ts +0 -5
  41. package/src/executors/node/node.impl.js +0 -142
  42. package/src/executors/node/node.impl.js.map +0 -1
  43. package/src/executors/node/schema.d.ts +0 -16
  44. package/src/executors/node/schema.json +0 -72
  45. package/src/generators/application/application.d.ts +0 -5
  46. package/src/generators/application/application.js +0 -17
  47. package/src/generators/application/application.js.map +0 -1
  48. package/src/generators/application/files/README.md +0 -19
  49. package/src/generators/application/files/package.json__tmpl__ +0 -5
  50. package/src/generators/application/files/src/app/__fileName__.spec.ts__tmpl__ +0 -7
  51. package/src/generators/application/files/src/app/__fileName__.ts__tmpl__ +0 -3
  52. package/src/generators/application/files/src/index.ts__tmpl__ +0 -3
  53. package/src/generators/application/files/tsconfig.app.json__tmpl__ +0 -10
  54. package/src/generators/application/files/tsconfig.json__tmpl__ +0 -14
  55. package/src/generators/application/schema.json +0 -99
  56. package/src/utils/project-generator.d.ts +0 -12
  57. package/src/utils/project-generator.js +0 -203
  58. package/src/utils/project-generator.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,11 @@
1
1
  {
2
- "generators": {},
2
+ "generators": {
3
+ "update-node-executor": {
4
+ "cli": "nx",
5
+ "version": "13.9.0-beta.1",
6
+ "description": "Renames @nrwl/js:node to @nrwl/node:node",
7
+ "factory": "./src/migrations/update-13-9-0/update-node-executor"
8
+ }
9
+ },
3
10
  "packageJsonUpdates": {}
4
11
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/js",
3
- "version": "13.8.2",
3
+ "version": "13.8.4",
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.2",
35
- "@nrwl/devkit": "13.8.2",
36
- "@nrwl/jest": "13.8.2",
37
- "@nrwl/linter": "13.8.2",
34
+ "@nrwl/workspace": "13.8.4",
35
+ "@nrwl/devkit": "13.8.4",
36
+ "@nrwl/jest": "13.8.4",
37
+ "@nrwl/linter": "13.8.4",
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"],
@@ -19,27 +19,33 @@ function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
19
19
  options.watch = false;
20
20
  }
21
21
  const files = (0, assets_1.assetGlobsToFiles)(options.assets, contextRoot, outputPath);
22
+ const projectRootParts = projectRoot.split('/');
23
+ // We pop the last part of the `projectRoot` to pass
24
+ // the last part (projectDir) and the remainder (projectRootParts) to swc
25
+ const projectDir = projectRootParts.pop();
26
+ const swcCwd = projectRootParts.join('/');
22
27
  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`,
28
+ srcPath: projectDir,
29
+ destPath: (0, path_1.relative)((0, path_1.join)(contextRoot, swcCwd), outputPath),
30
+ swcCwd,
31
+ swcrcPath: (0, path_1.join)(projectRoot, '.swcrc'),
26
32
  };
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,
33
+ return Object.assign(Object.assign({}, options), { mainOutputPath: (0, path_1.resolve)(outputPath, options.main.replace(`${projectRoot}/`, '').replace('.ts', '.js')), files, root: contextRoot, sourceRoot,
28
34
  projectRoot,
29
35
  outputPath, tsConfig: (0, path_1.join)(contextRoot, options.tsConfig), swcCliOptions });
30
36
  }
31
- function processAssetsAndPackageJsonOnce(assetHandler, options, projectRoot) {
37
+ function processAssetsAndPackageJsonOnce(assetHandler, options, context, target, dependencies) {
32
38
  return () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
33
39
  yield assetHandler.processAllAssetsOnce();
34
- (0, update_package_json_1.updatePackageJson)(options.main, options.outputPath, projectRoot, !options.skipTypeCheck);
40
+ (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies, !options.skipTypeCheck);
35
41
  });
36
42
  }
37
43
  function swcExecutor(_options, context) {
38
44
  return (0, tslib_1.__asyncGenerator)(this, arguments, function* swcExecutor_1() {
39
45
  const { sourceRoot, root } = context.workspace.projects[context.projectName];
40
46
  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);
47
+ options.swcCliOptions.swcrcPath = (0, add_temp_swcrc_1.addTempSwcrc)(options);
48
+ const { tmpTsConfig, projectRoot, target, dependencies } = (0, check_dependencies_1.checkDependencies)(context, options.tsConfig);
43
49
  if (tmpTsConfig) {
44
50
  options.tsConfig = tmpTsConfig;
45
51
  }
@@ -51,7 +57,7 @@ function swcExecutor(_options, context) {
51
57
  });
52
58
  if (options.watch) {
53
59
  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)));
60
+ 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
61
  process.on('exit', () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
56
62
  yield disposeWatchAssetChanges();
57
63
  yield disposePackageJsonChanges();
@@ -60,10 +66,10 @@ function swcExecutor(_options, context) {
60
66
  yield disposeWatchAssetChanges();
61
67
  yield disposePackageJsonChanges();
62
68
  }));
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))))));
69
+ 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
70
  }
65
71
  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))));
72
+ 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
73
  }
68
74
  });
69
75
  }
@@ -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":";;;;AACA,iEAG8C;AAC9C,+BAAqC;AACrC,uEAAmE;AACnE,yEAAoE;AAEpE,8FAAyF;AACzF,yEAAoE;AACpE,6FAAsF;AAEtF,SAAgB,gBAAgB,CAC9B,OAAwB,EACxB,WAAmB,EACnB,UAAmB,EACnB,WAAoB;IAEpB,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAEzD,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,uCACK,OAAO,KACV,IAAI,EAAE,WAAW,EACjB,UAAU;QACV,WAAW;QACX,KAAK;QACL,UAAU,EACV,QAAQ,EAAE,IAAA,WAAI,EAAC,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,EAC7C,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,IACD;AACJ,CAAC;AA/BD,4CA+BC;AAED,SAAuB,WAAW,CAChC,QAAyB,EACzB,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;QAE3E,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,sCAAiB,EAC1E,OAAO,EACP,QAAQ,CAAC,QAAQ,CAClB,CAAC;QAEF,IAAI,WAAW,EAAE;YACf,OAAO,CAAC,QAAQ,GAAG,WAAW,CAAC;SAChC;QAED,MAAM,YAAY,GAAG,IAAI,uCAAiB,CAAC;YACzC,UAAU,EAAE,WAAW;YACvB,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,SAAS,EAAE,QAAQ,CAAC,UAAU;YAC9B,MAAM,EAAE,QAAQ,CAAC,MAAM;SACxB,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,KAAK,EAAE;YACjB,MAAM,wBAAwB,GAC5B,2BAAM,YAAY,CAAC,4BAA4B,EAAE,CAAA,CAAC;YACpD,MAAM,yBAAyB,GAAG,2BAAM,IAAA,yDAAyB,EAC/D,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,EAC/B,cAAc,EACd,GAAG,EAAE,CAAC,IAAA,uCAAiB,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAChE,CAAA,CAAC;YACF,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAS,EAAE;gBAC5B,MAAM,wBAAwB,EAAE,CAAC;gBACjC,MAAM,yBAAyB,EAAE,CAAC;YACpC,CAAC,CAAA,CAAC,CAAC;YACH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAS,EAAE;gBAC/B,MAAM,wBAAwB,EAAE,CAAC;gBACjC,MAAM,yBAAyB,EAAE,CAAC;YACpC,CAAC,CAAA,CAAC,CAAC;SACJ;QAED,kCAAO,2BAAA,KAAK,CAAC,CAAC,8BAAA,2BAAA,IAAA,iDAAsB,EAAC,OAAO,EAAE,OAAO,EAAE,GAAS,EAAE;YAChE,MAAM,YAAY,CAAC,oBAAoB,EAAE,CAAC;YAC1C,IAAA,uCAAiB,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;QAC5D,CAAC,CAAA,CAAC,CAAA,CAAA,CAAA,EAAC;IACL,CAAC;CAAA;AA7CD,kCA6CC;AAED,kBAAe,WAAW,CAAC"}
@@ -1,5 +1,15 @@
1
- import { Tree } from '@nrwl/devkit';
1
+ import { GeneratorCallback, Tree } from '@nrwl/devkit';
2
2
  import { GeneratorSchema } from '../../utils/schema';
3
- export declare function libraryGenerator(tree: Tree, schema: GeneratorSchema): Promise<import("@nrwl/devkit").GeneratorCallback>;
3
+ export declare function libraryGenerator(tree: Tree, schema: GeneratorSchema): Promise<GeneratorCallback>;
4
+ export declare function projectGenerator(tree: Tree, schema: GeneratorSchema, destinationDir: string, filesDir: string): Promise<GeneratorCallback>;
5
+ export interface NormalizedSchema extends GeneratorSchema {
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
15
  export declare const librarySchematic: (options: GeneratorSchema) => (tree: any, context: any) => Promise<any>;
@@ -1,17 +1,204 @@
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
6
  const path_1 = require("path");
7
- const project_generator_1 = require("../../utils/project-generator");
7
+ const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
8
+ const linter_1 = require("@nrwl/linter");
9
+ const jest_1 = require("@nrwl/jest");
10
+ const add_swc_dependencies_1 = require("../../utils/swc/add-swc-dependencies");
11
+ const add_swc_config_1 = require("../../utils/swc/add-swc-config");
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);
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
+ }
36
+ if (!options.skipFormat) {
37
+ yield (0, devkit_1.formatFiles)(tree);
38
+ }
39
+ return (0, run_tasks_in_serial_1.runTasksInSerial)(...tasks);
40
+ });
41
+ }
42
+ exports.projectGenerator = projectGenerator;
43
+ function addProject(tree, options, destinationDir) {
44
+ const projectConfiguration = {
45
+ root: options.projectRoot,
46
+ sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
47
+ targets: {},
48
+ tags: options.parsedTags,
49
+ };
50
+ if (options.buildable && options.config != 'npm-scripts') {
51
+ projectConfiguration.targets.build = {
52
+ executor: `@nrwl/js:${options.compiler}`,
53
+ outputs: ['{options.outputPath}'],
54
+ options: {
55
+ outputPath: `dist/${destinationDir}/${options.projectDirectory}`,
56
+ main: `${options.projectRoot}/src/index` + (options.js ? '.js' : '.ts'),
57
+ tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
58
+ assets: [`${options.projectRoot}/*.md`],
59
+ },
60
+ };
61
+ if (options.compiler === 'swc' && options.skipTypeCheck) {
62
+ projectConfiguration.targets.build.options.skipTypeCheck = true;
63
+ }
64
+ }
65
+ if (options.config === 'workspace') {
66
+ (0, devkit_1.addProjectConfiguration)(tree, options.name, projectConfiguration, false);
67
+ }
68
+ else if (options.config === 'project') {
69
+ (0, devkit_1.addProjectConfiguration)(tree, options.name, projectConfiguration, true);
70
+ }
71
+ else {
72
+ (0, devkit_1.addProjectConfiguration)(tree, options.name, {
73
+ root: projectConfiguration.root,
74
+ tags: projectConfiguration.tags,
75
+ targets: {},
76
+ }, true);
77
+ }
78
+ }
79
+ function addLint(tree, options) {
80
+ return (0, linter_1.lintProjectGenerator)(tree, {
81
+ project: options.name,
82
+ linter: options.linter,
83
+ skipFormat: true,
84
+ tsConfigPaths: [
85
+ (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'),
86
+ ],
87
+ eslintFilePatterns: [
88
+ `${options.projectRoot}/**/*.${options.js ? 'js' : 'ts'}`,
89
+ ],
90
+ setParserOptionsProject: options.setParserOptionsProject,
91
+ });
92
+ }
93
+ exports.addLint = addLint;
94
+ function updateTsConfig(tree, options) {
95
+ (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.projectRoot, 'tsconfig.json'), (json) => {
96
+ if (options.strict) {
97
+ json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { forceConsistentCasingInFileNames: true, strict: true, noImplicitOverride: true, noPropertyAccessFromIndexSignature: true, noImplicitReturns: true, noFallthroughCasesInSwitch: true });
98
+ }
99
+ return json;
100
+ });
101
+ }
102
+ function createFiles(tree, options, filesDir) {
103
+ const { className, name, propertyName } = (0, devkit_1.names)(options.name);
104
+ (0, devkit_1.generateFiles)(tree, filesDir, options.projectRoot, Object.assign(Object.assign({}, options), { dot: '.', className,
105
+ name,
106
+ propertyName, js: !!options.js, cliCommand: 'nx', strict: undefined, tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), buildable: options.buildable === true, hasUnitTestRunner: options.unitTestRunner !== 'none' }));
107
+ if (options.buildable && options.compiler === 'swc') {
108
+ (0, add_swc_dependencies_1.addSwcDependencies)(tree);
109
+ (0, add_swc_config_1.addSwcConfig)(tree, options.projectRoot);
110
+ }
111
+ if (options.unitTestRunner === 'none') {
112
+ tree.delete((0, path_1.join)(options.projectRoot, 'src/lib', `${options.fileName}.spec.ts`));
113
+ tree.delete((0, path_1.join)(options.projectRoot, 'src/app', `${options.fileName}.spec.ts`));
114
+ }
115
+ if (options.js) {
116
+ (0, devkit_1.toJS)(tree);
117
+ }
118
+ const packageJsonPath = (0, path_1.join)(options.projectRoot, 'package.json');
119
+ if (options.config === 'npm-scripts') {
120
+ (0, devkit_1.updateJson)(tree, packageJsonPath, (json) => {
121
+ json.scripts = {
122
+ build: "echo 'implement build'",
123
+ test: "echo 'implement test'",
124
+ };
125
+ return json;
126
+ });
127
+ }
128
+ else if (!options.buildable) {
129
+ tree.delete(packageJsonPath);
130
+ }
131
+ updateTsConfig(tree, options);
132
+ }
133
+ function addJest(tree, options) {
134
+ return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
135
+ return yield (0, jest_1.jestProjectGenerator)(tree, {
136
+ project: options.name,
137
+ setupFile: 'none',
138
+ supportTsx: false,
139
+ skipSerializers: true,
140
+ testEnvironment: options.testEnvironment,
141
+ skipFormat: true,
142
+ compiler: options.compiler,
143
+ });
144
+ });
145
+ }
146
+ function normalizeOptions(tree, options, destinationDir) {
147
+ var _a;
148
+ if (options.config === 'npm-scripts') {
149
+ options.unitTestRunner = 'none';
150
+ options.linter = linter_1.Linter.None;
151
+ options.buildable = false;
152
+ }
153
+ (_a = options.compiler) !== null && _a !== void 0 ? _a : (options.compiler = 'tsc');
154
+ if (options.compiler === 'swc' && options.skipTypeCheck == null) {
155
+ options.skipTypeCheck = false;
156
+ }
157
+ const name = (0, devkit_1.names)(options.name).fileName;
158
+ const projectDirectory = options.directory
159
+ ? `${(0, devkit_1.names)(options.directory).fileName}/${name}`
160
+ : name;
161
+ if (!options.unitTestRunner && options.config !== 'npm-scripts') {
162
+ options.unitTestRunner = 'jest';
163
+ }
164
+ if (!options.linter && options.config !== 'npm-scripts') {
165
+ options.linter = linter_1.Linter.EsLint;
166
+ }
167
+ const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');
168
+ const fileName = getCaseAwareFileName({
169
+ fileName: options.simpleModuleName ? name : projectName,
170
+ pascalCaseFiles: options.pascalCaseFiles,
171
+ });
172
+ const { npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
173
+ const projectRoot = (0, devkit_1.joinPathFragments)(destinationDir, projectDirectory);
174
+ const parsedTags = options.tags
175
+ ? options.tags.split(',').map((s) => s.trim())
176
+ : [];
177
+ const defaultImportPath = `@${npmScope}/${projectDirectory}`;
178
+ const importPath = options.importPath || defaultImportPath;
179
+ return Object.assign(Object.assign({}, options), { fileName, name: projectName, projectRoot,
180
+ projectDirectory,
181
+ parsedTags,
182
+ importPath });
183
+ }
184
+ function getCaseAwareFileName(options) {
185
+ const normalized = (0, devkit_1.names)(options.fileName);
186
+ return options.pascalCaseFiles ? normalized.className : normalized.fileName;
187
+ }
188
+ function updateRootTsConfig(host, options) {
189
+ (0, devkit_1.updateJson)(host, 'tsconfig.base.json', (json) => {
190
+ const c = json.compilerOptions;
191
+ c.paths = c.paths || {};
192
+ delete c.paths[options.name];
193
+ if (c.paths[options.importPath]) {
194
+ throw new Error(`You already have a library using the import path "${options.importPath}". Make sure to specify a unique one.`);
195
+ }
196
+ c.paths[options.importPath] = [
197
+ (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
198
+ ];
199
+ return json;
200
+ });
201
+ }
15
202
  exports.default = libraryGenerator;
16
203
  exports.librarySchematic = (0, devkit_1.convertNxGenerator)(libraryGenerator);
17
204
  //# 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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"}
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';
package/src/index.js CHANGED
@@ -1,11 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.applicationGenerator = exports.libraryGenerator = void 0;
3
+ exports.libraryGenerator = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  (0, tslib_1.__exportStar)(require("./utils/typescript/print-diagnostics"), exports);
6
6
  (0, tslib_1.__exportStar)(require("./utils/typescript/run-type-check"), exports);
7
7
  var library_1 = require("./generators/library/library");
8
8
  Object.defineProperty(exports, "libraryGenerator", { enumerable: true, get: function () { return library_1.libraryGenerator; } });
9
- var application_1 = require("./generators/application/application");
10
- Object.defineProperty(exports, "applicationGenerator", { enumerable: true, get: function () { return application_1.applicationGenerator; } });
11
9
  //# sourceMappingURL=index.js.map
package/src/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/js/src/index.ts"],"names":[],"mappings":";;;;AAAA,oFAAqD;AACrD,iFAAkD;AAClD,wDAAgE;AAAvD,2GAAA,gBAAgB,OAAA;AACzB,oEAA4E;AAAnE,mHAAA,oBAAoB,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/js/src/index.ts"],"names":[],"mappings":";;;;AAAA,oFAAqD;AACrD,iFAAkD;AAClD,wDAAgE;AAAvD,2GAAA,gBAAgB,OAAA"}
@@ -0,0 +1,2 @@
1
+ import { Tree } from '@nrwl/devkit';
2
+ export default function update(host: Tree): Promise<import("@nrwl/devkit").GeneratorCallback>;
@@ -0,0 +1,28 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const tslib_1 = require("tslib");
4
+ const devkit_1 = require("@nrwl/devkit");
5
+ const versions_1 = require("@nrwl/workspace/src/utils/versions");
6
+ function update(host) {
7
+ var _a, _b;
8
+ return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
9
+ const projects = (0, devkit_1.getProjects)(host);
10
+ let installNeeded = false;
11
+ for (const [name, config] of projects.entries()) {
12
+ if (((_b = (_a = config === null || config === void 0 ? void 0 : config.targets) === null || _a === void 0 ? void 0 : _a.serve) === null || _b === void 0 ? void 0 : _b.executor) !== '@nrwl/js:node')
13
+ continue;
14
+ config.targets.serve.executor = '@nrwl/node:node';
15
+ installNeeded = true;
16
+ (0, devkit_1.updateProjectConfiguration)(host, name, config);
17
+ }
18
+ const task = installNeeded
19
+ ? (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
20
+ '@nrwl/node': versions_1.nxVersion,
21
+ })
22
+ : undefined;
23
+ yield (0, devkit_1.formatFiles)(host);
24
+ return task;
25
+ });
26
+ }
27
+ exports.default = update;
28
+ //# sourceMappingURL=update-node-executor.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"update-node-executor.js","sourceRoot":"","sources":["../../../../../../packages/js/src/migrations/update-13-9-0/update-node-executor.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,iEAA+D;AAE/D,SAA8B,MAAM,CAAC,IAAU;;;QAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,IAAI,aAAa,GAAG,KAAK,CAAC;QAE1B,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE;YAC/C,IAAI,CAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,0CAAE,KAAK,0CAAE,QAAQ,MAAK,eAAe;gBAAE,SAAS;YAEnE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,iBAAiB,CAAC;YAElD,aAAa,GAAG,IAAI,CAAC;YACrB,IAAA,mCAA0B,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;SAChD;QAED,MAAM,IAAI,GAAG,aAAa;YACxB,CAAC,CAAC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,YAAY,EAAE,oBAAS;aACxB,CACF;YACH,CAAC,CAAC,SAAS,CAAC;QAEd,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,IAAI,CAAC;;CACb;AA1BD,yBA0BC"}
@@ -1,5 +1,8 @@
1
- import { ExecutorContext } from '@nrwl/devkit';
1
+ import { ExecutorContext, ProjectGraphProjectNode } from '@nrwl/devkit';
2
+ import { DependentBuildableProjectNode } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
2
3
  export declare function checkDependencies(context: ExecutorContext, tsConfigPath: string): {
3
4
  tmpTsConfig: string | null;
4
5
  projectRoot: string;
6
+ target: ProjectGraphProjectNode<any>;
7
+ dependencies: DependentBuildableProjectNode[];
5
8
  };
@@ -20,11 +20,15 @@ function checkDependencies(context, tsConfigPath) {
20
20
  return {
21
21
  tmpTsConfig: (0, buildable_libs_utils_1.createTmpTsConfig)(tsConfigPath, context.root, projectRoot, dependencies),
22
22
  projectRoot,
23
+ target,
24
+ dependencies,
23
25
  };
24
26
  }
25
27
  return {
26
28
  tmpTsConfig: null,
27
29
  projectRoot,
30
+ target,
31
+ dependencies,
28
32
  };
29
33
  }
30
34
  exports.checkDependencies = checkDependencies;
@@ -1 +1 @@
1
- {"version":3,"file":"check-dependencies.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/check-dependencies.ts"],"names":[],"mappings":";;;AACA,0EAAgF;AAChF,6FAI4D;AAG5D,SAAgB,iBAAiB,CAC/B,OAAwB,EACxB,YAAoB;IAKpB,MAAM,YAAY,GAAG,IAAA,sCAAsB,GAAE,CAAC;IAC9C,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,wBAAwB,EAAE,GACtD,IAAA,mDAA4B,EAC1B,YAAY,EACZ,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,iBAAiB,CAC1B,CAAC;IACJ,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;IAErC,IAAI,wBAAwB,CAAC,MAAM,GAAG,CAAC,EAAE;QACvC,MAAM,IAAI,KAAK,CACb,yFACE,OAAO,CAAC,UACV,wCAAwC,wBAAwB;aAC7D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;aACpB,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;KACH;IAED,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;QAC3B,MAAM,yBAAyB,GAAG,IAAA,0DAAmC,EACnE,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,YAAY,CACb,CAAC;QACF,IAAI,CAAC,yBAAyB,EAAE;YAC9B,MAAM,IAAI,KAAK,CACb,yBAAyB,OAAO,CAAC,WAAW,mDAAmD,OAAO,CAAC,UAAU,8BAA8B,CAChJ,CAAC;SACH;QACD,OAAO;YACL,WAAW,EAAE,IAAA,wCAAiB,EAC5B,YAAY,EACZ,OAAO,CAAC,IAAI,EACZ,WAAW,EACX,YAAY,CACb;YACD,WAAW;SACZ,CAAC;KACH;IAED,OAAO;QACL,WAAW,EAAE,IAAI;QACjB,WAAW;KACZ,CAAC;AACJ,CAAC;AAvDD,8CAuDC"}
1
+ {"version":3,"file":"check-dependencies.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/check-dependencies.ts"],"names":[],"mappings":";;;AACA,0EAAgF;AAChF,6FAK4D;AAE5D,SAAgB,iBAAiB,CAC/B,OAAwB,EACxB,YAAoB;IAOpB,MAAM,YAAY,GAAG,IAAA,sCAAsB,GAAE,CAAC;IAC9C,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,wBAAwB,EAAE,GACtD,IAAA,mDAA4B,EAC1B,YAAY,EACZ,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,iBAAiB,CAC1B,CAAC;IACJ,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;IAErC,IAAI,wBAAwB,CAAC,MAAM,GAAG,CAAC,EAAE;QACvC,MAAM,IAAI,KAAK,CACb,yFACE,OAAO,CAAC,UACV,wCAAwC,wBAAwB;aAC7D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;aACpB,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;KACH;IAED,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;QAC3B,MAAM,yBAAyB,GAAG,IAAA,0DAAmC,EACnE,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,YAAY,CACb,CAAC;QACF,IAAI,CAAC,yBAAyB,EAAE;YAC9B,MAAM,IAAI,KAAK,CACb,yBAAyB,OAAO,CAAC,WAAW,mDAAmD,OAAO,CAAC,UAAU,8BAA8B,CAChJ,CAAC;SACH;QACD,OAAO;YACL,WAAW,EAAE,IAAA,wCAAiB,EAC5B,YAAY,EACZ,OAAO,CAAC,IAAI,EACZ,WAAW,EACX,YAAY,CACb;YACD,WAAW;YACX,MAAM;YACN,YAAY;SACb,CAAC;KACH;IAED,OAAO;QACL,WAAW,EAAE,IAAI;QACjB,WAAW;QACX,MAAM;QACN,YAAY;KACb,CAAC;AACJ,CAAC;AA7DD,8CA6DC"}
@@ -78,7 +78,8 @@ class CopyAssetsHandler {
78
78
  else {
79
79
  pattern = ag.pattern;
80
80
  }
81
- const files = yield fg(pattern, {
81
+ // fast-glob only supports Unix paths
82
+ const files = yield fg(pattern.replace(/\\/g, '/'), {
82
83
  cwd: this.rootDir,
83
84
  });
84
85
  this.callback(files.reduce((acc, src) => {