@nrwl/workspace 15.4.0-beta.0 → 15.4.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.
Files changed (4) hide show
  1. package/CHANGELOG.md +1 -1
  2. package/package.json +29 -29
  3. package/src/generators/convert-to-nx-project/convert-to-nx-project.js +4 -4
  4. package/src/generators/convert-to-nx-project/convert-to-nx-project.js.map +1 -1
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
- # [15.4.0-beta.0](https://github.com/nrwl/nx/compare/15.3.3...15.4.0-beta.0) (2022-12-16)
6
+ # [15.4.0-beta.2](https://github.com/nrwl/nx/compare/15.3.3...15.4.0-beta.2) (2022-12-19)
7
7
 
8
8
  **Note:** Version bump only for package @nrwl/workspace
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/workspace",
3
- "version": "15.4.0-beta.0",
3
+ "version": "15.4.0-beta.2",
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": {
@@ -33,31 +33,31 @@
33
33
  "requirements": {},
34
34
  "migrations": "./migrations.json",
35
35
  "packageGroup": {
36
- "@nrwl/angular": "15.4.0-beta.0",
37
- "@nrwl/cli": "15.4.0-beta.0",
38
- "@nrwl/cypress": "15.4.0-beta.0",
39
- "@nrwl/detox": "15.4.0-beta.0",
40
- "@nrwl/devkit": "15.4.0-beta.0",
41
- "@nrwl/esbuild": "15.4.0-beta.0",
42
- "@nrwl/eslint-plugin-nx": "15.4.0-beta.0",
43
- "@nrwl/expo": "15.4.0-beta.0",
44
- "@nrwl/express": "15.4.0-beta.0",
45
- "@nrwl/jest": "15.4.0-beta.0",
46
- "@nrwl/js": "15.4.0-beta.0",
47
- "@nrwl/linter": "15.4.0-beta.0",
48
- "@nrwl/nest": "15.4.0-beta.0",
49
- "@nrwl/next": "15.4.0-beta.0",
50
- "@nrwl/node": "15.4.0-beta.0",
36
+ "@nrwl/angular": "15.4.0-beta.2",
37
+ "@nrwl/cli": "15.4.0-beta.2",
38
+ "@nrwl/cypress": "15.4.0-beta.2",
39
+ "@nrwl/detox": "15.4.0-beta.2",
40
+ "@nrwl/devkit": "15.4.0-beta.2",
41
+ "@nrwl/esbuild": "15.4.0-beta.2",
42
+ "@nrwl/eslint-plugin-nx": "15.4.0-beta.2",
43
+ "@nrwl/expo": "15.4.0-beta.2",
44
+ "@nrwl/express": "15.4.0-beta.2",
45
+ "@nrwl/jest": "15.4.0-beta.2",
46
+ "@nrwl/js": "15.4.0-beta.2",
47
+ "@nrwl/linter": "15.4.0-beta.2",
48
+ "@nrwl/nest": "15.4.0-beta.2",
49
+ "@nrwl/next": "15.4.0-beta.2",
50
+ "@nrwl/node": "15.4.0-beta.2",
51
51
  "@nrwl/nx-cloud": "latest",
52
- "@nrwl/nx-plugin": "15.4.0-beta.0",
53
- "@nrwl/react": "15.4.0-beta.0",
54
- "@nrwl/react-native": "15.4.0-beta.0",
55
- "@nrwl/rollup": "15.4.0-beta.0",
56
- "@nrwl/storybook": "15.4.0-beta.0",
57
- "@nrwl/tao": "15.4.0-beta.0",
58
- "@nrwl/web": "15.4.0-beta.0",
59
- "@nrwl/webpack": "15.4.0-beta.0",
60
- "nx": "15.4.0-beta.0"
52
+ "@nrwl/nx-plugin": "15.4.0-beta.2",
53
+ "@nrwl/react": "15.4.0-beta.2",
54
+ "@nrwl/react-native": "15.4.0-beta.2",
55
+ "@nrwl/rollup": "15.4.0-beta.2",
56
+ "@nrwl/storybook": "15.4.0-beta.2",
57
+ "@nrwl/tao": "15.4.0-beta.2",
58
+ "@nrwl/web": "15.4.0-beta.2",
59
+ "@nrwl/webpack": "15.4.0-beta.2",
60
+ "nx": "15.4.0-beta.2"
61
61
  }
62
62
  },
63
63
  "peerDependencies": {
@@ -69,8 +69,8 @@
69
69
  }
70
70
  },
71
71
  "dependencies": {
72
- "@nrwl/devkit": "15.4.0-beta.0",
73
- "@nrwl/linter": "15.4.0-beta.0",
72
+ "@nrwl/devkit": "15.4.0-beta.2",
73
+ "@nrwl/linter": "15.4.0-beta.2",
74
74
  "@parcel/watcher": "2.0.4",
75
75
  "chalk": "4.1.0",
76
76
  "chokidar": "^3.5.1",
@@ -86,7 +86,7 @@
86
86
  "jsonc-parser": "3.2.0",
87
87
  "minimatch": "3.0.5",
88
88
  "npm-run-path": "^4.0.1",
89
- "nx": "15.4.0-beta.0",
89
+ "nx": "15.4.0-beta.2",
90
90
  "open": "^8.4.0",
91
91
  "rxjs": "^6.5.4",
92
92
  "semver": "7.3.4",
@@ -99,5 +99,5 @@
99
99
  "access": "public"
100
100
  },
101
101
  "types": "./index.d.ts",
102
- "gitHead": "b94c7e58706ce3b2e70876b648c0b19bf649e01c"
102
+ "gitHead": "4e54b1a545497836fe4d7ee7807508c158d4a88c"
103
103
  }
package/src/generators/convert-to-nx-project/convert-to-nx-project.js CHANGED
@@ -2,9 +2,10 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.validateSchema = exports.SCHEMA_OPTIONS_ARE_MUTUALLY_EXCLUSIVE = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const path_1 = require("path");
6
- const enquirer_1 = require("enquirer");
7
5
  const devkit_1 = require("@nrwl/devkit");
6
+ const enquirer_1 = require("enquirer");
7
+ const project_configuration_1 = require("nx/src/generators/utils/project-configuration");
8
+ const path_1 = require("path");
8
9
  const get_project_configuration_path_1 = require("./utils/get-project-configuration-path");
9
10
  exports.SCHEMA_OPTIONS_ARE_MUTUALLY_EXCLUSIVE = '--project and --all are mutually exclusive';
10
11
  function validateSchema(schema) {
@@ -44,8 +45,7 @@ To upgrade change the version number at the top of ${(0, devkit_1.getWorkspacePa
44
45
  devkit_1.logger.warn(`Skipping ${project} since ${configPath} already exists.`);
45
46
  continue;
46
47
  }
47
- delete configuration.root;
48
- (0, devkit_1.writeJson)(host, configPath, configuration);
48
+ (0, devkit_1.writeJson)(host, configPath, Object.assign(Object.assign({ $schema: (0, project_configuration_1.getRelativeProjectJsonSchemaPath)(host, configuration) }, configuration), { root: undefined }));
49
49
  (0, devkit_1.updateJson)(host, (0, devkit_1.getWorkspacePath)(host), (value) => {
50
50
  value.projects[project] = (0, devkit_1.normalizePath)((0, path_1.dirname)(configPath));
51
51
  return value;
package/src/generators/convert-to-nx-project/convert-to-nx-project.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"convert-to-nx-project.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/convert-to-nx-project/convert-to-nx-project.ts"],"names":[],"mappings":";;;;AAAA,+BAA+B;AAC/B,uCAAkC;AAElC,yCAasB;AAGtB,2FAAqF;AAExE,QAAA,qCAAqC,GAChD,4CAA4C,CAAC;AAE/C,SAAsB,cAAc,CAAC,MAAc;;QACjD,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE;YAChC,MAAM,6CAAqC,CAAC;SAC7C;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;YAClC,MAAM,CAAC,OAAO,GAAG,CACf,MAAM,IAAA,iBAAM,EAAsB;gBAChC;oBACE,OAAO,EAAE,mCAAmC;oBAC5C,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,SAAS;iBAChB;aACF,CAAC,CACH,CAAC,OAAO,CAAC;SACX;IACH,CAAC;CAAA;AAhBD,wCAgBC;AAED,SAAsB,2BAA2B,CAAC,IAAU,EAAE,MAAc;;QAC1E,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;QACnD,IAAI,SAAS,CAAC,OAAO,GAAG,CAAC,EAAE;YACzB,eAAM,CAAC,KAAK,CAAC;;qDAEoC,IAAA,yBAAgB,EAC/D,IAAI,CACL;CACJ,CAAC,CAAC;YACC,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;SACjC;QAED,MAAM,cAAc,CAAC,MAAM,CAAC,CAAC;QAE7B,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG;YACzB,CAAC,CAAC,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE;YAC7B,CAAC,CAAE,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAG9D,CAAC;QAET,KAAK,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,QAAQ,EAAE;YAC/C,MAAM,UAAU,GAAG,IAAA,4DAA2B,EAAC,aAAa,CAAC,CAAC;YAC9D,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;gBAC3B,eAAM,CAAC,IAAI,CAAC,YAAY,OAAO,UAAU,UAAU,kBAAkB,CAAC,CAAC;gBACvE,SAAS;aACV;YAED,OAAO,aAAa,CAAC,IAAI,CAAC;YAE1B,IAAA,kBAAS,EAAC,IAAI,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;YAE3C,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,yBAAgB,EAAC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE;gBACjD,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,IAAA,sBAAa,EAAC,IAAA,cAAO,EAAC,UAAU,CAAC,CAAC,CAAC;gBAC7D,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAzCD,kEAyCC;AAED,kBAAe,2BAA2B,CAAC;AAE9B,QAAA,2BAA2B,GAAG,IAAA,2BAAkB,EAC3D,2BAA2B,CAC5B,CAAC"}
1
+ {"version":3,"file":"convert-to-nx-project.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/convert-to-nx-project/convert-to-nx-project.ts"],"names":[],"mappings":";;;;AAAA,yCAasB;AACtB,uCAAkC;AAClC,yFAAiG;AACjG,+BAA+B;AAE/B,2FAAqF;AAExE,QAAA,qCAAqC,GAChD,4CAA4C,CAAC;AAE/C,SAAsB,cAAc,CAAC,MAAc;;QACjD,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE;YAChC,MAAM,6CAAqC,CAAC;SAC7C;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;YAClC,MAAM,CAAC,OAAO,GAAG,CACf,MAAM,IAAA,iBAAM,EAAsB;gBAChC;oBACE,OAAO,EAAE,mCAAmC;oBAC5C,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,SAAS;iBAChB;aACF,CAAC,CACH,CAAC,OAAO,CAAC;SACX;IACH,CAAC;CAAA;AAhBD,wCAgBC;AAED,SAAsB,2BAA2B,CAAC,IAAU,EAAE,MAAc;;QAC1E,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;QACnD,IAAI,SAAS,CAAC,OAAO,GAAG,CAAC,EAAE;YACzB,eAAM,CAAC,KAAK,CAAC;;qDAEoC,IAAA,yBAAgB,EAC/D,IAAI,CACL;CACJ,CAAC,CAAC;YACC,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;SACjC;QAED,MAAM,cAAc,CAAC,MAAM,CAAC,CAAC;QAE7B,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG;YACzB,CAAC,CAAC,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE;YAC7B,CAAC,CAAE,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAG9D,CAAC;QAET,KAAK,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,QAAQ,EAAE;YAC/C,MAAM,UAAU,GAAG,IAAA,4DAA2B,EAAC,aAAa,CAAC,CAAC;YAC9D,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;gBAC3B,eAAM,CAAC,IAAI,CAAC,YAAY,OAAO,UAAU,UAAU,kBAAkB,CAAC,CAAC;gBACvE,SAAS;aACV;YAED,IAAA,kBAAS,EAAC,IAAI,EAAE,UAAU,gCACxB,OAAO,EAAE,IAAA,wDAAgC,EAAC,IAAI,EAAE,aAAa,CAAC,IAC3D,aAAa,KAChB,IAAI,EAAE,SAAS,IACf,CAAC;YAEH,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,yBAAgB,EAAC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE;gBACjD,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,IAAA,sBAAa,EAAC,IAAA,cAAO,EAAC,UAAU,CAAC,CAAC,CAAC;gBAC7D,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AA3CD,kEA2CC;AAED,kBAAe,2BAA2B,CAAC;AAE9B,QAAA,2BAA2B,GAAG,IAAA,2BAAkB,EAC3D,2BAA2B,CAC5B,CAAC"}