@toolsplus/nx-forge 7.0.1 → 8.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 +14 -12
- package/src/executors/tunnel/executor.js +2 -2
- package/src/executors/tunnel/executor.js.map +1 -1
- package/src/generators/application/generator.js +2 -2
- package/src/generators/application/generator.js.map +1 -1
- package/src/generators/application/lib/add-app-files.js +1 -1
- package/src/generators/application/lib/add-app-files.js.map +1 -1
- package/src/generators/application/lib/add-project-dependencies.js +12 -6
- package/src/generators/application/lib/add-project-dependencies.js.map +1 -1
- package/src/generators/application/lib/add-project.js +5 -5
- package/src/generators/application/lib/add-project.js.map +1 -1
- package/src/generators/application/lib/normalize-options.js +9 -9
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/application/schema.d.ts +0 -1
- package/src/graph/create-nodes.d.ts +2 -2
- package/src/graph/create-nodes.js.map +1 -1
- package/src/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.js +10 -11
- package/src/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.js.map +1 -1
- package/src/utils/forge/yaml-validator.js +0 -17
- package/src/utils/forge/yaml-validator.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@toolsplus/nx-forge",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "8.0.0",
|
|
4
4
|
"description": "Atlassian Forge plugin for Nx",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -12,17 +12,19 @@
|
|
|
12
12
|
"generators": "./generators.json",
|
|
13
13
|
"executors": "./executors.json",
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"@forge/manifest": "
|
|
16
|
-
"@nx/devkit": "
|
|
17
|
-
"@nx/eslint": "
|
|
18
|
-
"@nx/jest": "
|
|
19
|
-
"@nx/js": "
|
|
20
|
-
"@nx/webpack": "
|
|
21
|
-
"fs-extra": "
|
|
22
|
-
"js-yaml": "
|
|
23
|
-
"
|
|
24
|
-
"
|
|
25
|
-
|
|
15
|
+
"@forge/manifest": "catalog:",
|
|
16
|
+
"@nx/devkit": "catalog:nx",
|
|
17
|
+
"@nx/eslint": "catalog:nx",
|
|
18
|
+
"@nx/jest": "catalog:nx",
|
|
19
|
+
"@nx/js": "catalog:nx",
|
|
20
|
+
"@nx/webpack": "catalog:nx",
|
|
21
|
+
"fs-extra": "catalog:",
|
|
22
|
+
"js-yaml": "catalog:",
|
|
23
|
+
"jsonata": "catalog:",
|
|
24
|
+
"tslib": "catalog:"
|
|
25
|
+
},
|
|
26
|
+
"peerDependencies": {
|
|
27
|
+
"nx": ">=23 <24"
|
|
26
28
|
},
|
|
27
29
|
"type": "commonjs",
|
|
28
30
|
"nx-migrations": {
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.default = runTunnelExecutor;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
|
-
const
|
|
6
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
7
7
|
const run_tunnel_1 = tslib_1.__importStar(require("./lib/run-tunnel"));
|
|
8
8
|
const extract_custom_ui_projects_1 = require("./lib/extract-custom-ui-projects");
|
|
9
9
|
const start_custom_uis_1 = require("./lib/start-custom-uis");
|
|
@@ -38,7 +38,7 @@ async function runTunnelExecutor(options, context) {
|
|
|
38
38
|
}
|
|
39
39
|
// execute the tunnel target on the focused project
|
|
40
40
|
const forgeTunnelIter = promiseToIterator((0, run_tunnel_1.default)({ ...options, customUIProjectConfigs }, context));
|
|
41
|
-
const combined = (0,
|
|
41
|
+
const combined = (0, internal_1.combineAsyncIterables)(forgeAppBuildIter, ...customUIIters, forgeTunnelIter);
|
|
42
42
|
try {
|
|
43
43
|
for await (const output of combined) {
|
|
44
44
|
if (!output.success)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/tunnel/executor.ts"],"names":[],"mappings":";;AAmBA,oCAuDC;;AA1ED,uCAAkE;AAClE,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/tunnel/executor.ts"],"names":[],"mappings":";;AAmBA,oCAuDC;;AA1ED,uCAAkE;AAClE,kDAA4D;AAE5D,uEAA0E;AAC1E,iFAAuE;AACvE,6DAAwD;AAExD;;;;;;;;;;;GAWG;AACY,KAAK,UAAU,iBAAiB,CAC7C,OAA8B,EAC9B,OAAwB;;IAExB,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,sBAAsB,GAAG,MAAM,IAAA,gDAAmB,EAAC,OAAO,CAAC,CAAC;IAElE,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAc,EAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;IAE5E,MAAM,iBAAiB,GAAG,MAAM,IAAA,oBAAW,EACzC,EAAE,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,EACjD,EAAE,KAAK,EAAE,IAAI,EAAE,EACf,OAAO,CACR,CAAC;IAEF,MAAM,IAAA,oBAAW,EACf,EAAE,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,EACnD,EAAE,EACF,OAAO,CACR,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,IAAI,CAAC;QAC1D,MAAM,IAAA,wCAA2B,EAAC,OAAO,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAC1E,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,eAAM,CAAC,KAAK,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QAC/D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC5B,CAAC;IAED,mDAAmD;IACnD,MAAM,eAAe,GAAG,iBAAiB,CACvC,IAAA,oBAAS,EAAC,EAAE,GAAG,OAAO,EAAE,sBAAsB,EAAE,EAAE,OAAO,CAAC,CAC3D,CAAC;IAEF,MAAM,QAAQ,GACZ,IAAA,gCAAqB,EAAC,iBAAiB,EAAE,GAAG,aAAa,EAAE,eAAe,CAAC,CAAC;IAE9E,IAAI,CAAC;QACH,IAAI,KAAK,EAAE,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,OAAO;gBACjB,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAEzE,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,MAAK,QAAQ,EAAE,CAAC;gBAC5B,eAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;gBACnD,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC3D,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,eAAM,CAAC,KAAK,CAAC,+BAA+B,GAAG,EAAE,CAAC,CAAC;QACnD,OAAO,MAAM,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IACnD,CAAC;AACH,CAAC;AAED,KAAK,SAAS,CAAC,CAAC,iBAAiB,CAG/B,CAAa;IACb,MAAM,MAAM,CAAC,CAAC;AAChB,CAAC"}
|
|
@@ -10,7 +10,7 @@ const js_1 = require("@nx/js");
|
|
|
10
10
|
const generator_1 = tslib_1.__importDefault(require("../init/generator"));
|
|
11
11
|
const lib_1 = require("./lib");
|
|
12
12
|
const add_project_dependencies_1 = require("./lib/add-project-dependencies");
|
|
13
|
-
const
|
|
13
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
14
14
|
function updateTsConfigOptions(tree, options) {
|
|
15
15
|
(0, devkit_1.updateJson)(tree, `${options.appProjectRoot}/tsconfig.json`, (json) => {
|
|
16
16
|
if (options.rootProject) {
|
|
@@ -106,7 +106,7 @@ async function applicationGeneratorInternal(tree, rawOptions) {
|
|
|
106
106
|
await (0, devkit_1.formatFiles)(tree);
|
|
107
107
|
}
|
|
108
108
|
tasks.push(() => {
|
|
109
|
-
(0,
|
|
109
|
+
(0, internal_1.logShowProjectCommand)(options.name);
|
|
110
110
|
});
|
|
111
111
|
return (0, devkit_1.runTasksInSerial)(...tasks);
|
|
112
112
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/generators/application/generator.ts"],"names":[],"mappings":";;AA6CA,oDAQC;AAED,oEAqFC;;AA5ID,uCAUoB;AACpB,uCAAkD;AAClD,mCAAkD;AAClD,+BAA+E;AAC/E,0EAA8C;AAE9C,+BAAkE;AAClE,6EAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/generators/application/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ function addAppFiles(tree, options) {
|
|
|
12
12
|
root: options.appProjectRoot,
|
|
13
13
|
offset: (0, devkit_1.offsetFromRoot)(options.appProjectRoot),
|
|
14
14
|
rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot),
|
|
15
|
-
webpackPluginOptions: (0, has_webpack_plugin_1.hasWebpackPlugin)(tree)
|
|
15
|
+
webpackPluginOptions: (0, has_webpack_plugin_1.hasWebpackPlugin)(tree) && options.addPlugin
|
|
16
16
|
? {
|
|
17
17
|
outputPath: (0, devkit_1.joinPathFragments)('dist', (_a = (options.rootProject ? options.name : options.appProjectRoot)) !== null && _a !== void 0 ? _a : '', 'src'),
|
|
18
18
|
main: './src/index' + (options.js ? '.js' : '.ts'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-app-files.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/add-app-files.ts"],"names":[],"mappings":";;AAWA,
|
|
1
|
+
{"version":3,"file":"add-app-files.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/add-app-files.ts"],"names":[],"mappings":";;AAWA,kCAsCC;AAhDD,uCAKoB;AACpB,+BAAuD;AAEvD,0EAAqE;AAErE,SAAgB,WAAW,CAAC,IAAU,EAAE,OAA0B;;IAChE,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,EAC3C,OAAO,CAAC,cAAc,EACtB;QACE,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,MAAM,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC;QAC9C,gBAAgB,EAAE,IAAA,kCAA6B,EAC7C,IAAI,EACJ,OAAO,CAAC,cAAc,CACvB;QACD,oBAAoB,EAClB,IAAA,qCAAgB,EAAC,IAAI,CAAC,IAAI,OAAO,CAAC,SAAS;YACzC,CAAC,CAAC;gBACE,UAAU,EAAE,IAAA,0BAAiB,EAC3B,MAAM,EACN,MAAA,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,mCAC3D,EAAE,EACJ,KAAK,CACN;gBACD,IAAI,EAAE,aAAa,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;gBAClD,QAAQ,EAAE,qBAAqB;gBAC/B,MAAM,EAAE,CAAC,cAAc,CAAC;aACzB;YACH,CAAC,CAAC,IAAI;KACX,CACF,CAAC;IAEF,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;QACf,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;IACb,CAAC;AACH,CAAC"}
|
|
@@ -2,17 +2,23 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addProjectDependencies = addProjectDependencies;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const
|
|
5
|
+
const internal_1 = require("@nx/js/internal");
|
|
6
6
|
async function getLatestPackageVersion(pkg) {
|
|
7
7
|
var _a;
|
|
8
8
|
try {
|
|
9
|
-
const response = await fetch(`https://registry.npmjs.org/${pkg}
|
|
9
|
+
const response = await fetch(`https://registry.npmjs.org/${pkg}`, {
|
|
10
|
+
signal: AbortSignal.timeout(10000),
|
|
11
|
+
});
|
|
12
|
+
if (!response.ok) {
|
|
13
|
+
devkit_1.logger.error(`Failed to fetch latest version of ${pkg}: ${response.status}`);
|
|
14
|
+
return undefined;
|
|
15
|
+
}
|
|
10
16
|
const json = await response.json();
|
|
11
17
|
return (_a = json === null || json === void 0 ? void 0 : json['dist-tags']) === null || _a === void 0 ? void 0 : _a['latest'];
|
|
12
18
|
}
|
|
13
19
|
catch (error) {
|
|
14
20
|
devkit_1.logger.error(`Failed to fetch latest version of ${pkg}: ${error}`);
|
|
15
|
-
|
|
21
|
+
return undefined;
|
|
16
22
|
}
|
|
17
23
|
}
|
|
18
24
|
async function addProjectDependencies(tree, options) {
|
|
@@ -23,7 +29,7 @@ async function addProjectDependencies(tree, options) {
|
|
|
23
29
|
},
|
|
24
30
|
esbuild: {
|
|
25
31
|
'@nx/esbuild': devkit_1.NX_VERSION,
|
|
26
|
-
esbuild:
|
|
32
|
+
esbuild: internal_1.esbuildVersion,
|
|
27
33
|
},
|
|
28
34
|
};
|
|
29
35
|
const latestForgeApiVersion = await getLatestPackageVersion('@forge/api');
|
|
@@ -40,10 +46,10 @@ async function addProjectDependencies(tree, options) {
|
|
|
40
46
|
};
|
|
41
47
|
return (0, devkit_1.addDependenciesToPackageJson)(tree, {
|
|
42
48
|
...forgeDependencies,
|
|
43
|
-
tslib:
|
|
49
|
+
tslib: internal_1.tsLibVersion,
|
|
44
50
|
}, {
|
|
45
51
|
...bundlers[(_a = options.bundler) !== null && _a !== void 0 ? _a : 'webpack'],
|
|
46
|
-
'@types/node':
|
|
52
|
+
'@types/node': internal_1.typesNodeVersion,
|
|
47
53
|
});
|
|
48
54
|
}
|
|
49
55
|
//# sourceMappingURL=add-project-dependencies.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-project-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/add-project-dependencies.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"add-project-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/add-project-dependencies.ts"],"names":[],"mappings":";;AAmCA,wDA8CC;AAjFD,uCAMoB;AACpB,8CAIyB;AAGzB,KAAK,UAAU,uBAAuB,CACpC,GAAW;;IAEX,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,8BAA8B,GAAG,EAAE,EAAE;YAChE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,KAAM,CAAC;SACpC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,eAAM,CAAC,KAAK,CACV,qCAAqC,GAAG,KAAK,QAAQ,CAAC,MAAM,EAAE,CAC/D,CAAC;YACF,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnC,OAAO,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAG,WAAW,CAAC,0CAAG,QAAQ,CAAC,CAAC;IACzC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,eAAM,CAAC,KAAK,CAAC,qCAAqC,GAAG,KAAK,KAAK,EAAE,CAAC,CAAC;QACnE,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,IAAU,EACV,OAA0B;;IAE1B,MAAM,QAAQ,GAAG;QACf,OAAO,EAAE;YACP,aAAa,EAAE,mBAAU;SAC1B;QACD,OAAO,EAAE;YACP,aAAa,EAAE,mBAAU;YACzB,OAAO,EAAE,yBAAc;SACxB;KACO,CAAC;IAEX,MAAM,qBAAqB,GAAG,MAAM,uBAAuB,CAAC,YAAY,CAAC,CAAC;IAC1E,MAAM,0BAA0B,GAAG,MAAM,uBAAuB,CAC9D,iBAAiB,CAClB,CAAC;IAEF,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC3B,eAAM,CAAC,IAAI,CACT,6EAA6E,CAC9E,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAChC,eAAM,CAAC,IAAI,CACT,kFAAkF,CACnF,CAAC;IACJ,CAAC;IACD,MAAM,iBAAiB,GAAG;QACxB,YAAY,EAAE,qBAAqB,aAArB,qBAAqB,cAArB,qBAAqB,GAAI,QAAQ;QAC/C,iBAAiB,EAAE,0BAA0B,aAA1B,0BAA0B,cAA1B,0BAA0B,GAAI,QAAQ;KAC1D,CAAC;IAEF,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,GAAG,iBAAiB;QACpB,KAAK,EAAE,uBAAY;KACpB,EACD;QACE,GAAG,QAAQ,CAAC,MAAA,OAAO,CAAC,OAAO,mCAAI,SAAS,CAAC;QACzC,aAAa,EAAE,2BAAgB;KAChC,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -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 internal_1 = require("@nx/devkit/internal");
|
|
6
6
|
const has_webpack_plugin_1 = require("../../../utils/has-webpack-plugin");
|
|
7
7
|
function getWebpackBuildConfig(project, options) {
|
|
8
8
|
var _a, _b, _c;
|
|
@@ -75,17 +75,17 @@ function addProject(tree, options) {
|
|
|
75
75
|
tags: options.parsedTags,
|
|
76
76
|
};
|
|
77
77
|
if (options.bundler === 'esbuild') {
|
|
78
|
-
(0,
|
|
78
|
+
(0, internal_1.addBuildTargetDefaults)(tree, '@nx/esbuild:esbuild', 'build');
|
|
79
79
|
(_a = project.targets) !== null && _a !== void 0 ? _a : (project.targets = {});
|
|
80
80
|
project.targets.build = getEsBuildConfig(project, options);
|
|
81
81
|
}
|
|
82
82
|
else if (options.bundler === 'webpack') {
|
|
83
|
-
if (!(0, has_webpack_plugin_1.hasWebpackPlugin)(tree)) {
|
|
84
|
-
(0,
|
|
83
|
+
if (!(0, has_webpack_plugin_1.hasWebpackPlugin)(tree) && !options.addPlugin) {
|
|
84
|
+
(0, internal_1.addBuildTargetDefaults)(tree, `@nx/webpack:webpack`, 'build');
|
|
85
85
|
(_b = project.targets) !== null && _b !== void 0 ? _b : (project.targets = {});
|
|
86
86
|
project.targets.build = getWebpackBuildConfig(project, options);
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
|
-
(0, devkit_1.addProjectConfiguration)(tree, options.name
|
|
89
|
+
(0, devkit_1.addProjectConfiguration)(tree, options.name, project);
|
|
90
90
|
}
|
|
91
91
|
//# sourceMappingURL=add-project.js.map
|
|
@@ -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,
|
|
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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"}
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalizeOptions = normalizeOptions;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const
|
|
5
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
6
6
|
async function normalizeOptions(tree, options) {
|
|
7
|
-
var _a, _b, _c, _d;
|
|
8
|
-
const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0,
|
|
7
|
+
var _a, _b, _c, _d, _e;
|
|
8
|
+
const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, internal_1.determineProjectNameAndRootOptions)(tree, {
|
|
9
9
|
name: options.name,
|
|
10
10
|
projectType: 'application',
|
|
11
11
|
directory: options.directory,
|
|
@@ -17,17 +17,17 @@ async function normalizeOptions(tree, options) {
|
|
|
17
17
|
? options.tags.split(',').map((s) => s.trim())
|
|
18
18
|
: [];
|
|
19
19
|
const nxJson = (0, devkit_1.readNxJson)(tree);
|
|
20
|
-
const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
|
|
21
|
-
(nxJson === null || nxJson === void 0 ? void 0 : nxJson.useInferencePlugins) !== false;
|
|
20
|
+
const addPlugin = (_b = options.addPlugin) !== null && _b !== void 0 ? _b : (process.env.NX_ADD_PLUGINS !== 'false' &&
|
|
21
|
+
(nxJson === null || nxJson === void 0 ? void 0 : nxJson.useInferencePlugins) !== false);
|
|
22
22
|
return {
|
|
23
|
-
addPlugin,
|
|
24
23
|
...options,
|
|
24
|
+
addPlugin,
|
|
25
25
|
name: appProjectName,
|
|
26
26
|
appProjectRoot,
|
|
27
27
|
parsedTags,
|
|
28
|
-
linter: (
|
|
29
|
-
unitTestRunner: (
|
|
30
|
-
rootProject: (
|
|
28
|
+
linter: (_c = options.linter) !== null && _c !== void 0 ? _c : 'eslint',
|
|
29
|
+
unitTestRunner: (_d = options.unitTestRunner) !== null && _d !== void 0 ? _d : 'jest',
|
|
30
|
+
rootProject: (_e = options.rootProject) !== null && _e !== void 0 ? _e : false,
|
|
31
31
|
};
|
|
32
32
|
}
|
|
33
33
|
//# sourceMappingURL=normalize-options.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;AAIA,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;AAIA,4CAmCC;AAvCD,uCAA8C;AAE9C,kDAAyE;AAElE,KAAK,UAAU,gBAAgB,CACpC,IAAU,EACV,OAAoC;;IAEpC,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,GAChE,MAAM,IAAA,6CAAkC,EAAC,IAAI,EAAE;QAC7C,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,WAAW,EAAE,aAAa;QAC1B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,WAAW,EAAE,OAAO,CAAC,WAAW;KACjC,CAAC,CAAC;IACL,OAAO,CAAC,WAAW,GAAG,cAAc,KAAK,GAAG,CAAC;IAE7C,OAAO,CAAC,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,SAAS,CAAC;IAE/C,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAChC,MAAM,SAAS,GACb,MAAA,OAAO,CAAC,SAAS,mCACjB,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,OAAO;QACrC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,mBAAmB,MAAK,KAAK,CAAC,CAAC;IAE3C,OAAO;QACL,GAAG,OAAO;QACV,SAAS;QACT,IAAI,EAAE,cAAc;QACpB,cAAc;QACd,UAAU;QACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,QAAQ;QAClC,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,MAAM;QAChD,WAAW,EAAE,MAAA,OAAO,CAAC,WAAW,mCAAI,KAAK;KAC1C,CAAC;AACJ,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare const createNodesV2:
|
|
1
|
+
import { CreateNodes } from '@nx/devkit';
|
|
2
|
+
export declare const createNodesV2: CreateNodes;
|
|
@@ -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,uCAAyG;AACzG,+EAA0E;AAC1E,2EAAsE;AACtE,2EAAsE;AACtE,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,MAAM,GAAG,IAAA,mCAAe,EAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IACjD,OAAO,CAAC,MAAM,GAAG,IAAA,mCAAe,EAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IACjD,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,GAAgB;IACxC,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/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.default = default_1;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const
|
|
5
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
6
6
|
async function default_1(tree) {
|
|
7
7
|
const update = (options, projectName, targetName, configurationName) => {
|
|
8
8
|
var _a;
|
|
@@ -12,22 +12,21 @@ async function default_1(tree) {
|
|
|
12
12
|
const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
|
|
13
13
|
if (!options.webpackConfig) {
|
|
14
14
|
options.webpackConfig = `${projectConfiguration.root}/webpack.config.js`;
|
|
15
|
-
tree.write(options.webpackConfig, `
|
|
16
|
-
const { composePlugins, withNx } = require('@nx/webpack');
|
|
15
|
+
tree.write(options.webpackConfig, `const { composePlugins, withNx } = require('@nx/webpack');
|
|
17
16
|
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
17
|
+
// Nx plugins for webpack.
|
|
18
|
+
module.exports = composePlugins(withNx(), (config) => {
|
|
19
|
+
// Note: This was added by an Nx Forge migration. Webpack builds are required to have a corresponding Webpack config file.
|
|
20
|
+
// See: https://nx.dev/recipes/webpack/webpack-config-setup
|
|
21
|
+
return config;
|
|
22
|
+
});
|
|
23
|
+
`);
|
|
25
24
|
const targets = ((_a = projectConfiguration.targets) !== null && _a !== void 0 ? _a : (projectConfiguration.targets = {}));
|
|
26
25
|
targets[targetName] = { ...targets[targetName], options };
|
|
27
26
|
(0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
|
|
28
27
|
}
|
|
29
28
|
};
|
|
30
|
-
(0,
|
|
29
|
+
(0, internal_1.forEachExecutorOptions)(tree, '@toolsplus/nx-forge:build', update);
|
|
31
30
|
await (0, devkit_1.formatFiles)(tree);
|
|
32
31
|
}
|
|
33
32
|
//# sourceMappingURL=update-3-0-0-webpack-config-setup.js.map
|
package/src/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-3-0-0-webpack-config-setup.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.ts"],"names":[],"mappings":";;AAYA,
|
|
1
|
+
{"version":3,"file":"update-3-0-0-webpack-config-setup.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.ts"],"names":[],"mappings":";;AAYA,4BAwCC;AApDD,uCAKoB;AACpB,kDAA6D;AAM9C,KAAK,oBAAW,IAAU;IACvC,MAAM,MAAM,GAAG,CACb,OAAmC,EACnC,WAAmB,EACnB,UAAkB,EAClB,iBAA0B,EAC1B,EAAE;;QACF,wGAAwG;QACxG,IAAI,iBAAiB;YAAE,OAAO;QAE9B,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEzE,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YAC3B,OAAO,CAAC,aAAa,GAAG,GAAG,oBAAoB,CAAC,IAAI,oBAAoB,CAAC;YACzE,IAAI,CAAC,KAAK,CACR,OAAO,CAAC,aAAa,EACrB;;;;;;;;CAQP,CACM,CAAC;YAEF,MAAM,OAAO,GAAG,OAAC,oBAAoB,CAAC,OAAO,oCAA5B,oBAAoB,CAAC,OAAO,GAAK,EAAE,EAAC,CAAC;YACtD,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC;YAC1D,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC;QACtE,CAAC;IACH,CAAC,CAAC;IAEF,IAAA,iCAAsB,EACpB,IAAI,EACJ,2BAA2B,EAC3B,MAAM,CACP,CAAC;IAEF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;AAC1B,CAAC"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const manifest_1 = require("@forge/manifest");
|
|
4
4
|
const node_fs_1 = require("node:fs");
|
|
5
|
-
const yaml_1 = require("yaml");
|
|
6
5
|
/**
|
|
7
6
|
* Copy of @forge/manifest YamlValidator with the only difference that the
|
|
8
7
|
* validator can be constructed with or without manifest interpolation. The
|
|
@@ -14,7 +13,6 @@ class YamlValidator {
|
|
|
14
13
|
this.options = options;
|
|
15
14
|
}
|
|
16
15
|
async validate(manifest) {
|
|
17
|
-
var _a, _b, _c;
|
|
18
16
|
if (!(manifest === null || manifest === void 0 ? void 0 : manifest.filePath)) {
|
|
19
17
|
return {
|
|
20
18
|
success: false,
|
|
@@ -39,21 +37,6 @@ class YamlValidator {
|
|
|
39
37
|
};
|
|
40
38
|
}
|
|
41
39
|
catch (e) {
|
|
42
|
-
if (e instanceof yaml_1.YAMLError) {
|
|
43
|
-
const pos = (_a = e.linePos) === null || _a === void 0 ? void 0 : _a[0];
|
|
44
|
-
return {
|
|
45
|
-
success: false,
|
|
46
|
-
errors: [
|
|
47
|
-
{
|
|
48
|
-
message: manifest_1.errors.invalidManifest(e.message.replace(/(at line).+/gms, '').trim()),
|
|
49
|
-
reference: manifest_1.References.InvalidManifest,
|
|
50
|
-
level: 'error',
|
|
51
|
-
line: (_b = pos === null || pos === void 0 ? void 0 : pos.line) !== null && _b !== void 0 ? _b : 0,
|
|
52
|
-
column: (_c = pos === null || pos === void 0 ? void 0 : pos.col) !== null && _c !== void 0 ? _c : 0,
|
|
53
|
-
},
|
|
54
|
-
],
|
|
55
|
-
};
|
|
56
|
-
}
|
|
57
40
|
return {
|
|
58
41
|
success: false,
|
|
59
42
|
errors: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yaml-validator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/utils/forge/yaml-validator.ts"],"names":[],"mappings":";;AAAA,8CAKyB;AACzB,qCAAuC;
|
|
1
|
+
{"version":3,"file":"yaml-validator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/utils/forge/yaml-validator.ts"],"names":[],"mappings":";;AAAA,8CAKyB;AACzB,qCAAuC;AAIvC;;;;;GAKG;AACH,MAAM,aAAa;IAGjB,YAAsB,OAAiC;QAAjC,YAAO,GAAP,OAAO,CAA0B;IAAG,CAAC;IAC3D,KAAK,CAAC,QAAQ,CACZ,QAAuC;QAEvC,IAAI,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,CAAA,EAAE,CAAC;YACxB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,cAAc,EAAE,QAAQ;aACzB,CAAC;QACJ,CAAC;QACD,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YACxD,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW;gBAC5C,CAAC,CAAC,IAAI,gCAAqB,EAAE,CAAC,iBAAiB,EAAE;gBACjD,CAAC,CAAC,IAAI,gCAAqB,EAAE,CAAC;YAChC,MAAM,eAAe,GAAG,aAAa;iBAClC,KAAK,EAAE;iBACP,aAAa,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC3D,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,cAAc,EAAE;oBACd,QAAQ,EAAE,QAAQ,CAAC,QAAQ;oBAC3B,WAAW,EAAE,eAAe;oBAC5B,iBAAiB,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;iBACvC;aACF,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE;oBACN;wBACE,OAAO,EAAE,iBAAM,CAAC,eAAe,CAC7B,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAC3C;wBACD,SAAS,EAAE,qBAAU,CAAC,eAAe;wBACrC,KAAK,EAAE,OAAO;wBACd,IAAI,EAAE,CAAC;wBACP,MAAM,EAAE,CAAC;qBACV;iBACF;aACF,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AACD,kBAAe,aAAa,CAAC"}
|