@nrwl/workspace 14.1.8 → 14.2.0-beta.0

Sign up to get free protection for your applications and to get access to all the features.
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.1.8](https://github.com/nrwl/nx/compare/14.1.7...14.1.8) (2022-05-24)
6
+ # [14.2.0-beta.0](https://github.com/nrwl/nx/compare/14.1.9...14.2.0-beta.0) (2022-05-30)
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": "14.1.8",
3
+ "version": "14.2.0-beta.0",
4
4
  "description": "Smart, Fast and Extensible Build System.",
5
5
  "repository": {
6
6
  "type": "git",
@@ -32,27 +32,27 @@
32
32
  "requirements": {},
33
33
  "migrations": "./migrations.json",
34
34
  "packageGroup": {
35
- "@nrwl/angular": "file:../angular",
36
- "@nrwl/cypress": "file:../cypress",
37
- "@nrwl/devkit": "file:../devkit",
38
- "@nrwl/eslint-plugin-nx": "file:../eslint-plugin-nx",
39
- "@nrwl/express": "file:../express",
40
- "@nrwl/jest": "file:../jest",
41
- "@nrwl/linter": "file:../linter",
42
- "@nrwl/nest": "file:../nest",
43
- "@nrwl/next": "file:../next",
44
- "@nrwl/node": "file:../node",
45
- "@nrwl/nx-plugin": "file:../nx-plugin",
46
- "@nrwl/react": "file:../react",
47
- "@nrwl/storybook": "file:../storybook",
48
- "@nrwl/web": "file:../web",
49
- "@nrwl/js": "file:../js",
50
- "@nrwl/cli": "file:../cli",
51
- "@nrwl/tao": "file:../tao",
35
+ "@nrwl/angular": "14.2.0-beta.0",
36
+ "@nrwl/cypress": "14.2.0-beta.0",
37
+ "@nrwl/devkit": "14.2.0-beta.0",
38
+ "@nrwl/eslint-plugin-nx": "14.2.0-beta.0",
39
+ "@nrwl/express": "14.2.0-beta.0",
40
+ "@nrwl/jest": "14.2.0-beta.0",
41
+ "@nrwl/linter": "14.2.0-beta.0",
42
+ "@nrwl/nest": "14.2.0-beta.0",
43
+ "@nrwl/next": "14.2.0-beta.0",
44
+ "@nrwl/node": "14.2.0-beta.0",
45
+ "@nrwl/nx-plugin": "14.2.0-beta.0",
46
+ "@nrwl/react": "14.2.0-beta.0",
47
+ "@nrwl/storybook": "14.2.0-beta.0",
48
+ "@nrwl/web": "14.2.0-beta.0",
49
+ "@nrwl/js": "14.2.0-beta.0",
50
+ "@nrwl/cli": "14.2.0-beta.0",
51
+ "@nrwl/tao": "14.2.0-beta.0",
52
52
  "@nrwl/nx-cloud": "latest",
53
- "@nrwl/react-native": "file:../react-native",
54
- "@nrwl/detox": "file:../detox",
55
- "nx": "file:../nx"
53
+ "@nrwl/react-native": "14.2.0-beta.0",
54
+ "@nrwl/detox": "14.2.0-beta.0",
55
+ "nx": "14.2.0-beta.0"
56
56
  }
57
57
  },
58
58
  "peerDependencies": {
@@ -64,9 +64,9 @@
64
64
  }
65
65
  },
66
66
  "dependencies": {
67
- "@nrwl/devkit": "14.1.8",
68
- "@nrwl/jest": "14.1.8",
69
- "@nrwl/linter": "14.1.8",
67
+ "@nrwl/devkit": "14.2.0-beta.0",
68
+ "@nrwl/jest": "14.2.0-beta.0",
69
+ "@nrwl/linter": "14.2.0-beta.0",
70
70
  "@parcel/watcher": "2.0.4",
71
71
  "chalk": "4.1.0",
72
72
  "chokidar": "^3.5.1",
@@ -79,9 +79,9 @@
79
79
  "fs-extra": "^10.1.0",
80
80
  "glob": "7.1.4",
81
81
  "ignore": "^5.0.4",
82
- "minimatch": "3.0.4",
82
+ "minimatch": "3.0.5",
83
83
  "npm-run-path": "^4.0.1",
84
- "nx": "14.1.8",
84
+ "nx": "14.2.0-beta.0",
85
85
  "open": "^8.4.0",
86
86
  "rxjs": "^6.5.4",
87
87
  "semver": "7.3.4",
@@ -90,5 +90,5 @@
90
90
  "yargs": "^17.4.0",
91
91
  "yargs-parser": "21.0.1"
92
92
  },
93
- "gitHead": "658d8fd19acd5123895cd4bd2fe9fac5a6952899"
93
+ "gitHead": "62afcb79b0347bd0e4e960543ef23f0c064df79c"
94
94
  }
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.createPackageJson = void 0;
4
4
  const devkit_1 = require("@nrwl/devkit");
5
+ const object_sort_1 = require("nx/src/utils/object-sort");
5
6
  /**
6
7
  * Creates a package.json in the output directory for support to install dependencies within containers.
7
8
  *
@@ -36,6 +37,8 @@ function createPackageJson(projectName, graph, options) {
36
37
  packageJson.dependencies[packageName] = version;
37
38
  }
38
39
  });
40
+ packageJson.devDependencies && (packageJson.devDependencies = (0, object_sort_1.sortObjectByKeys)(packageJson.devDependencies));
41
+ packageJson.dependencies && (packageJson.dependencies = (0, object_sort_1.sortObjectByKeys)(packageJson.dependencies));
39
42
  return packageJson;
40
43
  }
41
44
  exports.createPackageJson = createPackageJson;
@@ -1 +1 @@
1
- {"version":3,"file":"create-package-json.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/create-package-json.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"create-package-json.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/create-package-json.ts"],"names":[],"mappings":"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"}
@@ -1,31 +1 @@
1
- export interface PluginGenerator {
2
- factory: string;
3
- schema: string;
4
- description: string;
5
- aliases: string;
6
- hidden: boolean;
7
- }
8
- export interface PluginExecutor {
9
- implementation: string;
10
- schema: string;
11
- description: string;
12
- }
13
- export interface PluginCapabilities {
14
- name: string;
15
- executors: {
16
- [name: string]: PluginExecutor;
17
- };
18
- generators: {
19
- [name: string]: PluginGenerator;
20
- };
21
- }
22
- export interface CorePlugin {
23
- name: string;
24
- capabilities: 'executors' | 'generators' | 'executors,generators';
25
- link?: string;
26
- }
27
- export interface CommunityPlugin {
28
- name: string;
29
- url: string;
30
- description: string;
31
- }
1
+ export * from 'nx/src/utils/plugins/models';
@@ -1,3 +1,5 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ const tslib_1 = require("tslib");
4
+ tslib_1.__exportStar(require("nx/src/utils/plugins/models"), exports);
3
5
  //# sourceMappingURL=models.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"models.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/models.ts"],"names":[],"mappings":""}
1
+ {"version":3,"file":"models.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/models.ts"],"names":[],"mappings":";;;AAAA,sEAA4C"}
@@ -2,8 +2,8 @@ import { Rule, Tree } from '@angular-devkit/schematics';
2
2
  import { TestingArchitectHost } from '@angular-devkit/architect/testing';
3
3
  import { Architect } from '@angular-devkit/architect';
4
4
  import { MockBuilderContext } from './testing-utils';
5
- export declare function runExternalSchematic<T = any>(collectionName: string, schematicName: string, options: T, tree: Tree): Promise<import("@angular-devkit/schematics/testing").UnitTestTree>;
6
- export declare function runSchematic<T = any>(schematicName: string, options: T, tree: Tree): Promise<import("@angular-devkit/schematics/testing").UnitTestTree>;
5
+ export declare function runExternalSchematic<T extends object = any>(collectionName: string, schematicName: string, options: T, tree: Tree): Promise<import("@angular-devkit/schematics/testing").UnitTestTree>;
6
+ export declare function runSchematic<T extends object = any>(schematicName: string, options: T, tree: Tree): Promise<import("@angular-devkit/schematics/testing").UnitTestTree>;
7
7
  export declare function callRule(rule: Rule, tree: Tree): Promise<import("@angular-devkit/schematics/src/tree/interface").Tree>;
8
8
  export declare function runMigration(migrationName: string, options: any, tree: Tree): Promise<import("@angular-devkit/schematics/testing").UnitTestTree>;
9
9
  export declare function createLibWithTests(tree: Tree, libName: string, testBuilder: string, testSetupFile: string): Promise<Tree>;
@@ -1,8 +1,8 @@
1
1
  export declare const nxVersion: any;
2
- export declare const angularCliVersion = "~13.3.0";
2
+ export declare const angularCliVersion = "~14.0.0-rc.2";
3
3
  export declare const typescriptVersion = "~4.6.2";
4
4
  export declare const prettierVersion = "^2.5.1";
5
5
  export declare const tslintVersion = "~6.1.0";
6
- export declare const typescriptESLintVersion = "~5.18.0";
7
- export declare const eslintVersion = "~8.12.0";
6
+ export declare const typescriptESLintVersion = "~5.24.0";
7
+ export declare const eslintVersion = "~8.15.0";
8
8
  export declare const eslintConfigPrettierVersion = "8.1.0";
@@ -2,11 +2,11 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.tslintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
4
4
  exports.nxVersion = require('../../package.json').version;
5
- exports.angularCliVersion = '~13.3.0';
5
+ exports.angularCliVersion = '~14.0.0-rc.2';
6
6
  exports.typescriptVersion = '~4.6.2';
7
7
  exports.prettierVersion = '^2.5.1';
8
8
  exports.tslintVersion = '~6.1.0';
9
- exports.typescriptESLintVersion = '~5.18.0';
10
- exports.eslintVersion = '~8.12.0';
9
+ exports.typescriptESLintVersion = '~5.24.0';
10
+ exports.eslintVersion = '~8.15.0';
11
11
  exports.eslintConfigPrettierVersion = '8.1.0';
12
12
  //# sourceMappingURL=versions.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,aAAa,GAAG,QAAQ,CAAC;AACzB,QAAA,uBAAuB,GAAG,SAAS,CAAC;AACpC,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,2BAA2B,GAAG,OAAO,CAAC"}
1
+ {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,iBAAiB,GAAG,cAAc,CAAC;AACnC,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,aAAa,GAAG,QAAQ,CAAC;AACzB,QAAA,uBAAuB,GAAG,SAAS,CAAC;AACpC,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,2BAA2B,GAAG,OAAO,CAAC"}