@nrwl/workspace 15.8.6 → 15.8.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. package/package.json +31 -31
  2. package/src/generators/move/lib/update-cypress-config.js +8 -2
  3. package/src/generators/move/lib/update-cypress-config.js.map +1 -1
  4. package/src/generators/remove/lib/check-project-is-safe-to-remove.js +1 -1
  5. package/src/generators/remove/lib/check-project-is-safe-to-remove.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/workspace",
3
- "version": "15.8.6",
3
+ "version": "15.8.8",
4
4
  "private": false,
5
5
  "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
6
6
  "repository": {
@@ -19,7 +19,7 @@
19
19
  "Cypress",
20
20
  "CLI"
21
21
  ],
22
- "main": "./index.js",
22
+ "main": "./index",
23
23
  "typings": "./index.d.ts",
24
24
  "author": "Victor Savkin",
25
25
  "license": "MIT",
@@ -33,32 +33,32 @@
33
33
  "requirements": {},
34
34
  "migrations": "./migrations.json",
35
35
  "packageGroup": {
36
- "@nrwl/js": "15.8.6",
37
- "@nrwl/jest": "15.8.6",
38
- "@nrwl/linter": "15.8.6",
39
- "@nrwl/angular": "15.8.6",
40
- "@nrwl/cli": "15.8.6",
41
- "@nrwl/cypress": "15.8.6",
42
- "@nrwl/detox": "15.8.6",
43
- "@nrwl/devkit": "15.8.6",
44
- "@nrwl/esbuild": "15.8.6",
45
- "@nrwl/eslint-plugin-nx": "15.8.6",
46
- "@nrwl/expo": "15.8.6",
47
- "@nrwl/express": "15.8.6",
48
- "@nrwl/nest": "15.8.6",
49
- "@nrwl/next": "15.8.6",
50
- "@nrwl/node": "15.8.6",
36
+ "@nrwl/js": "15.8.8",
37
+ "@nrwl/jest": "15.8.8",
38
+ "@nrwl/linter": "15.8.8",
39
+ "@nrwl/angular": "15.8.8",
40
+ "@nrwl/cli": "15.8.8",
41
+ "@nrwl/cypress": "15.8.8",
42
+ "@nrwl/detox": "15.8.8",
43
+ "@nrwl/devkit": "15.8.8",
44
+ "@nrwl/esbuild": "15.8.8",
45
+ "@nrwl/eslint-plugin-nx": "15.8.8",
46
+ "@nrwl/expo": "15.8.8",
47
+ "@nrwl/express": "15.8.8",
48
+ "@nrwl/nest": "15.8.8",
49
+ "@nrwl/next": "15.8.8",
50
+ "@nrwl/node": "15.8.8",
51
51
  "@nrwl/nx-cloud": "latest",
52
- "@nrwl/nx-plugin": "15.8.6",
53
- "@nrwl/react-native": "15.8.6",
54
- "@nrwl/react": "15.8.6",
55
- "@nrwl/rollup": "15.8.6",
56
- "@nrwl/storybook": "15.8.6",
57
- "@nrwl/tao": "15.8.6",
58
- "@nrwl/vite": "15.8.6",
59
- "@nrwl/web": "15.8.6",
60
- "@nrwl/webpack": "15.8.6",
61
- "nx": "15.8.6"
52
+ "@nrwl/nx-plugin": "15.8.8",
53
+ "@nrwl/react-native": "15.8.8",
54
+ "@nrwl/react": "15.8.8",
55
+ "@nrwl/rollup": "15.8.8",
56
+ "@nrwl/storybook": "15.8.8",
57
+ "@nrwl/tao": "15.8.8",
58
+ "@nrwl/vite": "15.8.8",
59
+ "@nrwl/web": "15.8.8",
60
+ "@nrwl/webpack": "15.8.8",
61
+ "nx": "15.8.8"
62
62
  }
63
63
  },
64
64
  "peerDependencies": {
@@ -70,8 +70,8 @@
70
70
  }
71
71
  },
72
72
  "dependencies": {
73
- "@nrwl/devkit": "15.8.6",
74
- "@nrwl/linter": "15.8.6",
73
+ "@nrwl/devkit": "15.8.8",
74
+ "@nrwl/linter": "15.8.8",
75
75
  "@parcel/watcher": "2.0.4",
76
76
  "chalk": "^4.1.0",
77
77
  "chokidar": "^3.5.1",
@@ -84,7 +84,7 @@
84
84
  "ignore": "^5.0.4",
85
85
  "minimatch": "3.0.5",
86
86
  "npm-run-path": "^4.0.1",
87
- "nx": "15.8.6",
87
+ "nx": "15.8.8",
88
88
  "open": "^8.4.0",
89
89
  "rxjs": "^6.5.4",
90
90
  "semver": "7.3.4",
@@ -97,5 +97,5 @@
97
97
  "access": "public"
98
98
  },
99
99
  "types": "./index.d.ts",
100
- "gitHead": "7bf2c6a34189a34bff8ad526cea6d936de33ec31"
100
+ "gitHead": "6711c0ba67e76c42673240ed40e7125d9a61a127"
101
101
  }
package/src/generators/move/lib/update-cypress-config.js CHANGED
@@ -13,8 +13,14 @@ function updateCypressConfig(tree, schema, project) {
13
13
  const cypressJsonPath = path.join(schema.relativeToRootDestination, 'cypress.json');
14
14
  if (tree.exists(cypressJsonPath)) {
15
15
  const cypressJson = JSON.parse(tree.read(cypressJsonPath).toString('utf-8'));
16
- cypressJson.videosFolder = cypressJson.videosFolder.replace(project.root, schema.relativeToRootDestination);
17
- cypressJson.screenshotsFolder = cypressJson.screenshotsFolder.replace(project.root, schema.relativeToRootDestination);
16
+ // videosFolder is not required because videos can be turned off - it also has a default
17
+ if (cypressJson.videosFolder) {
18
+ cypressJson.videosFolder = cypressJson.videosFolder.replace(project.root, schema.relativeToRootDestination);
19
+ }
20
+ // screenshotsFolder is not required as it has a default
21
+ if (cypressJson.screenshotsFolder) {
22
+ cypressJson.screenshotsFolder = cypressJson.screenshotsFolder.replace(project.root, schema.relativeToRootDestination);
23
+ }
18
24
  tree.write(cypressJsonPath, JSON.stringify(cypressJson));
19
25
  return tree;
20
26
  }
package/src/generators/move/lib/update-cypress-config.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"update-cypress-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-cypress-config.ts"],"names":[],"mappings":";;;AACA,6BAA6B;AAQ7B;;;;;;GAMG;AACH,SAAgB,mBAAmB,CACjC,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAC/B,MAAM,CAAC,yBAAyB,EAChC,cAAc,CACf,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QAChC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CACvB,CAAC;QACxB,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC,OAAO,CACzD,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,yBAAyB,CACjC,CAAC;QACF,WAAW,CAAC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC,OAAO,CACnE,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,yBAAyB,CACjC,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;KACb;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CACjC,MAAM,CAAC,yBAAyB,EAChC,mBAAmB,CACpB,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;QAClC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,IAAI,MAAM,CAAC,IAAI,MAAM,CAAC,WAAW,GAAG,EAAE,GAAG,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,UAAU;aAC1B,OAAO,CAAC,QAAQ,EAAE,IAAI,MAAM,CAAC,cAAc,GAAG,CAAC;aAC/C,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,yBAAyB,CAAC,CAAC;QAEtD,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;KAC3C;AACH,CAAC;AAzCD,kDAyCC"}
1
+ {"version":3,"file":"update-cypress-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-cypress-config.ts"],"names":[],"mappings":";;;AACA,6BAA6B;AAQ7B;;;;;;GAMG;AACH,SAAgB,mBAAmB,CACjC,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAC/B,MAAM,CAAC,yBAAyB,EAChC,cAAc,CACf,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QAChC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CACvB,CAAC;QACxB,wFAAwF;QACxF,IAAI,WAAW,CAAC,YAAY,EAAE;YAC5B,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC,OAAO,CACzD,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,yBAAyB,CACjC,CAAC;SACH;QACD,wDAAwD;QACxD,IAAI,WAAW,CAAC,iBAAiB,EAAE;YACjC,WAAW,CAAC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC,OAAO,CACnE,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,yBAAyB,CACjC,CAAC;SACH;QAED,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;KACb;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CACjC,MAAM,CAAC,yBAAyB,EAChC,mBAAmB,CACpB,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;QAClC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,IAAI,MAAM,CAAC,IAAI,MAAM,CAAC,WAAW,GAAG,EAAE,GAAG,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,UAAU;aAC1B,OAAO,CAAC,QAAQ,EAAE,IAAI,MAAM,CAAC,cAAc,GAAG,CAAC;aAC/C,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,yBAAyB,CAAC,CAAC;QAEtD,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;KAC3C;AACH,CAAC;AA/CD,kDA+CC"}
package/src/generators/remove/lib/check-project-is-safe-to-remove.js CHANGED
@@ -14,7 +14,7 @@ function checkProjectIsSafeToRemove(tree, schema, project) {
14
14
  const containedProjects = [];
15
15
  for (const [_, p] of (0, devkit_1.getProjects)(tree)) {
16
16
  if (project.name !== p.name &&
17
- !(0, devkit_1.normalizePath)((0, path_1.relative)(project.root, p.root)).startsWith('../')) {
17
+ !(0, devkit_1.normalizePath)((0, path_1.relative)(project.root, p.root)).startsWith('..')) {
18
18
  containedProjects.push(p.name);
19
19
  }
20
20
  }
package/src/generators/remove/lib/check-project-is-safe-to-remove.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"check-project-is-safe-to-remove.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/check-project-is-safe-to-remove.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAEtB,+BAAgC;AAEhC,SAAgB,0BAA0B,CACxC,IAAU,EACV,MAAc,EACd,OAA6B;IAE7B,IAAI,OAAO,CAAC,IAAI,KAAK,GAAG,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,IAAI,MAAM,CAAC,WAAW,gFAAgF,CACvG,CAAC;KACH;IACD,IAAI,MAAM,CAAC,WAAW,EAAE;QACtB,eAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QAC7C,OAAO;KACR;IACD,MAAM,iBAAiB,GAAG,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;QACtC,IACE,OAAO,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI;YACvB,CAAC,IAAA,sBAAa,EAAC,IAAA,eAAQ,EAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,EAChE;YACA,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SAChC;KACF;IACD,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CACb,IACE,MAAM,CAAC,WACT,6HAA6H,iBAAiB,CAAC,IAAI,CACjJ,OAAO,CACR,0DAA0D,CAC5D,CAAC;KACH;AACH,CAAC;AAhCD,gEAgCC"}
1
+ {"version":3,"file":"check-project-is-safe-to-remove.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/check-project-is-safe-to-remove.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAEtB,+BAAgC;AAEhC,SAAgB,0BAA0B,CACxC,IAAU,EACV,MAAc,EACd,OAA6B;IAE7B,IAAI,OAAO,CAAC,IAAI,KAAK,GAAG,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,IAAI,MAAM,CAAC,WAAW,gFAAgF,CACvG,CAAC;KACH;IACD,IAAI,MAAM,CAAC,WAAW,EAAE;QACtB,eAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QAC7C,OAAO;KACR;IACD,MAAM,iBAAiB,GAAG,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;QACtC,IACE,OAAO,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI;YACvB,CAAC,IAAA,sBAAa,EAAC,IAAA,eAAQ,EAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAC/D;YACA,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SAChC;KACF;IACD,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CACb,IACE,MAAM,CAAC,WACT,6HAA6H,iBAAiB,CAAC,IAAI,CACjJ,OAAO,CACR,0DAA0D,CAC5D,CAAC;KACH;AACH,CAAC;AAhCD,gEAgCC"}