@nrwl/workspace 15.8.5 → 15.9.0-beta.0
Sign up to get free protection for your applications and to get access to all the features.
- package/index.d.ts +3 -8
- package/index.js +2 -36
- package/index.js.map +1 -1
- package/package.json +30 -39
- package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__ +1 -0
- package/src/generators/library/library.js +1 -2
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/new/files-integrated-repo/package.json__tmpl__ +1 -2
- package/src/generators/new/files-package-based-repo/__dot__vscode/extensions.json__tmpl__ +1 -2
- package/src/generators/new/files-package-based-repo/package.json__tmpl__ +1 -2
- package/src/generators/new/files-root-app/__dot__vscode/extensions.json__tmpl__ +1 -2
- package/src/generators/new/files-root-app/package.json__tmpl__ +1 -2
- package/src/generators/new/generate-workspace-files.d.ts +0 -3
- package/src/generators/new/generate-workspace-files.js +2 -9
- package/src/generators/new/generate-workspace-files.js.map +1 -1
- package/src/generators/new/new.js +0 -1
- package/src/generators/new/new.js.map +1 -1
- package/src/generators/new/schema.json +1 -1
- package/src/generators/preset/preset.d.ts +1 -1
- package/src/generators/preset/preset.js +18 -15
- package/src/generators/preset/preset.js.map +1 -1
- package/src/generators/preset/schema.json +1 -1
- package/src/migrations/update-14-0-0/change-npm-script-executor.js +1 -1
- package/src/migrations/update-14-0-0/change-npm-script-executor.js.map +1 -1
- package/src/migrations/update-14-8-0/change-run-commands-executor.js +1 -1
- package/src/migrations/update-14-8-0/change-run-commands-executor.js.map +1 -1
- package/src/utilities/buildable-libs-utils.d.ts +17 -6
- package/src/utilities/buildable-libs-utils.js +17 -8
- package/src/utilities/buildable-libs-utils.js.map +1 -1
- package/src/utilities/run-tasks-in-serial.d.ts +6 -0
- package/src/utilities/run-tasks-in-serial.js +6 -0
- package/src/utilities/run-tasks-in-serial.js.map +1 -1
- package/src/utilities/typescript/get-source-nodes.d.ts +3 -0
- package/src/utilities/typescript/get-source-nodes.js +3 -0
- package/src/utilities/typescript/get-source-nodes.js.map +1 -1
- package/src/utilities/version-utils.d.ts +3 -0
- package/src/utilities/version-utils.js +7 -12
- package/src/utilities/version-utils.js.map +1 -1
- package/src/utils/ast-utils.d.ts +0 -118
- package/src/utils/ast-utils.js +3 -543
- package/src/utils/ast-utils.js.map +1 -1
- package/src/utils/cli-config-utils.d.ts +0 -2
- package/src/utils/cli-config-utils.js +1 -47
- package/src/utils/cli-config-utils.js.map +1 -1
- package/src/utils/lint.d.ts +0 -22
- package/src/utils/lint.js +0 -164
- package/src/utils/lint.js.map +1 -1
- package/src/utils/project-type.d.ts +1 -3
- package/src/utils/project-type.js +1 -8
- package/src/utils/project-type.js.map +1 -1
- package/src/utils/strings.d.ts +12 -0
- package/src/utils/strings.js +12 -0
- package/src/utils/strings.js.map +1 -1
- package/src/utils/versions.d.ts +0 -1
- package/src/utils/versions.js +1 -2
- package/src/utils/versions.js.map +1 -1
- package/src/generators/new/files-integrated-repo/__dot__prettierignore +0 -4
- package/src/generators/new/files-package-based-repo/__dot__prettierignore +0 -4
- package/src/generators/new/files-root-app/__dot__prettierignore +0 -4
- package/src/utilities/ast-utils.d.ts +0 -22
- package/src/utilities/ast-utils.js +0 -197
- package/src/utilities/ast-utils.js.map +0 -1
- package/src/utilities/executor-options-utils.d.ts +0 -20
- package/src/utilities/executor-options-utils.js +0 -49
- package/src/utilities/executor-options-utils.js.map +0 -1
- package/src/utilities/generate-globs.d.ts +0 -6
- package/src/utilities/generate-globs.js +0 -81
- package/src/utilities/generate-globs.js.map +0 -1
- package/src/utilities/prettier.d.ts +0 -6
- package/src/utilities/prettier.js +0 -38
- package/src/utilities/prettier.js.map +0 -1
- package/src/utils/rules/move-npm-packages.d.ts +0 -11
- package/src/utils/rules/move-npm-packages.js +0 -76
- package/src/utils/rules/move-npm-packages.js.map +0 -1
- package/src/utils/rules/to-js.d.ts +0 -8
- package/src/utils/rules/to-js.js +0 -82
- package/src/utils/rules/to-js.js.map +0 -1
- package/src/utils/rules/update-karma-conf.d.ts +0 -8
- package/src/utils/rules/update-karma-conf.js +0 -36
- package/src/utils/rules/update-karma-conf.js.map +0 -1
- package/src/utils/update-packages-in-package-json.d.ts +0 -3
- package/src/utils/update-packages-in-package-json.js +0 -56
- package/src/utils/update-packages-in-package-json.js.map +0 -1
- package/src/utils/update-task.d.ts +0 -2
- package/src/utils/update-task.js +0 -83
- package/src/utils/update-task.js.map +0 -1
package/index.d.ts
CHANGED
@@ -2,25 +2,20 @@ export { readTsConfig } from './src/utilities/ts-config';
|
|
2
2
|
export { ProjectType, projectRootDir } from './src/utils/project-type';
|
3
3
|
export { renameSync, updateJsonFile, copyFile, createDirectory, } from './src/utilities/fileutils';
|
4
4
|
export { names } from '@nrwl/devkit';
|
5
|
-
export { ExistingPrettierConfig, resolveUserExistingPrettierConfig, } from './src/utilities/prettier';
|
6
5
|
export { output } from './src/utilities/output';
|
7
6
|
export { readWorkspaceConfig, readPackageJson, } from 'nx/src/project-graph/file-utils';
|
8
7
|
export { ProjectGraphCache } from 'nx/src/project-graph/nx-deps-cache';
|
9
|
-
export {
|
10
|
-
|
11
|
-
export { getNpmScope, getWorkspacePath, replaceAppNameWithPath, editTarget, parseTarget, serializeTarget, } from './src/utils/cli-config-utils';
|
8
|
+
export { findNodes, } from './src/utils/ast-utils';
|
9
|
+
export { getWorkspacePath, editTarget, parseTarget, serializeTarget, } from './src/utils/cli-config-utils';
|
12
10
|
export { getWorkspace, updateWorkspace, updateBuilderConfig, } from './src/utils/workspace';
|
13
|
-
export {
|
14
|
-
export { addLintFiles, generateProjectLint, Linter } from './src/utils/lint';
|
11
|
+
export { Linter } from './src/utils/lint';
|
15
12
|
export { addInstallTask } from './src/utils/rules/add-install-task';
|
16
13
|
export { formatFiles } from './src/utils/rules/format-files';
|
17
14
|
export { deleteFile } from './src/utils/rules/deleteFile';
|
18
15
|
export * from './src/utils/rules/ng-add';
|
19
|
-
export { updateKarmaConf } from './src/utils/rules/update-karma-conf';
|
20
16
|
export { visitNotIgnoredFiles } from './src/utils/rules/visit-not-ignored-files';
|
21
17
|
import * as strings from './src/utils/strings';
|
22
18
|
export { checkAndCleanWithSemver } from './src/utils/version-utils';
|
23
|
-
export { updatePackagesInPackageJson } from './src/utils/update-packages-in-package-json';
|
24
19
|
export { libraryGenerator } from './src/generators/library/library';
|
25
20
|
export { moveGenerator } from './src/generators/move/move';
|
26
21
|
export { removeGenerator } from './src/generators/remove/remove';
|
package/index.js
CHANGED
@@ -1,7 +1,6 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.
|
4
|
-
exports.stringUtils = exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.runCommandsGenerator = exports.removeGenerator = exports.moveGenerator = exports.libraryGenerator = exports.updatePackagesInPackageJson = exports.checkAndCleanWithSemver = exports.visitNotIgnoredFiles = void 0;
|
3
|
+
exports.stringUtils = exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.runCommandsGenerator = exports.removeGenerator = exports.moveGenerator = exports.libraryGenerator = exports.checkAndCleanWithSemver = exports.visitNotIgnoredFiles = exports.deleteFile = exports.formatFiles = exports.addInstallTask = exports.updateBuilderConfig = exports.updateWorkspace = exports.getWorkspace = exports.serializeTarget = exports.parseTarget = exports.editTarget = exports.getWorkspacePath = exports.findNodes = exports.readPackageJson = exports.readWorkspaceConfig = exports.output = exports.names = exports.createDirectory = exports.copyFile = exports.updateJsonFile = exports.renameSync = exports.projectRootDir = exports.ProjectType = exports.readTsConfig = void 0;
|
5
4
|
const tslib_1 = require("tslib");
|
6
5
|
var ts_config_1 = require("./src/utilities/ts-config");
|
7
6
|
Object.defineProperty(exports, "readTsConfig", { enumerable: true, get: function () { return ts_config_1.readTsConfig; } });
|
@@ -15,40 +14,15 @@ Object.defineProperty(exports, "copyFile", { enumerable: true, get: function ()
|
|
15
14
|
Object.defineProperty(exports, "createDirectory", { enumerable: true, get: function () { return fileutils_1.createDirectory; } });
|
16
15
|
var devkit_1 = require("@nrwl/devkit");
|
17
16
|
Object.defineProperty(exports, "names", { enumerable: true, get: function () { return devkit_1.names; } });
|
18
|
-
var prettier_1 = require("./src/utilities/prettier");
|
19
|
-
Object.defineProperty(exports, "resolveUserExistingPrettierConfig", { enumerable: true, get: function () { return prettier_1.resolveUserExistingPrettierConfig; } });
|
20
17
|
var output_1 = require("./src/utilities/output");
|
21
18
|
Object.defineProperty(exports, "output", { enumerable: true, get: function () { return output_1.output; } });
|
22
19
|
var file_utils_1 = require("nx/src/project-graph/file-utils");
|
23
20
|
Object.defineProperty(exports, "readWorkspaceConfig", { enumerable: true, get: function () { return file_utils_1.readWorkspaceConfig; } });
|
24
21
|
Object.defineProperty(exports, "readPackageJson", { enumerable: true, get: function () { return file_utils_1.readPackageJson; } });
|
25
22
|
var ast_utils_1 = require("./src/utils/ast-utils");
|
26
|
-
Object.defineProperty(exports, "readJsonInTree", { enumerable: true, get: function () { return ast_utils_1.readJsonInTree; } });
|
27
|
-
Object.defineProperty(exports, "updateJsonInTree", { enumerable: true, get: function () { return ast_utils_1.updateJsonInTree; } });
|
28
|
-
Object.defineProperty(exports, "updateWorkspaceInTree", { enumerable: true, get: function () { return ast_utils_1.updateWorkspaceInTree; } });
|
29
|
-
Object.defineProperty(exports, "insert", { enumerable: true, get: function () { return ast_utils_1.insert; } });
|
30
|
-
Object.defineProperty(exports, "replaceNodeValue", { enumerable: true, get: function () { return ast_utils_1.replaceNodeValue; } });
|
31
|
-
Object.defineProperty(exports, "addDepsToPackageJson", { enumerable: true, get: function () { return ast_utils_1.addDepsToPackageJson; } });
|
32
|
-
Object.defineProperty(exports, "addMethod", { enumerable: true, get: function () { return ast_utils_1.addMethod; } });
|
33
|
-
Object.defineProperty(exports, "addIncludeToTsConfig", { enumerable: true, get: function () { return ast_utils_1.addIncludeToTsConfig; } });
|
34
|
-
Object.defineProperty(exports, "addGlobal", { enumerable: true, get: function () { return ast_utils_1.addGlobal; } });
|
35
|
-
Object.defineProperty(exports, "getProjectConfig", { enumerable: true, get: function () { return ast_utils_1.getProjectConfig; } });
|
36
|
-
Object.defineProperty(exports, "addParameterToConstructor", { enumerable: true, get: function () { return ast_utils_1.addParameterToConstructor; } });
|
37
|
-
Object.defineProperty(exports, "createOrUpdate", { enumerable: true, get: function () { return ast_utils_1.createOrUpdate; } });
|
38
23
|
Object.defineProperty(exports, "findNodes", { enumerable: true, get: function () { return ast_utils_1.findNodes; } });
|
39
|
-
Object.defineProperty(exports, "updatePackageJsonDependencies", { enumerable: true, get: function () { return ast_utils_1.updatePackageJsonDependencies; } });
|
40
|
-
Object.defineProperty(exports, "readWorkspace", { enumerable: true, get: function () { return ast_utils_1.readWorkspace; } });
|
41
|
-
Object.defineProperty(exports, "renameSyncInTree", { enumerable: true, get: function () { return ast_utils_1.renameSyncInTree; } });
|
42
|
-
Object.defineProperty(exports, "renameDirSyncInTree", { enumerable: true, get: function () { return ast_utils_1.renameDirSyncInTree; } });
|
43
|
-
Object.defineProperty(exports, "updateNxJsonInTree", { enumerable: true, get: function () { return ast_utils_1.updateNxJsonInTree; } });
|
44
|
-
Object.defineProperty(exports, "readNxJsonInTree", { enumerable: true, get: function () { return ast_utils_1.readNxJsonInTree; } });
|
45
|
-
Object.defineProperty(exports, "InsertChange", { enumerable: true, get: function () { return ast_utils_1.InsertChange; } });
|
46
|
-
Object.defineProperty(exports, "ReplaceChange", { enumerable: true, get: function () { return ast_utils_1.ReplaceChange; } });
|
47
|
-
Object.defineProperty(exports, "RemoveChange", { enumerable: true, get: function () { return ast_utils_1.RemoveChange; } });
|
48
24
|
var cli_config_utils_1 = require("./src/utils/cli-config-utils");
|
49
|
-
Object.defineProperty(exports, "getNpmScope", { enumerable: true, get: function () { return cli_config_utils_1.getNpmScope; } });
|
50
25
|
Object.defineProperty(exports, "getWorkspacePath", { enumerable: true, get: function () { return cli_config_utils_1.getWorkspacePath; } });
|
51
|
-
Object.defineProperty(exports, "replaceAppNameWithPath", { enumerable: true, get: function () { return cli_config_utils_1.replaceAppNameWithPath; } });
|
52
26
|
Object.defineProperty(exports, "editTarget", { enumerable: true, get: function () { return cli_config_utils_1.editTarget; } });
|
53
27
|
Object.defineProperty(exports, "parseTarget", { enumerable: true, get: function () { return cli_config_utils_1.parseTarget; } });
|
54
28
|
Object.defineProperty(exports, "serializeTarget", { enumerable: true, get: function () { return cli_config_utils_1.serializeTarget; } });
|
@@ -56,11 +30,6 @@ var workspace_1 = require("./src/utils/workspace");
|
|
56
30
|
Object.defineProperty(exports, "getWorkspace", { enumerable: true, get: function () { return workspace_1.getWorkspace; } });
|
57
31
|
Object.defineProperty(exports, "updateWorkspace", { enumerable: true, get: function () { return workspace_1.updateWorkspace; } });
|
58
32
|
Object.defineProperty(exports, "updateBuilderConfig", { enumerable: true, get: function () { return workspace_1.updateBuilderConfig; } });
|
59
|
-
var update_task_1 = require("./src/utils/update-task");
|
60
|
-
Object.defineProperty(exports, "addUpdateTask", { enumerable: true, get: function () { return update_task_1.addUpdateTask; } });
|
61
|
-
var lint_1 = require("./src/utils/lint");
|
62
|
-
Object.defineProperty(exports, "addLintFiles", { enumerable: true, get: function () { return lint_1.addLintFiles; } });
|
63
|
-
Object.defineProperty(exports, "generateProjectLint", { enumerable: true, get: function () { return lint_1.generateProjectLint; } });
|
64
33
|
var add_install_task_1 = require("./src/utils/rules/add-install-task");
|
65
34
|
Object.defineProperty(exports, "addInstallTask", { enumerable: true, get: function () { return add_install_task_1.addInstallTask; } });
|
66
35
|
var format_files_1 = require("./src/utils/rules/format-files");
|
@@ -68,15 +37,12 @@ Object.defineProperty(exports, "formatFiles", { enumerable: true, get: function
|
|
68
37
|
var deleteFile_1 = require("./src/utils/rules/deleteFile");
|
69
38
|
Object.defineProperty(exports, "deleteFile", { enumerable: true, get: function () { return deleteFile_1.deleteFile; } });
|
70
39
|
tslib_1.__exportStar(require("./src/utils/rules/ng-add"), exports);
|
71
|
-
var update_karma_conf_1 = require("./src/utils/rules/update-karma-conf");
|
72
|
-
Object.defineProperty(exports, "updateKarmaConf", { enumerable: true, get: function () { return update_karma_conf_1.updateKarmaConf; } });
|
73
40
|
var visit_not_ignored_files_1 = require("./src/utils/rules/visit-not-ignored-files");
|
74
41
|
Object.defineProperty(exports, "visitNotIgnoredFiles", { enumerable: true, get: function () { return visit_not_ignored_files_1.visitNotIgnoredFiles; } });
|
75
42
|
const strings = require("./src/utils/strings");
|
43
|
+
// TODO(v17): Remove this export.
|
76
44
|
var version_utils_1 = require("./src/utils/version-utils");
|
77
45
|
Object.defineProperty(exports, "checkAndCleanWithSemver", { enumerable: true, get: function () { return version_utils_1.checkAndCleanWithSemver; } });
|
78
|
-
var update_packages_in_package_json_1 = require("./src/utils/update-packages-in-package-json");
|
79
|
-
Object.defineProperty(exports, "updatePackagesInPackageJson", { enumerable: true, get: function () { return update_packages_in_package_json_1.updatePackagesInPackageJson; } });
|
80
46
|
var library_1 = require("./src/generators/library/library");
|
81
47
|
Object.defineProperty(exports, "libraryGenerator", { enumerable: true, get: function () { return library_1.libraryGenerator; } });
|
82
48
|
var move_1 = require("./src/generators/move/move");
|
package/index.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/workspace/index.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/workspace/index.ts"],"names":[],"mappings":";;;;AAAA,uDAAyD;AAAhD,yGAAA,YAAY,OAAA;AACrB,yDAAuE;AAA9D,2GAAA,WAAW,OAAA;AAAE,8GAAA,cAAc,OAAA;AACpC,uDAKmC;AAJjC,uGAAA,UAAU,OAAA;AACV,2GAAA,cAAc,OAAA;AACd,qGAAA,QAAQ,OAAA;AACR,4GAAA,eAAe,OAAA;AAGjB,uCAAqC;AAA5B,+FAAA,KAAK,OAAA;AAEd,iDAAgD;AAAvC,gGAAA,MAAM,OAAA;AAEf,8DAGyC;AAFvC,iHAAA,mBAAmB,OAAA;AACnB,6GAAA,eAAe,OAAA;AAGjB,mDAE+B;AAD7B,sGAAA,SAAS,OAAA;AAGX,iEAKsC;AAJpC,oHAAA,gBAAgB,OAAA;AAChB,8GAAA,UAAU,OAAA;AACV,+GAAA,WAAW,OAAA;AACX,mHAAA,eAAe,OAAA;AAGjB,mDAI+B;AAH7B,yGAAA,YAAY,OAAA;AACZ,4GAAA,eAAe,OAAA;AACf,gHAAA,mBAAmB,OAAA;AAIrB,uEAAoE;AAA3D,kHAAA,cAAc,OAAA;AACvB,+DAA6D;AAApD,2GAAA,WAAW,OAAA;AACpB,2DAA0D;AAAjD,wGAAA,UAAU,OAAA;AACnB,mEAAyC;AAEzC,qFAAiF;AAAxE,+HAAA,oBAAoB,OAAA;AAC7B,+CAA+C;AAE/C,iCAAiC;AACjC,2DAAoE;AAA3D,wHAAA,uBAAuB,OAAA;AAEhC,4DAAoE;AAA3D,2GAAA,gBAAgB,OAAA;AACzB,mDAA2D;AAAlD,qGAAA,aAAa,OAAA;AACtB,yDAAiE;AAAxD,yGAAA,eAAe,OAAA;AACxB,2EAAkF;AAAzE,oHAAA,oBAAoB,OAAA;AAC7B,sGAGsE;AAFpE,oIAAA,2BAA2B,OAAA;AAC3B,oIAAA,2BAA2B,OAAA;AAGhB,QAAA,WAAW,GAAG,OAAO,CAAC"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@nrwl/workspace",
|
3
|
-
"version": "15.
|
3
|
+
"version": "15.9.0-beta.0",
|
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,45 +33,37 @@
|
|
33
33
|
"requirements": {},
|
34
34
|
"migrations": "./migrations.json",
|
35
35
|
"packageGroup": {
|
36
|
-
"@nrwl/js": "15.
|
37
|
-
"@nrwl/jest": "15.
|
38
|
-
"@nrwl/linter": "15.
|
39
|
-
"@nrwl/angular": "15.
|
40
|
-
"@nrwl/cli": "15.
|
41
|
-
"@nrwl/cypress": "15.
|
42
|
-
"@nrwl/detox": "15.
|
43
|
-
"@nrwl/devkit": "15.
|
44
|
-
"@nrwl/esbuild": "15.
|
45
|
-
"@nrwl/eslint-plugin-nx": "15.
|
46
|
-
"@nrwl/expo": "15.
|
47
|
-
"@nrwl/express": "15.
|
48
|
-
"@nrwl/nest": "15.
|
49
|
-
"@nrwl/next": "15.
|
50
|
-
"@nrwl/node": "15.
|
36
|
+
"@nrwl/js": "15.9.0-beta.0",
|
37
|
+
"@nrwl/jest": "15.9.0-beta.0",
|
38
|
+
"@nrwl/linter": "15.9.0-beta.0",
|
39
|
+
"@nrwl/angular": "15.9.0-beta.0",
|
40
|
+
"@nrwl/cli": "15.9.0-beta.0",
|
41
|
+
"@nrwl/cypress": "15.9.0-beta.0",
|
42
|
+
"@nrwl/detox": "15.9.0-beta.0",
|
43
|
+
"@nrwl/devkit": "15.9.0-beta.0",
|
44
|
+
"@nrwl/esbuild": "15.9.0-beta.0",
|
45
|
+
"@nrwl/eslint-plugin-nx": "15.9.0-beta.0",
|
46
|
+
"@nrwl/expo": "15.9.0-beta.0",
|
47
|
+
"@nrwl/express": "15.9.0-beta.0",
|
48
|
+
"@nrwl/nest": "15.9.0-beta.0",
|
49
|
+
"@nrwl/next": "15.9.0-beta.0",
|
50
|
+
"@nrwl/node": "15.9.0-beta.0",
|
51
51
|
"@nrwl/nx-cloud": "latest",
|
52
|
-
"@nrwl/nx-plugin": "15.
|
53
|
-
"@nrwl/react-native": "15.
|
54
|
-
"@nrwl/react": "15.
|
55
|
-
"@nrwl/rollup": "15.
|
56
|
-
"@nrwl/storybook": "15.
|
57
|
-
"@nrwl/tao": "15.
|
58
|
-
"@nrwl/vite": "15.
|
59
|
-
"@nrwl/web": "15.
|
60
|
-
"@nrwl/webpack": "15.
|
61
|
-
"nx": "15.
|
62
|
-
}
|
63
|
-
},
|
64
|
-
"peerDependencies": {
|
65
|
-
"prettier": "^2.6.2"
|
66
|
-
},
|
67
|
-
"peerDependenciesMeta": {
|
68
|
-
"prettier": {
|
69
|
-
"optional": true
|
52
|
+
"@nrwl/nx-plugin": "15.9.0-beta.0",
|
53
|
+
"@nrwl/react-native": "15.9.0-beta.0",
|
54
|
+
"@nrwl/react": "15.9.0-beta.0",
|
55
|
+
"@nrwl/rollup": "15.9.0-beta.0",
|
56
|
+
"@nrwl/storybook": "15.9.0-beta.0",
|
57
|
+
"@nrwl/tao": "15.9.0-beta.0",
|
58
|
+
"@nrwl/vite": "15.9.0-beta.0",
|
59
|
+
"@nrwl/web": "15.9.0-beta.0",
|
60
|
+
"@nrwl/webpack": "15.9.0-beta.0",
|
61
|
+
"nx": "15.9.0-beta.0"
|
70
62
|
}
|
71
63
|
},
|
72
64
|
"dependencies": {
|
73
|
-
"@nrwl/devkit": "15.
|
74
|
-
"@nrwl/linter": "15.
|
65
|
+
"@nrwl/devkit": "15.9.0-beta.0",
|
66
|
+
"@nrwl/linter": "15.9.0-beta.0",
|
75
67
|
"@parcel/watcher": "2.0.4",
|
76
68
|
"chalk": "^4.1.0",
|
77
69
|
"chokidar": "^3.5.1",
|
@@ -84,10 +76,9 @@
|
|
84
76
|
"ignore": "^5.0.4",
|
85
77
|
"minimatch": "3.0.5",
|
86
78
|
"npm-run-path": "^4.0.1",
|
87
|
-
"nx": "15.
|
79
|
+
"nx": "15.9.0-beta.0",
|
88
80
|
"open": "^8.4.0",
|
89
81
|
"rxjs": "^6.5.4",
|
90
|
-
"semver": "7.3.4",
|
91
82
|
"tmp": "~0.2.1",
|
92
83
|
"tslib": "^2.3.0",
|
93
84
|
"yargs": "^17.6.2",
|
@@ -97,5 +88,5 @@
|
|
97
88
|
"access": "public"
|
98
89
|
},
|
99
90
|
"types": "./index.d.ts",
|
100
|
-
"gitHead": "
|
91
|
+
"gitHead": "e3e87f57fd740bf78945a4907745d03f18d057c3"
|
101
92
|
}
|
package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__
CHANGED
@@ -11,6 +11,7 @@ jobs:
|
|
11
11
|
name: Nx Cloud - Main Job
|
12
12
|
uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.11.3
|
13
13
|
with:
|
14
|
+
main-branch-name: <%= mainBranch %>
|
14
15
|
number-of-agents: 3
|
15
16
|
init-commands: |
|
16
17
|
<%= packageManagerPrefix %> nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
|
@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
6
6
|
const path_1 = require("nx/src/utils/path");
|
7
7
|
const path_2 = require("path");
|
8
|
-
const run_tasks_in_serial_1 = require("../../utilities/run-tasks-in-serial");
|
9
8
|
const ts_config_1 = require("../../utilities/ts-config");
|
10
9
|
const versions_1 = require("../../utils/versions");
|
11
10
|
function addProject(tree, options) {
|
@@ -130,7 +129,7 @@ function libraryGenerator(tree, schema) {
|
|
130
129
|
if (!options.skipFormat) {
|
131
130
|
yield (0, devkit_1.formatFiles)(tree);
|
132
131
|
}
|
133
|
-
return (0,
|
132
|
+
return (0, devkit_1.runTasksInSerial)(...tasks);
|
134
133
|
});
|
135
134
|
}
|
136
135
|
exports.libraryGenerator = libraryGenerator;
|
@@ -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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"}
|
@@ -1,15 +1,12 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.generateWorkspaceFiles =
|
3
|
+
exports.generateWorkspaceFiles = void 0;
|
4
4
|
const tslib_1 = require("tslib");
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
6
6
|
const versions_1 = require("../../utils/versions");
|
7
7
|
const path_1 = require("path");
|
8
8
|
const presets_1 = require("../utils/presets");
|
9
9
|
const default_base_1 = require("../../utilities/default-base");
|
10
|
-
exports.DEFAULT_NRWL_PRETTIER_CONFIG = {
|
11
|
-
singleQuote: true,
|
12
|
-
};
|
13
10
|
function generateWorkspaceFiles(tree, options) {
|
14
11
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
15
12
|
if (!options.name) {
|
@@ -19,7 +16,6 @@ function generateWorkspaceFiles(tree, options) {
|
|
19
16
|
createReadme(tree, options);
|
20
17
|
createFiles(tree, options);
|
21
18
|
createNxJson(tree, options);
|
22
|
-
createPrettierrc(tree, options);
|
23
19
|
const [packageMajor] = (0, devkit_1.getPackageManagerVersion)(options.packageManager).split('.');
|
24
20
|
if (options.packageManager === 'pnpm' && +packageMajor >= 7) {
|
25
21
|
createNpmrc(tree, options);
|
@@ -109,7 +105,7 @@ function createFiles(tree, options) {
|
|
109
105
|
: options.preset === presets_1.Preset.NPM || options.preset === presets_1.Preset.Core
|
110
106
|
? './files-package-based-repo'
|
111
107
|
: './files-integrated-repo';
|
112
|
-
(0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, filesDirName), options.directory, Object.assign(Object.assign({ formattedNames, dot: '.', tmpl: '', cliCommand: 'nx', nxCli: false
|
108
|
+
(0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, filesDirName), options.directory, Object.assign(Object.assign({ formattedNames, dot: '.', tmpl: '', cliCommand: 'nx', nxCli: false }, options), { nxVersion: versions_1.nxVersion, packageManager: options.packageManager }));
|
113
109
|
}
|
114
110
|
function createReadme(tree, { name, appName, directory }) {
|
115
111
|
const formattedNames = (0, devkit_1.names)(name);
|
@@ -119,9 +115,6 @@ function createReadme(tree, { name, appName, directory }) {
|
|
119
115
|
name,
|
120
116
|
});
|
121
117
|
}
|
122
|
-
function createPrettierrc(tree, options) {
|
123
|
-
(0, devkit_1.writeJson)(tree, (0, path_1.join)(options.directory, '.prettierrc'), exports.DEFAULT_NRWL_PRETTIER_CONFIG);
|
124
|
-
}
|
125
118
|
// ensure that pnpm install add all the missing peer deps
|
126
119
|
function createNpmrc(tree, options) {
|
127
120
|
tree.write((0, path_1.join)(options.directory, '.npmrc'), 'strict-peer-dependencies=false\nauto-install-peers=true\n');
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"generate-workspace-files.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-workspace-files.ts"],"names":[],"mappings":";;;;AAAA,yCAUsB;AACtB,
|
1
|
+
{"version":3,"file":"generate-workspace-files.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-workspace-files.ts"],"names":[],"mappings":"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"}
|
@@ -15,7 +15,6 @@ function newGenerator(host, options) {
|
|
15
15
|
(0, generate_preset_1.addPresetDependencies)(host, options);
|
16
16
|
const isCustomPreset = !Object.values(presets_1.Preset).includes(options.preset);
|
17
17
|
addCloudDependencies(host, options);
|
18
|
-
yield (0, devkit_1.formatFiles)(host);
|
19
18
|
return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
20
19
|
(0, devkit_1.installPackagesTask)(host, false, options.directory, options.packageManager);
|
21
20
|
// TODO: move all of these into create-nx-workspace
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AAEtB,+BAA4B;AAC5B,8CAA0C;AAE1C,yEAAoE;AACpE,uDAA0E;AAyB1E,SAAsB,YAAY,CAAC,IAAU,EAAE,OAAe;;QAC5D,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACpC,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAE/B,MAAM,IAAA,iDAAsB,EAAC,IAAI,EAAE,gCAAK,OAAO,KAAE,OAAO,EAAE,SAAS,GAAS,CAAC,CAAC;QAE9E,IAAA,uCAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrC,MAAM,cAAc,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAM,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAa,CAAC,CAAC;QAC9E,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEpC,
|
1
|
+
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":"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"}
|
@@ -1,4 +1,4 @@
|
|
1
1
|
import { Tree } from '@nrwl/devkit';
|
2
2
|
import { Schema } from './schema';
|
3
|
-
export declare function presetGenerator(tree: Tree, options: Schema): Promise<() => void
|
3
|
+
export declare function presetGenerator(tree: Tree, options: Schema): Promise<() => Promise<void>>;
|
4
4
|
export default presetGenerator;
|
@@ -7,11 +7,12 @@ const presets_1 = require("../utils/presets");
|
|
7
7
|
function presetGenerator(tree, options) {
|
8
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
9
9
|
options = normalizeOptions(options);
|
10
|
-
yield createPreset(tree, options);
|
11
|
-
|
12
|
-
return () => {
|
10
|
+
const presetTask = yield createPreset(tree, options);
|
11
|
+
return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
13
12
|
(0, devkit_1.installPackagesTask)(tree);
|
14
|
-
|
13
|
+
if (presetTask)
|
14
|
+
yield presetTask();
|
15
|
+
});
|
15
16
|
});
|
16
17
|
}
|
17
18
|
exports.presetGenerator = presetGenerator;
|
@@ -24,7 +25,7 @@ function createPreset(tree, options) {
|
|
24
25
|
}
|
25
26
|
else if (options.preset === presets_1.Preset.AngularMonorepo) {
|
26
27
|
const { applicationGenerator: angularApplicationGenerator, } = require('@nrwl' + '/angular/generators');
|
27
|
-
|
28
|
+
return angularApplicationGenerator(tree, {
|
28
29
|
name: options.name,
|
29
30
|
style: options.style,
|
30
31
|
linter: options.linter,
|
@@ -34,7 +35,7 @@ function createPreset(tree, options) {
|
|
34
35
|
}
|
35
36
|
else if (options.preset === presets_1.Preset.AngularStandalone) {
|
36
37
|
const { applicationGenerator: angularApplicationGenerator, } = require('@nrwl' + '/angular/generators');
|
37
|
-
|
38
|
+
return angularApplicationGenerator(tree, {
|
38
39
|
name: options.name,
|
39
40
|
style: options.style,
|
40
41
|
linter: options.linter,
|
@@ -45,7 +46,7 @@ function createPreset(tree, options) {
|
|
45
46
|
}
|
46
47
|
else if (options.preset === presets_1.Preset.ReactMonorepo) {
|
47
48
|
const { applicationGenerator: reactApplicationGenerator, } = require('@nrwl' + '/react');
|
48
|
-
|
49
|
+
return reactApplicationGenerator(tree, {
|
49
50
|
name: options.name,
|
50
51
|
style: options.style,
|
51
52
|
linter: options.linter,
|
@@ -54,7 +55,7 @@ function createPreset(tree, options) {
|
|
54
55
|
}
|
55
56
|
else if (options.preset === presets_1.Preset.ReactStandalone) {
|
56
57
|
const { applicationGenerator: reactApplicationGenerator, } = require('@nrwl' + '/react');
|
57
|
-
|
58
|
+
return reactApplicationGenerator(tree, {
|
58
59
|
name: options.name,
|
59
60
|
style: options.style,
|
60
61
|
linter: options.linter,
|
@@ -67,7 +68,7 @@ function createPreset(tree, options) {
|
|
67
68
|
else if (options.preset === presets_1.Preset.NextJs) {
|
68
69
|
const { applicationGenerator: nextApplicationGenerator } = require('@nrwl' +
|
69
70
|
'/next');
|
70
|
-
|
71
|
+
return nextApplicationGenerator(tree, {
|
71
72
|
name: options.name,
|
72
73
|
style: options.style,
|
73
74
|
linter: options.linter,
|
@@ -76,7 +77,7 @@ function createPreset(tree, options) {
|
|
76
77
|
else if (options.preset === presets_1.Preset.WebComponents) {
|
77
78
|
const { applicationGenerator: webApplicationGenerator } = require('@nrwl' +
|
78
79
|
'/web');
|
79
|
-
|
80
|
+
return webApplicationGenerator(tree, {
|
80
81
|
name: options.name,
|
81
82
|
style: options.style,
|
82
83
|
linter: options.linter,
|
@@ -86,14 +87,14 @@ function createPreset(tree, options) {
|
|
86
87
|
else if (options.preset === presets_1.Preset.Nest) {
|
87
88
|
const { applicationGenerator: nestApplicationGenerator } = require('@nrwl' +
|
88
89
|
'/nest');
|
89
|
-
|
90
|
+
return nestApplicationGenerator(tree, {
|
90
91
|
name: options.name,
|
91
92
|
linter: options.linter,
|
92
93
|
});
|
93
94
|
}
|
94
95
|
else if (options.preset === presets_1.Preset.Express) {
|
95
96
|
const { applicationGenerator: expressApplicationGenerator, } = require('@nrwl' + '/express');
|
96
|
-
|
97
|
+
return expressApplicationGenerator(tree, {
|
97
98
|
name: options.name,
|
98
99
|
linter: options.linter,
|
99
100
|
});
|
@@ -101,7 +102,7 @@ function createPreset(tree, options) {
|
|
101
102
|
else if (options.preset === presets_1.Preset.ReactNative) {
|
102
103
|
const { reactNativeApplicationGenerator } = require('@nrwl' +
|
103
104
|
'/react-native');
|
104
|
-
|
105
|
+
return reactNativeApplicationGenerator(tree, {
|
105
106
|
name: options.name,
|
106
107
|
linter: options.linter,
|
107
108
|
e2eTestRunner: 'detox',
|
@@ -109,7 +110,7 @@ function createPreset(tree, options) {
|
|
109
110
|
}
|
110
111
|
else if (options.preset === presets_1.Preset.Expo) {
|
111
112
|
const { expoApplicationGenerator } = require('@nrwl' + '/expo');
|
112
|
-
|
113
|
+
return expoApplicationGenerator(tree, {
|
113
114
|
name: options.name,
|
114
115
|
linter: options.linter,
|
115
116
|
e2eTestRunner: 'detox',
|
@@ -117,16 +118,18 @@ function createPreset(tree, options) {
|
|
117
118
|
}
|
118
119
|
else if (options.preset === presets_1.Preset.TS) {
|
119
120
|
const c = (0, devkit_1.readNxJson)(tree);
|
121
|
+
const { initGenerator } = require('@nrwl' + '/js');
|
120
122
|
c.workspaceLayout = {
|
121
123
|
appsDir: 'packages',
|
122
124
|
libsDir: 'packages',
|
123
125
|
};
|
124
126
|
(0, devkit_1.updateNxJson)(tree, c);
|
127
|
+
return initGenerator(tree, {});
|
125
128
|
}
|
126
129
|
else if (options.preset === presets_1.Preset.NodeServer) {
|
127
130
|
const { applicationGenerator: nodeApplicationGenerator } = require('@nrwl' +
|
128
131
|
'/node');
|
129
|
-
|
132
|
+
return nodeApplicationGenerator(tree, {
|
130
133
|
name: options.name,
|
131
134
|
linter: options.linter,
|
132
135
|
standaloneConfig: options.standaloneConfig,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AAEtB,8CAA0C;AAE1C,SAAsB,eAAe,CAAC,IAAU,EAAE,OAAe;;QAC/D,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;
|
1
|
+
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":"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"}
|