@nrwl/workspace 15.3.0-beta.4 → 15.3.0-beta.5
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
|
-
# [15.3.0-beta.
|
|
6
|
+
# [15.3.0-beta.5](https://github.com/nrwl/nx/compare/15.2.0...15.3.0-beta.5) (2022-11-29)
|
|
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.3.0-beta.
|
|
3
|
+
"version": "15.3.0-beta.5",
|
|
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.3.0-beta.
|
|
37
|
-
"@nrwl/cli": "15.3.0-beta.
|
|
38
|
-
"@nrwl/cypress": "15.3.0-beta.
|
|
39
|
-
"@nrwl/detox": "15.3.0-beta.
|
|
40
|
-
"@nrwl/devkit": "15.3.0-beta.
|
|
41
|
-
"@nrwl/esbuild": "15.3.0-beta.
|
|
42
|
-
"@nrwl/eslint-plugin-nx": "15.3.0-beta.
|
|
43
|
-
"@nrwl/expo": "15.3.0-beta.
|
|
44
|
-
"@nrwl/express": "15.3.0-beta.
|
|
45
|
-
"@nrwl/jest": "15.3.0-beta.
|
|
46
|
-
"@nrwl/js": "15.3.0-beta.
|
|
47
|
-
"@nrwl/linter": "15.3.0-beta.
|
|
48
|
-
"@nrwl/nest": "15.3.0-beta.
|
|
49
|
-
"@nrwl/next": "15.3.0-beta.
|
|
50
|
-
"@nrwl/node": "15.3.0-beta.
|
|
36
|
+
"@nrwl/angular": "15.3.0-beta.5",
|
|
37
|
+
"@nrwl/cli": "15.3.0-beta.5",
|
|
38
|
+
"@nrwl/cypress": "15.3.0-beta.5",
|
|
39
|
+
"@nrwl/detox": "15.3.0-beta.5",
|
|
40
|
+
"@nrwl/devkit": "15.3.0-beta.5",
|
|
41
|
+
"@nrwl/esbuild": "15.3.0-beta.5",
|
|
42
|
+
"@nrwl/eslint-plugin-nx": "15.3.0-beta.5",
|
|
43
|
+
"@nrwl/expo": "15.3.0-beta.5",
|
|
44
|
+
"@nrwl/express": "15.3.0-beta.5",
|
|
45
|
+
"@nrwl/jest": "15.3.0-beta.5",
|
|
46
|
+
"@nrwl/js": "15.3.0-beta.5",
|
|
47
|
+
"@nrwl/linter": "15.3.0-beta.5",
|
|
48
|
+
"@nrwl/nest": "15.3.0-beta.5",
|
|
49
|
+
"@nrwl/next": "15.3.0-beta.5",
|
|
50
|
+
"@nrwl/node": "15.3.0-beta.5",
|
|
51
51
|
"@nrwl/nx-cloud": "latest",
|
|
52
|
-
"@nrwl/nx-plugin": "15.3.0-beta.
|
|
53
|
-
"@nrwl/react": "15.3.0-beta.
|
|
54
|
-
"@nrwl/react-native": "15.3.0-beta.
|
|
55
|
-
"@nrwl/rollup": "15.3.0-beta.
|
|
56
|
-
"@nrwl/storybook": "15.3.0-beta.
|
|
57
|
-
"@nrwl/tao": "15.3.0-beta.
|
|
58
|
-
"@nrwl/web": "15.3.0-beta.
|
|
59
|
-
"@nrwl/webpack": "15.3.0-beta.
|
|
60
|
-
"nx": "15.3.0-beta.
|
|
52
|
+
"@nrwl/nx-plugin": "15.3.0-beta.5",
|
|
53
|
+
"@nrwl/react": "15.3.0-beta.5",
|
|
54
|
+
"@nrwl/react-native": "15.3.0-beta.5",
|
|
55
|
+
"@nrwl/rollup": "15.3.0-beta.5",
|
|
56
|
+
"@nrwl/storybook": "15.3.0-beta.5",
|
|
57
|
+
"@nrwl/tao": "15.3.0-beta.5",
|
|
58
|
+
"@nrwl/web": "15.3.0-beta.5",
|
|
59
|
+
"@nrwl/webpack": "15.3.0-beta.5",
|
|
60
|
+
"nx": "15.3.0-beta.5"
|
|
61
61
|
}
|
|
62
62
|
},
|
|
63
63
|
"peerDependencies": {
|
|
@@ -69,9 +69,9 @@
|
|
|
69
69
|
}
|
|
70
70
|
},
|
|
71
71
|
"dependencies": {
|
|
72
|
-
"@nrwl/devkit": "15.3.0-beta.
|
|
73
|
-
"@nrwl/jest": "15.3.0-beta.
|
|
74
|
-
"@nrwl/linter": "15.3.0-beta.
|
|
72
|
+
"@nrwl/devkit": "15.3.0-beta.5",
|
|
73
|
+
"@nrwl/jest": "15.3.0-beta.5",
|
|
74
|
+
"@nrwl/linter": "15.3.0-beta.5",
|
|
75
75
|
"@parcel/watcher": "2.0.4",
|
|
76
76
|
"chalk": "4.1.0",
|
|
77
77
|
"chokidar": "^3.5.1",
|
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
"ignore": "^5.0.4",
|
|
87
87
|
"minimatch": "3.0.5",
|
|
88
88
|
"npm-run-path": "^4.0.1",
|
|
89
|
-
"nx": "15.3.0-beta.
|
|
89
|
+
"nx": "15.3.0-beta.5",
|
|
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": "
|
|
102
|
+
"gitHead": "fe062f42c366e9ed734208f5feaa1c623f696b67"
|
|
103
103
|
}
|
|
@@ -21,13 +21,14 @@ function addProject(tree, options) {
|
|
|
21
21
|
tags: options.parsedTags,
|
|
22
22
|
};
|
|
23
23
|
if (options.buildable) {
|
|
24
|
-
const { libsDir } = (0, devkit_1.getWorkspaceLayout)(tree);
|
|
25
24
|
(0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nrwl/js': versions_1.nxVersion });
|
|
26
25
|
projectConfiguration.targets.build = {
|
|
27
26
|
executor: '@nrwl/js:tsc',
|
|
28
27
|
outputs: ['{options.outputPath}'],
|
|
29
28
|
options: {
|
|
30
|
-
outputPath:
|
|
29
|
+
outputPath: options.libsDir != '.'
|
|
30
|
+
? `dist/${options.libsDir}/${options.projectDirectory}`
|
|
31
|
+
: `dist/${options.projectDirectory}`,
|
|
31
32
|
main: `${options.projectRoot}/src/index` + (options.js ? '.js' : '.ts'),
|
|
32
33
|
tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
|
|
33
34
|
assets: [`${options.projectRoot}/*.md`],
|
|
@@ -127,9 +128,7 @@ exports.default = libraryGenerator;
|
|
|
127
128
|
exports.librarySchematic = (0, devkit_1.convertNxGenerator)(libraryGenerator);
|
|
128
129
|
function normalizeOptions(tree, options) {
|
|
129
130
|
const name = (0, devkit_1.names)(options.name).fileName;
|
|
130
|
-
const projectDirectory = options.directory
|
|
131
|
-
? `${(0, devkit_1.names)(options.directory).fileName}/${name}`
|
|
132
|
-
: name;
|
|
131
|
+
const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory ? `${(0, devkit_1.names)(options.directory).fileName}/${name}` : name);
|
|
133
132
|
if (!options.unitTestRunner) {
|
|
134
133
|
options.unitTestRunner = 'jest';
|
|
135
134
|
}
|
|
@@ -141,7 +140,8 @@ function normalizeOptions(tree, options) {
|
|
|
141
140
|
fileName: options.simpleModuleName ? name : projectName,
|
|
142
141
|
pascalCaseFiles: options.pascalCaseFiles,
|
|
143
142
|
});
|
|
144
|
-
const { libsDir, npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
|
|
143
|
+
const { libsDir: defaultLibsDir, npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
|
|
144
|
+
const libsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultLibsDir;
|
|
145
145
|
const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, projectDirectory);
|
|
146
146
|
const parsedTags = options.tags
|
|
147
147
|
? options.tags.split(',').map((s) => s.trim())
|
|
@@ -150,7 +150,8 @@ function normalizeOptions(tree, options) {
|
|
|
150
150
|
return Object.assign(Object.assign({}, options), { fileName, name: projectName, projectRoot,
|
|
151
151
|
projectDirectory,
|
|
152
152
|
parsedTags,
|
|
153
|
-
importPath
|
|
153
|
+
importPath,
|
|
154
|
+
libsDir });
|
|
154
155
|
}
|
|
155
156
|
function getCaseAwareFileName(options) {
|
|
156
157
|
const normalized = (0, devkit_1.names)(options.fileName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|