@nrwl/js 14.2.4 → 14.3.0-beta.2

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.
package/.eslintrc.json CHANGED
@@ -13,6 +13,20 @@
13
13
  {
14
14
  "files": ["*.js", "*.jsx"],
15
15
  "rules": {}
16
+ },
17
+ {
18
+ "files": [
19
+ "./package.json",
20
+ "./generators.json",
21
+ "./executors.json",
22
+ "./generators.json",
23
+ "./executors.json",
24
+ "./migrations.json"
25
+ ],
26
+ "parser": "jsonc-eslint-parser",
27
+ "rules": {
28
+ "@nrwl/nx/nx-plugin-checks": "error"
29
+ }
16
30
  }
17
31
  ]
18
32
  }
package/CHANGELOG.md CHANGED
@@ -3,6 +3,6 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
- ## [14.2.4](https://github.com/nrwl/nx/compare/14.2.2...14.2.4) (2022-06-09)
6
+ # [14.3.0-beta.2](https://github.com/nrwl/nx/compare/14.2.2...14.3.0-beta.2) (2022-06-11)
7
7
 
8
8
  **Note:** Version bump only for package @nrwl/js
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/js",
3
- "version": "14.2.4",
3
+ "version": "14.3.0-beta.2",
4
4
  "description": "The Nx plugin that provides the best experience for developing JavaScript and TypeScript projects.",
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/devkit": "14.2.4",
35
- "@nrwl/jest": "14.2.4",
36
- "@nrwl/linter": "14.2.4",
37
- "@nrwl/workspace": "14.2.4",
34
+ "@nrwl/devkit": "14.3.0-beta.2",
35
+ "@nrwl/jest": "14.3.0-beta.2",
36
+ "@nrwl/linter": "14.3.0-beta.2",
37
+ "@nrwl/workspace": "14.3.0-beta.2",
38
38
  "@parcel/watcher": "2.0.4",
39
39
  "chalk": "4.1.0",
40
40
  "fast-glob": "3.2.7",
@@ -45,5 +45,5 @@
45
45
  "source-map-support": "0.5.19",
46
46
  "tree-kill": "1.2.2"
47
47
  },
48
- "gitHead": "3e3ab094cf1a7cc7c126919622cc7dac011ddd97"
48
+ "gitHead": "0fd3281d3c7dc7c086adfe754ce1be85b0f890bb"
49
49
  }
@@ -2,12 +2,12 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.CopyAssetsHandler = exports.defaultFileEventHandler = void 0;
4
4
  const tslib_1 = require("tslib");
5
+ const devkit_1 = require("@nrwl/devkit");
6
+ const fg = require("fast-glob");
7
+ const fse = require("fs-extra");
5
8
  const minimatch = require("minimatch");
9
+ const ignore_1 = require("nx/src/utils/ignore");
6
10
  const path = require("path");
7
- const fse = require("fs-extra");
8
- const ignore_1 = require("ignore");
9
- const fg = require("fast-glob");
10
- const devkit_1 = require("@nrwl/devkit");
11
11
  const defaultFileEventHandler = (events) => {
12
12
  const dirs = new Set(events.map((event) => path.dirname(event.dest)));
13
13
  dirs.forEach((d) => fse.ensureDirSync(d));
@@ -31,14 +31,7 @@ class CopyAssetsHandler {
31
31
  this.projectDir = opts.projectDir;
32
32
  this.outputDir = opts.outputDir;
33
33
  this.callback = (_a = opts.callback) !== null && _a !== void 0 ? _a : exports.defaultFileEventHandler;
34
- // TODO(jack): Should handle nested .gitignore files
35
- this.ignore = (0, ignore_1.default)();
36
- const gitignore = path.join(opts.rootDir, '.gitignore');
37
- const nxignore = path.join(opts.rootDir, '.nxignore');
38
- if (fse.existsSync(gitignore))
39
- this.ignore.add(fse.readFileSync(gitignore).toString());
40
- if (fse.existsSync(nxignore))
41
- this.ignore.add(fse.readFileSync(nxignore).toString());
34
+ this.ignore = (0, ignore_1.createIgnore)(opts.rootDir);
42
35
  this.assetGlobs = opts.assets.map((f) => {
43
36
  let isGlob = false;
44
37
  let pattern;
@@ -1 +1 @@
1
- {"version":3,"file":"copy-assets-handler.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/copy-assets-handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"copy-assets-handler.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/copy-assets-handler.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@ exports.updatePackageJson = void 0;
4
4
  const devkit_1 = require("@nrwl/devkit");
5
5
  const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
6
6
  const path_1 = require("path");
7
+ const fileutils_1 = require("nx/src/utils/fileutils");
7
8
  function getMainFileDirRelativeToProjectRoot(main, projectRoot) {
8
9
  const mainFileDir = (0, path_1.dirname)(main);
9
10
  const relativeDir = (0, devkit_1.normalizePath)((0, path_1.relative)(projectRoot, mainFileDir));
@@ -11,7 +12,10 @@ function getMainFileDirRelativeToProjectRoot(main, projectRoot) {
11
12
  }
12
13
  function updatePackageJson(options, context, target, dependencies, withTypings = true) {
13
14
  var _a, _b;
14
- const packageJson = (0, devkit_1.readJsonFile)((0, path_1.join)(options.projectRoot, 'package.json'));
15
+ const pathToPackageJson = (0, path_1.join)(context.root, options.projectRoot, 'package.json');
16
+ const packageJson = (0, fileutils_1.fileExists)(pathToPackageJson)
17
+ ? (0, devkit_1.readJsonFile)(pathToPackageJson)
18
+ : { name: context.projectName };
15
19
  const mainFile = (0, path_1.basename)(options.main).replace(/\.[tj]s$/, '');
16
20
  const relativeMainFileDir = getMainFileDirRelativeToProjectRoot(options.main, options.projectRoot);
17
21
  const mainJsFile = `${relativeMainFileDir}${mainFile}.js`;
@@ -1 +1 @@
1
- {"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/update-package-json.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,6FAG4D;AAC5D,+BAAyD;AAGzD,SAAS,mCAAmC,CAC1C,IAAY,EACZ,WAAmB;IAEnB,MAAM,WAAW,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;IAClC,MAAM,WAAW,GAAG,IAAA,sBAAa,EAAC,IAAA,eAAQ,EAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;IACtE,OAAO,WAAW,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,WAAW,GAAG,CAAC;AACzD,CAAC;AAED,SAAgB,iBAAiB,CAC/B,OAAkC,EAClC,OAAwB,EACxB,MAAoC,EACpC,YAA6C,EAC7C,WAAW,GAAG,IAAI;;IAElB,MAAM,WAAW,GAAG,IAAA,qBAAY,EAAC,IAAA,WAAI,EAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;IAE5E,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAChE,MAAM,mBAAmB,GAAG,mCAAmC,CAC7D,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,CACpB,CAAC;IACF,MAAM,UAAU,GAAG,GAAG,mBAAmB,GAAG,QAAQ,KAAK,CAAC;IAC1D,MAAM,WAAW,GAAG,GAAG,mBAAmB,GAAG,QAAQ,OAAO,CAAC;IAE7D,WAAW,CAAC,IAAI,GAAG,MAAA,WAAW,CAAC,IAAI,mCAAI,UAAU,CAAC;IAElD,IAAI,WAAW,EAAE;QACf,WAAW,CAAC,OAAO,GAAG,MAAA,WAAW,CAAC,OAAO,mCAAI,WAAW,CAAC;KAC1D;IAED,IAAA,sBAAa,EAAC,GAAG,OAAO,CAAC,UAAU,eAAe,EAAE,WAAW,CAAC,CAAC;IAEjE,IACE,YAAY,CAAC,MAAM,GAAG,CAAC;QACvB,OAAO,CAAC,uCAAuC,EAC/C;QACA,IAAA,oEAA6C,EAC3C,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,iBAAiB,EACzB,MAAM,EACN,YAAY,EACZ,OAAO,CAAC,qCAAqC,CAC9C,CAAC;KACH;AACH,CAAC;AAvCD,8CAuCC"}
1
+ {"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/update-package-json.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,6FAG4D;AAC5D,+BAAyD;AAEzD,sDAAoD;AAEpD,SAAS,mCAAmC,CAC1C,IAAY,EACZ,WAAmB;IAEnB,MAAM,WAAW,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;IAClC,MAAM,WAAW,GAAG,IAAA,sBAAa,EAAC,IAAA,eAAQ,EAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;IACtE,OAAO,WAAW,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,WAAW,GAAG,CAAC;AACzD,CAAC;AAED,SAAgB,iBAAiB,CAC/B,OAAkC,EAClC,OAAwB,EACxB,MAAoC,EACpC,YAA6C,EAC7C,WAAW,GAAG,IAAI;;IAElB,MAAM,iBAAiB,GAAG,IAAA,WAAI,EAC5B,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,cAAc,CACf,CAAC;IAEF,MAAM,WAAW,GAAG,IAAA,sBAAU,EAAC,iBAAiB,CAAC;QAC/C,CAAC,CAAC,IAAA,qBAAY,EAAC,iBAAiB,CAAC;QACjC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC;IAElC,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAChE,MAAM,mBAAmB,GAAG,mCAAmC,CAC7D,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,CACpB,CAAC;IACF,MAAM,UAAU,GAAG,GAAG,mBAAmB,GAAG,QAAQ,KAAK,CAAC;IAC1D,MAAM,WAAW,GAAG,GAAG,mBAAmB,GAAG,QAAQ,OAAO,CAAC;IAE7D,WAAW,CAAC,IAAI,GAAG,MAAA,WAAW,CAAC,IAAI,mCAAI,UAAU,CAAC;IAElD,IAAI,WAAW,EAAE;QACf,WAAW,CAAC,OAAO,GAAG,MAAA,WAAW,CAAC,OAAO,mCAAI,WAAW,CAAC;KAC1D;IAED,IAAA,sBAAa,EAAC,GAAG,OAAO,CAAC,UAAU,eAAe,EAAE,WAAW,CAAC,CAAC;IAEjE,IACE,YAAY,CAAC,MAAM,GAAG,CAAC;QACvB,OAAO,CAAC,uCAAuC,EAC/C;QACA,IAAA,oEAA6C,EAC3C,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,iBAAiB,EACzB,MAAM,EACN,YAAY,EACZ,OAAO,CAAC,qCAAqC,CAC9C,CAAC;KACH;AACH,CAAC;AA/CD,8CA+CC"}