@nrwl/workspace 14.1.9-beta.1 → 14.2.0-beta.1
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +1 -1
- package/package.json +26 -26
- package/src/generators/workspace/workspace.js +7 -0
- package/src/generators/workspace/workspace.js.map +1 -1
- package/src/utilities/create-package-json.js +3 -0
- package/src/utilities/create-package-json.js.map +1 -1
- package/src/utilities/plugins/models.d.ts +1 -31
- package/src/utilities/plugins/models.js +2 -0
- package/src/utilities/plugins/models.js.map +1 -1
- package/src/utils/testing.d.ts +2 -2
- package/src/utils/versions.d.ts +3 -3
- package/src/utils/versions.js +3 -3
- package/src/utils/versions.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
|
-
|
|
6
|
+
# [14.2.0-beta.1](https://github.com/nrwl/nx/compare/14.1.9...14.2.0-beta.1) (2022-05-31)
|
|
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.
|
|
3
|
+
"version": "14.2.0-beta.1",
|
|
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": "14.
|
|
36
|
-
"@nrwl/cypress": "14.
|
|
37
|
-
"@nrwl/devkit": "14.
|
|
38
|
-
"@nrwl/eslint-plugin-nx": "14.
|
|
39
|
-
"@nrwl/express": "14.
|
|
40
|
-
"@nrwl/jest": "14.
|
|
41
|
-
"@nrwl/linter": "14.
|
|
42
|
-
"@nrwl/nest": "14.
|
|
43
|
-
"@nrwl/next": "14.
|
|
44
|
-
"@nrwl/node": "14.
|
|
45
|
-
"@nrwl/nx-plugin": "14.
|
|
46
|
-
"@nrwl/react": "14.
|
|
47
|
-
"@nrwl/storybook": "14.
|
|
48
|
-
"@nrwl/web": "14.
|
|
49
|
-
"@nrwl/js": "14.
|
|
50
|
-
"@nrwl/cli": "14.
|
|
51
|
-
"@nrwl/tao": "14.
|
|
35
|
+
"@nrwl/angular": "14.2.0-beta.1",
|
|
36
|
+
"@nrwl/cypress": "14.2.0-beta.1",
|
|
37
|
+
"@nrwl/devkit": "14.2.0-beta.1",
|
|
38
|
+
"@nrwl/eslint-plugin-nx": "14.2.0-beta.1",
|
|
39
|
+
"@nrwl/express": "14.2.0-beta.1",
|
|
40
|
+
"@nrwl/jest": "14.2.0-beta.1",
|
|
41
|
+
"@nrwl/linter": "14.2.0-beta.1",
|
|
42
|
+
"@nrwl/nest": "14.2.0-beta.1",
|
|
43
|
+
"@nrwl/next": "14.2.0-beta.1",
|
|
44
|
+
"@nrwl/node": "14.2.0-beta.1",
|
|
45
|
+
"@nrwl/nx-plugin": "14.2.0-beta.1",
|
|
46
|
+
"@nrwl/react": "14.2.0-beta.1",
|
|
47
|
+
"@nrwl/storybook": "14.2.0-beta.1",
|
|
48
|
+
"@nrwl/web": "14.2.0-beta.1",
|
|
49
|
+
"@nrwl/js": "14.2.0-beta.1",
|
|
50
|
+
"@nrwl/cli": "14.2.0-beta.1",
|
|
51
|
+
"@nrwl/tao": "14.2.0-beta.1",
|
|
52
52
|
"@nrwl/nx-cloud": "latest",
|
|
53
|
-
"@nrwl/react-native": "14.
|
|
54
|
-
"@nrwl/detox": "14.
|
|
55
|
-
"nx": "14.
|
|
53
|
+
"@nrwl/react-native": "14.2.0-beta.1",
|
|
54
|
+
"@nrwl/detox": "14.2.0-beta.1",
|
|
55
|
+
"nx": "14.2.0-beta.1"
|
|
56
56
|
}
|
|
57
57
|
},
|
|
58
58
|
"peerDependencies": {
|
|
@@ -64,9 +64,9 @@
|
|
|
64
64
|
}
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
|
-
"@nrwl/devkit": "14.
|
|
68
|
-
"@nrwl/jest": "14.
|
|
69
|
-
"@nrwl/linter": "14.
|
|
67
|
+
"@nrwl/devkit": "14.2.0-beta.1",
|
|
68
|
+
"@nrwl/jest": "14.2.0-beta.1",
|
|
69
|
+
"@nrwl/linter": "14.2.0-beta.1",
|
|
70
70
|
"@parcel/watcher": "2.0.4",
|
|
71
71
|
"chalk": "4.1.0",
|
|
72
72
|
"chokidar": "^3.5.1",
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
"ignore": "^5.0.4",
|
|
82
82
|
"minimatch": "3.0.5",
|
|
83
83
|
"npm-run-path": "^4.0.1",
|
|
84
|
-
"nx": "14.
|
|
84
|
+
"nx": "14.2.0-beta.1",
|
|
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": "
|
|
93
|
+
"gitHead": "912e81957f44eb072286987183e6912807bc26e5"
|
|
94
94
|
}
|
|
@@ -53,6 +53,10 @@ function createFiles(host, options) {
|
|
|
53
53
|
function createPrettierrc(host, options) {
|
|
54
54
|
(0, devkit_1.writeJson)(host, (0, path_1.join)(options.directory, '.prettierrc'), exports.DEFAULT_NRWL_PRETTIER_CONFIG);
|
|
55
55
|
}
|
|
56
|
+
// ensure that pnpm install add all the missing peer deps
|
|
57
|
+
function createNpmrc(host, options) {
|
|
58
|
+
host.write((0, path_1.join)(options.directory, '.npmrc'), 'strict-peer-dependencies=false\nauto-install-peers=true\n');
|
|
59
|
+
}
|
|
56
60
|
function formatWorkspaceJson(host, options) {
|
|
57
61
|
const path = (0, path_1.join)(options.directory, options.cli === 'angular' ? 'angular.json' : 'workspace.json');
|
|
58
62
|
try {
|
|
@@ -103,6 +107,9 @@ function workspaceGenerator(host, options) {
|
|
|
103
107
|
if (options.cli === 'angular') {
|
|
104
108
|
decorateAngularClI(host, options);
|
|
105
109
|
}
|
|
110
|
+
if (options.packageManager === 'pnpm') {
|
|
111
|
+
createNpmrc(host, options);
|
|
112
|
+
}
|
|
106
113
|
setPresetProperty(host, options);
|
|
107
114
|
addNpmScripts(host, options);
|
|
108
115
|
createAppsAndLibsFolders(host, options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/workspace/workspace.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/workspace/workspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -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":";;;AACA,yCAA4C;
|
|
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
|
|
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 +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"}
|
package/src/utils/testing.d.ts
CHANGED
|
@@ -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>;
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
export declare const nxVersion: any;
|
|
2
|
-
export declare const angularCliVersion = "~
|
|
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.
|
|
7
|
-
export declare const eslintVersion = "~8.
|
|
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";
|
package/src/utils/versions.js
CHANGED
|
@@ -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 = '~
|
|
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.
|
|
10
|
-
exports.eslintVersion = '~8.
|
|
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,
|
|
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"}
|