@toolsplus/nx-forge 5.2.3 → 6.0.0
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.
- package/package.json +8 -7
- package/src/generators/application/generator.js +1 -1
- package/src/generators/application/generator.js.map +1 -1
- package/src/generators/application/lib/add-project.js +3 -3
- package/src/generators/application/lib/add-project.js.map +1 -1
- package/src/generators/application/lib/normalize-options.js +2 -4
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/application/schema.d.ts +2 -4
- package/src/generators/application/schema.json +17 -15
- package/src/graph/create-nodes.d.ts +1 -6
- package/src/graph/create-nodes.js +1 -12
- package/src/graph/create-nodes.js.map +1 -1
- package/src/index.js +0 -3
- package/src/index.js.map +1 -1
- package/src/graph/forge-project-graph.d.ts +0 -2
- package/src/graph/forge-project-graph.js +0 -62
- package/src/graph/forge-project-graph.js.map +0 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@toolsplus/nx-forge",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "6.0.0",
|
|
4
4
|
"description": "Atlassian Forge plugin for Nx",
|
|
5
5
|
"main": "./src/index.js",
|
|
6
6
|
"typings": "./src/index.d.ts",
|
|
@@ -8,11 +8,11 @@
|
|
|
8
8
|
"executors": "./executors.json",
|
|
9
9
|
"dependencies": {
|
|
10
10
|
"@forge/manifest": "^8.3.0",
|
|
11
|
-
"@nx/devkit": "
|
|
12
|
-
"@nx/eslint": "
|
|
13
|
-
"@nx/jest": "
|
|
14
|
-
"@nx/js": "
|
|
15
|
-
"@nx/webpack": "
|
|
11
|
+
"@nx/devkit": "20.3.1",
|
|
12
|
+
"@nx/eslint": "20.3.1",
|
|
13
|
+
"@nx/jest": "20.3.1",
|
|
14
|
+
"@nx/js": "20.3.1",
|
|
15
|
+
"@nx/webpack": "20.3.1",
|
|
16
16
|
"fs-extra": "^10.0.1",
|
|
17
17
|
"js-yaml": "^4.1.0",
|
|
18
18
|
"jsonata": "^2.0.5",
|
|
@@ -21,5 +21,6 @@
|
|
|
21
21
|
"type": "commonjs",
|
|
22
22
|
"nx-migrations": {
|
|
23
23
|
"migrations": "./migrations.json"
|
|
24
|
-
}
|
|
24
|
+
},
|
|
25
|
+
"types": "./src/index.d.ts"
|
|
25
26
|
}
|
|
@@ -23,7 +23,7 @@ function updateTsConfigOptions(tree, options) {
|
|
|
23
23
|
}
|
|
24
24
|
function applicationGenerator(tree, schema) {
|
|
25
25
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
26
|
-
return yield applicationGeneratorInternal(tree, Object.assign({ addPlugin: false
|
|
26
|
+
return yield applicationGeneratorInternal(tree, Object.assign({ addPlugin: false }, schema));
|
|
27
27
|
});
|
|
28
28
|
}
|
|
29
29
|
function applicationGeneratorInternal(tree, rawOptions) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/generators/application/generator.ts"],"names":[],"mappings":";;AA6CA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/generators/application/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addProject = addProject;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const
|
|
5
|
+
const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
|
|
6
6
|
const has_webpack_plugin_1 = require("../../../utils/has-webpack-plugin");
|
|
7
7
|
function getWebpackBuildConfig(project, options) {
|
|
8
8
|
return {
|
|
@@ -72,12 +72,12 @@ function addProject(tree, options) {
|
|
|
72
72
|
tags: options.parsedTags,
|
|
73
73
|
};
|
|
74
74
|
if (options.bundler === 'esbuild') {
|
|
75
|
-
(0,
|
|
75
|
+
(0, target_defaults_utils_1.addBuildTargetDefaults)(tree, '@nx/esbuild:esbuild');
|
|
76
76
|
project.targets.build = getEsBuildConfig(project, options);
|
|
77
77
|
}
|
|
78
78
|
else if (options.bundler === 'webpack') {
|
|
79
79
|
if (!(0, has_webpack_plugin_1.hasWebpackPlugin)(tree)) {
|
|
80
|
-
(0,
|
|
80
|
+
(0, target_defaults_utils_1.addBuildTargetDefaults)(tree, `@nx/webpack:webpack`);
|
|
81
81
|
project.targets.build = getWebpackBuildConfig(project, options);
|
|
82
82
|
}
|
|
83
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/add-project.ts"],"names":[],"mappings":";;AA+FA,gCAyBC;AAxHD,uCAMoB;AAEpB,
|
|
1
|
+
{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/add-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,16 +8,14 @@ const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project
|
|
|
8
8
|
function normalizeOptions(tree, options) {
|
|
9
9
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
10
|
var _a, _b, _c, _d;
|
|
11
|
-
|
|
11
|
+
yield (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'application');
|
|
12
|
+
const { projectName: appProjectName, projectRoot: appProjectRoot } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
|
|
12
13
|
name: options.name,
|
|
13
14
|
projectType: 'application',
|
|
14
15
|
directory: options.directory,
|
|
15
|
-
projectNameAndRootFormat: options.projectNameAndRootFormat,
|
|
16
16
|
rootProject: options.rootProject,
|
|
17
|
-
callingGenerator: '@toolsplus/nx-forge:application',
|
|
18
17
|
});
|
|
19
18
|
options.rootProject = appProjectRoot === '.';
|
|
20
|
-
options.projectNameAndRootFormat = projectNameAndRootFormat;
|
|
21
19
|
options.bundler = (_a = options.bundler) !== null && _a !== void 0 ? _a : 'webpack';
|
|
22
20
|
const parsedTags = options.tags
|
|
23
21
|
? options.tags.split(',').map((s) => s.trim())
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;AAQA,4CAmCC;;AA3CD,uCAAoC;AACpC,uCAA8C;AAE9C,uGAG+D;AAE/D,SAAsB,gBAAgB,CACpC,IAAU,EACV,OAAoC;;;QAEpC,MAAM,IAAA,+CAAiB,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;QACtD,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,GAChE,MAAM,IAAA,gEAAkC,EAAC,IAAI,EAAE;YAC7C,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,aAAa;YAC1B,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,WAAW,EAAE,OAAO,CAAC,WAAW;SACjC,CAAC,CAAC;QACL,OAAO,CAAC,WAAW,GAAG,cAAc,KAAK,GAAG,CAAC;QAE7C,OAAO,CAAC,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,SAAS,CAAC;QAE/C,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;YAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC9C,CAAC,CAAC,EAAE,CAAC;QAEP,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAChC,MAAM,SAAS,GACb,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,OAAO;YACtC,MAAM,CAAC,mBAAmB,KAAK,KAAK,CAAC;QAEvC,qCACE,SAAS,IACN,OAAO,KACV,IAAI,EAAE,cAAc,EACpB,cAAc;YACd,UAAU,EACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,eAAM,CAAC,MAAM,EACvC,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,MAAM,EAChD,WAAW,EAAE,MAAA,OAAO,CAAC,WAAW,mCAAI,KAAK,IACzC;IACJ,CAAC;CAAA"}
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import type { Linter } from '@nx/eslint';
|
|
2
|
-
import { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
|
|
3
2
|
|
|
4
3
|
interface ApplicationGeneratorOptions {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
projectNameAndRootFormat?: ProjectNameAndRootFormat;
|
|
4
|
+
directory: string;
|
|
5
|
+
name?: string;
|
|
8
6
|
skipFormat?: boolean;
|
|
9
7
|
skipPackageJson?: boolean;
|
|
10
8
|
linter?: Linter;
|
|
@@ -4,29 +4,27 @@
|
|
|
4
4
|
"title": "Nx Application Options Schema",
|
|
5
5
|
"type": "object",
|
|
6
6
|
"properties": {
|
|
7
|
-
"
|
|
7
|
+
"directory": {
|
|
8
8
|
"type": "string",
|
|
9
|
-
"description": "
|
|
9
|
+
"description": "Directory of the new application",
|
|
10
|
+
"alias": "dir",
|
|
10
11
|
"$default": {
|
|
11
12
|
"$source": "argv",
|
|
12
13
|
"index": 0
|
|
13
14
|
},
|
|
14
|
-
"x-prompt": "
|
|
15
|
+
"x-prompt": "Which directory do you want to create the application in?"
|
|
15
16
|
},
|
|
16
|
-
"
|
|
17
|
-
"type": "string",
|
|
18
|
-
"description": "Directory where the project is placed",
|
|
19
|
-
"alias": "d"
|
|
20
|
-
},
|
|
21
|
-
"projectNameAndRootFormat": {
|
|
22
|
-
"description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
|
|
17
|
+
"name": {
|
|
23
18
|
"type": "string",
|
|
24
|
-
"
|
|
19
|
+
"description": "Name of the application.",
|
|
20
|
+
"pattern": "^[a-zA-Z][^:]*$",
|
|
21
|
+
"x-priority": "important"
|
|
25
22
|
},
|
|
26
23
|
"skipFormat": {
|
|
27
24
|
"description": "Skip formatting files.",
|
|
28
25
|
"type": "boolean",
|
|
29
|
-
"default": false
|
|
26
|
+
"default": false,
|
|
27
|
+
"x-priority": "internal"
|
|
30
28
|
},
|
|
31
29
|
"skipPackageJson": {
|
|
32
30
|
"type": "boolean",
|
|
@@ -38,13 +36,17 @@
|
|
|
38
36
|
"description": "Tool to use for running lint checks.",
|
|
39
37
|
"type": "string",
|
|
40
38
|
"enum": ["eslint", "none"],
|
|
41
|
-
"default": "eslint"
|
|
39
|
+
"default": "eslint",
|
|
40
|
+
"x-prompt": "Which linter would you like to use?",
|
|
41
|
+
"x-priority": "important"
|
|
42
42
|
},
|
|
43
43
|
"unitTestRunner": {
|
|
44
44
|
"description": "Test runner to use for unit tests.",
|
|
45
45
|
"type": "string",
|
|
46
46
|
"enum": ["jest", "none"],
|
|
47
|
-
"default": "jest"
|
|
47
|
+
"default": "jest",
|
|
48
|
+
"x-priority": "important",
|
|
49
|
+
"x-prompt": "Which unit test runner would you like to use?"
|
|
48
50
|
},
|
|
49
51
|
"bundler": {
|
|
50
52
|
"description": "Bundler which is used to package the application",
|
|
@@ -88,5 +90,5 @@
|
|
|
88
90
|
}
|
|
89
91
|
},
|
|
90
92
|
"additionalProperties": false,
|
|
91
|
-
"required": ["
|
|
93
|
+
"required": ["directory"]
|
|
92
94
|
}
|
|
@@ -1,7 +1,2 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { CreateNodesV2 } from '@nx/devkit';
|
|
2
2
|
export declare const createNodesV2: CreateNodesV2;
|
|
3
|
-
/**
|
|
4
|
-
* @deprecated This is replaced with {@link createNodesV2}. Update your plugin to export its own `createNodesV2` function that wraps this one instead.
|
|
5
|
-
* This function will change to the v2 function in Nx 20.
|
|
6
|
-
*/
|
|
7
|
-
export declare const createNodes: CreateNodes;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.createNodesV2 = void 0;
|
|
4
4
|
const fs_1 = require("fs");
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const devkit_1 = require("@nx/devkit");
|
|
@@ -30,17 +30,6 @@ exports.createNodesV2 = [
|
|
|
30
30
|
return (0, devkit_1.createNodesFromFiles)((manifestFile, options, context) => createNodesInternal(manifestFile, options, context), manifestFilePaths, options, context);
|
|
31
31
|
},
|
|
32
32
|
];
|
|
33
|
-
/**
|
|
34
|
-
* @deprecated This is replaced with {@link createNodesV2}. Update your plugin to export its own `createNodesV2` function that wraps this one instead.
|
|
35
|
-
* This function will change to the v2 function in Nx 20.
|
|
36
|
-
*/
|
|
37
|
-
exports.createNodes = [
|
|
38
|
-
forgeManifestGlob,
|
|
39
|
-
(manifestFilePath, options, context) => {
|
|
40
|
-
devkit_1.logger.warn('`createNodes` is deprecated. Update your plugin to utilize createNodesV2 instead. In Nx 20, this will change to the createNodesV2 API.');
|
|
41
|
-
return createNodesInternal(manifestFilePath, options, context);
|
|
42
|
-
},
|
|
43
|
-
];
|
|
44
33
|
function createNodesInternal(manifestFilePath, options, context) {
|
|
45
34
|
const projectRoot = (0, path_1.dirname)(manifestFilePath);
|
|
46
35
|
// Do not create a project if project.json isn't there.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-nodes.js","sourceRoot":"","sources":["../../../../../packages/nx-forge/src/graph/create-nodes.ts"],"names":[],"mappings":";;;AAAA,2BAAiC;AACjC,+BAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"create-nodes.js","sourceRoot":"","sources":["../../../../../packages/nx-forge/src/graph/create-nodes.ts"],"names":[],"mappings":";;;AAAA,2BAAiC;AACjC,+BAAqC;AACrC,uCAKoB;AACpB,+EAA0E;AAC1E,yEAAoE;AACpE,2EAAsE;AACtE,6EAAwE;AACxE,iFAA2E;AAC3E,6EAAwE;AAIxE,MAAM,wBAAwB,GAAG,CAAC,WAAmB,EAAuB,EAAE;IAC5E,MAAM,UAAU,GACd,WAAW,KAAK,GAAG;QACjB,CAAC,CAAC,qBAAqB;QACvB,CAAC,CAAC,oCAAoC,CAAC;IAE3C,MAAM,OAAO,GAAoC,EAAE,CAAC;IAEpD,OAAO,CAAC,QAAQ,GAAG,IAAA,uCAAiB,EAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IACrD,OAAO,CAAC,OAAO,GAAG,IAAA,qCAAgB,EAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IACnD,OAAO,CAAC,KAAK,GAAG,IAAA,iCAAc,EAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IAC/C,OAAO,CAAC,MAAM,GAAG,IAAA,mCAAe,EAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IACjD,OAAO,CAAC,OAAO,GAAG,IAAA,qCAAgB,EAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IACnD,OAAO,CAAC,KAAK,GAAG,IAAA,wCAAiB,EAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IAElD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAE/B,QAAA,aAAa,GAAkB;IAC1C,iBAAiB;IACjB,CAAC,iBAAiB,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QACtC,OAAO,IAAA,6BAAoB,EACzB,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,CACjC,mBAAmB,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,EACrD,iBAAiB,EACjB,OAAO,EACP,OAAO,CACR,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,SAAS,mBAAmB,CAC1B,gBAAwB,EACxB,OAAgB,EAChB,OAA2B;IAE3B,MAAM,WAAW,GAAG,IAAA,cAAO,EAAC,gBAAgB,CAAC,CAAC;IAE9C,uDAAuD;IACvD,MAAM,YAAY,GAAG,IAAA,gBAAW,EAAC,IAAA,WAAI,EAAC,OAAO,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC;IAC3E,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QAC3C,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO;QACL,QAAQ,EAAE;YACR,CAAC,WAAW,CAAC,EAAE;gBACb,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,wBAAwB,CAAC,WAAW,CAAC;aAC/C;SACF;KACF,CAAC;AACJ,CAAC"}
|
package/src/index.js
CHANGED
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
const create_nodes_1 = require("./graph/create-nodes");
|
|
3
3
|
const create_dependencies_1 = require("./graph/create-dependencies");
|
|
4
|
-
const forge_project_graph_1 = require("./graph/forge-project-graph");
|
|
5
4
|
const nxPlugin = {
|
|
6
5
|
name: '@toolsplus/nx-forge',
|
|
7
|
-
createNodes: create_nodes_1.createNodes,
|
|
8
6
|
createNodesV2: create_nodes_1.createNodesV2,
|
|
9
7
|
createDependencies: create_dependencies_1.createDependencies,
|
|
10
|
-
processProjectGraph: forge_project_graph_1.processProjectGraph,
|
|
11
8
|
};
|
|
12
9
|
module.exports = nxPlugin;
|
|
13
10
|
//# sourceMappingURL=index.js.map
|
package/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/nx-forge/src/index.ts"],"names":[],"mappings":";AACA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/nx-forge/src/index.ts"],"names":[],"mappings":";AACA,uDAAqD;AACrD,qEAAiE;AAEjE,MAAM,QAAQ,GAAa;IACzB,IAAI,EAAE,qBAAqB;IAC3B,aAAa,EAAb,4BAAa;IACb,kBAAkB,EAAlB,wCAAkB;CACnB,CAAC;AAEF,iBAAS,QAAQ,CAAC"}
|
|
@@ -1,62 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.processProjectGraph = processProjectGraph;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
|
-
const devkit_1 = require("@nx/devkit");
|
|
6
|
-
const manifest_yml_1 = require("../utils/forge/manifest-yml");
|
|
7
|
-
const getCustomUIStaticDependencies = (_a, context_1) => tslib_1.__awaiter(void 0, [_a, context_1], void 0, function* ([projectName, manifestFile], context) {
|
|
8
|
-
const manifestSchema = yield (0, manifest_yml_1.readManifestYml)(manifestFile.file);
|
|
9
|
-
const customUIProjectNames = (0, manifest_yml_1.extractCustomUIProjectNames)(manifestSchema);
|
|
10
|
-
const getCustomUIStaticDependency = (customUIProjectName) => {
|
|
11
|
-
const customUIProjectConfiguration = context.projectsConfigurations.projects[customUIProjectName];
|
|
12
|
-
if (!customUIProjectConfiguration) {
|
|
13
|
-
throw new Error(`Failed to find Custom UI project in Nx workspace: The Custom UI dependency to project ${customUIProjectName} declared in the Forge manifest.yml of project ${projectName} cannot be found. Make sure the Custom UI resource path references a project in your Nx workspace.`);
|
|
14
|
-
}
|
|
15
|
-
const projectConfiguration = context.projectsConfigurations.projects[projectName];
|
|
16
|
-
if (!projectConfiguration) {
|
|
17
|
-
throw new Error(`Missing project configuration in Nx workspace for project ${projectName}`);
|
|
18
|
-
}
|
|
19
|
-
return {
|
|
20
|
-
sourceProjectFile: manifestFile.file,
|
|
21
|
-
sourceProjectName: projectName,
|
|
22
|
-
targetProjectName: customUIProjectName,
|
|
23
|
-
};
|
|
24
|
-
};
|
|
25
|
-
return customUIProjectNames.reduce((acc, customUIProjectName) => {
|
|
26
|
-
return (manifestFile.deps || []).find(([source, target, type]) => type === 'static' &&
|
|
27
|
-
target === customUIProjectName &&
|
|
28
|
-
source === projectName)
|
|
29
|
-
? acc // Dependency already exists, skip adding it again.
|
|
30
|
-
: [...acc, getCustomUIStaticDependency(customUIProjectName)];
|
|
31
|
-
}, []);
|
|
32
|
-
});
|
|
33
|
-
function processProjectGraph(graph, context) {
|
|
34
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
35
|
-
var _a, e_1, _b, _c;
|
|
36
|
-
const builder = new devkit_1.ProjectGraphBuilder(graph);
|
|
37
|
-
for (const [projectName, files] of Object.entries(context.filesToProcess)) {
|
|
38
|
-
try {
|
|
39
|
-
for (var _d = true, _e = (e_1 = void 0, tslib_1.__asyncValues(files.filter((f) => f.file.endsWith('manifest.yml')))), _f; _f = yield _e.next(), _a = _f.done, !_a; _d = true) {
|
|
40
|
-
_c = _f.value;
|
|
41
|
-
_d = false;
|
|
42
|
-
const manifestFile = _c;
|
|
43
|
-
devkit_1.logger.info(`[nx-forge] Processing ${projectName}:${manifestFile.file}`);
|
|
44
|
-
const dependencies = yield getCustomUIStaticDependencies([projectName, manifestFile], context);
|
|
45
|
-
dependencies.forEach((dependency) => {
|
|
46
|
-
devkit_1.logger.info(`[nx-forge] Adding project graph dependency from ${dependency.sourceProjectFile}:${dependency.sourceProjectFile} -> ${dependency.targetProjectName}`);
|
|
47
|
-
builder.addStaticDependency(dependency.sourceProjectName, dependency.targetProjectName, dependency.sourceProjectFile);
|
|
48
|
-
});
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
52
|
-
finally {
|
|
53
|
-
try {
|
|
54
|
-
if (!_d && !_a && (_b = _e.return)) yield _b.call(_e);
|
|
55
|
-
}
|
|
56
|
-
finally { if (e_1) throw e_1.error; }
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
return builder.getUpdatedProjectGraph();
|
|
60
|
-
});
|
|
61
|
-
}
|
|
62
|
-
//# sourceMappingURL=forge-project-graph.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"forge-project-graph.js","sourceRoot":"","sources":["../../../../../packages/nx-forge/src/graph/forge-project-graph.ts"],"names":[],"mappings":"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"}
|