@toolsplus/nx-forge 6.1.1 → 6.1.4
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 +7 -2
- package/src/executors/build/executor.js +3 -0
- package/src/executors/build/executor.js.map +1 -1
- package/src/executors/build/lib/generate-package-json.js +8 -9
- package/src/executors/build/lib/generate-package-json.js.map +1 -1
- package/src/executors/build/lib/process-resource-dependencies.js +13 -6
- package/src/executors/build/lib/process-resource-dependencies.js.map +1 -1
- package/src/executors/deploy/executor.js +2 -2
- package/src/executors/deploy/executor.js.map +1 -1
- package/src/executors/deploy/lib/transform-manifest-yml.d.ts +3 -1
- package/src/executors/deploy/lib/transform-manifest-yml.js +1 -2
- package/src/executors/deploy/lib/transform-manifest-yml.js.map +1 -1
- package/src/executors/package/executor.js +3 -0
- package/src/executors/package/executor.js.map +1 -1
- package/src/executors/package/lib/create-package-json.d.ts +3 -3
- package/src/executors/package/lib/create-package-json.js +26 -19
- package/src/executors/package/lib/create-package-json.js.map +1 -1
- package/src/executors/register/executor.js +7 -0
- package/src/executors/register/executor.js.map +1 -1
- package/src/executors/register/schema.d.ts +2 -1
- package/src/executors/register/schema.json +10 -0
- package/src/executors/tunnel/executor.js +4 -1
- package/src/executors/tunnel/executor.js.map +1 -1
- package/src/executors/tunnel/lib/extract-custom-ui-projects.js +5 -1
- package/src/executors/tunnel/lib/extract-custom-ui-projects.js.map +1 -1
- package/src/executors/tunnel/lib/wait-until-server-is-listening.js +3 -2
- package/src/executors/tunnel/lib/wait-until-server-is-listening.js.map +1 -1
- package/src/generators/application/generator.js +1 -1
- package/src/generators/application/generator.js.map +1 -1
- package/src/generators/application/lib/add-app-files.js +2 -1
- package/src/generators/application/lib/add-app-files.js.map +1 -1
- package/src/generators/application/lib/add-project-dependencies.js +10 -3
- package/src/generators/application/lib/add-project-dependencies.js.map +1 -1
- package/src/generators/application/lib/add-project.js +12 -7
- 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 +4 -3
- package/src/generators/init/generator.js +2 -1
- package/src/generators/init/generator.js.map +1 -1
- package/src/graph/create-dependencies.js +3 -2
- package/src/graph/create-dependencies.js.map +1 -1
- package/src/graph/create-nodes.js.map +1 -1
- package/src/migrations/update-2-3-0/remove-implicit-custom-ui-dependencies.js +2 -2
- package/src/migrations/update-2-3-0/remove-implicit-custom-ui-dependencies.js.map +1 -1
- package/src/migrations/update-2-3-0/utils/manifest.js +2 -1
- package/src/migrations/update-2-3-0/utils/manifest.js.map +1 -1
- package/src/migrations/update-2-3-0/utils/yml.js +3 -2
- package/src/migrations/update-2-3-0/utils/yml.js.map +1 -1
- package/src/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.js +3 -1
- package/src/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.js.map +1 -1
- package/src/shared/manifest/util-manifest.d.ts +4 -4
- package/src/shared/manifest/util-manifest.js +103 -29
- package/src/shared/manifest/util-manifest.js.map +1 -1
- package/src/utils/forge/yaml-validator.js +1 -1
- package/src/utils/forge/yaml-validator.js.map +1 -1
- package/src/utils/has-webpack-plugin.js +1 -1
- package/src/utils/has-webpack-plugin.js.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wait-until-server-is-listening.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/tunnel/lib/wait-until-server-is-listening.ts"],"names":[],"mappings":";;AASA,gEA+CC;;AAxDD,iDAA2B;AAC3B,uCAAqD;AAErD;;;;;GAKG;AACH,SAAgB,0BAA0B,CACxC,IAAY,EACZ,OAAwB;IAExB,MAAM,iBAAiB,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;IACzD,MAAM,WAAW,GAAG,EAAE,CAAC;IACvB,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;IAChC,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QACrC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,CAAC,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,MAAM,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC,CAAC;IAEF,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,MAAM,GAAG,GAAG,EAAE;YAClB,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE;gBAC1B,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"wait-until-server-is-listening.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/tunnel/lib/wait-until-server-is-listening.ts"],"names":[],"mappings":";;AASA,gEA+CC;;AAxDD,iDAA2B;AAC3B,uCAAqD;AAErD;;;;;GAKG;AACH,SAAgB,0BAA0B,CACxC,IAAY,EACZ,OAAwB;IAExB,MAAM,iBAAiB,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;IACzD,MAAM,WAAW,GAAG,EAAE,CAAC;IACvB,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;IAChC,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QACrC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,CAAC,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,MAAM,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC,CAAC;IAEF,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,MAAM,GAAG,GAAG,EAAE;YAClB,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE;gBAC1B,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAA0B,EAAE,EAAE;;gBAChD,IACE,QAAQ,GAAG,WAAW;oBACtB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,MAAA,GAAG,CAAC,IAAI,mCAAI,EAAE,CAAC,EAC3C,CAAC;oBACD,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;wBACtB,eAAM,CAAC,KAAK,CACV,8CAA8C,IAAI,KAChD,QAAQ,GAAG,WAAW;4BACpB,CAAC,CAAC,iBAAiB,WAAW,YAAY;4BAC1C,CAAC,CAAC,yCAAyC,GAAG,CAAC,IAAI,EACvD,EAAE,CACH,CAAC;oBACJ,CAAC;oBACD,OAAO,EAAE,CAAC;oBACV,MAAM,CAAC,GAAG,CAAC,CAAC;gBACd,CAAC;qBAAM,CAAC;oBACN,QAAQ,EAAE,CAAC;oBACX,UAAU,CAAC,MAAM,EAAE,IAAI,GAAG,QAAQ,CAAC,CAAC;gBACtC,CAAC;YACH,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QAC9C,CAAC,CAAC;QACF,MAAM,EAAE,CAAC;IACX,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -71,7 +71,7 @@ async function applicationGeneratorInternal(tree, rawOptions) {
|
|
|
71
71
|
(0, lib_1.addAppFiles)(tree, options);
|
|
72
72
|
(0, lib_1.addProject)(tree, options);
|
|
73
73
|
updateTsConfigOptions(tree, options);
|
|
74
|
-
if (options.linter ===
|
|
74
|
+
if (options.linter === 'eslint') {
|
|
75
75
|
const lintTask = await (0, eslint_1.lintProjectGenerator)(tree, {
|
|
76
76
|
linter: options.linter,
|
|
77
77
|
project: options.name,
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/generators/application/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
|
|
|
5
5
|
const js_1 = require("@nx/js");
|
|
6
6
|
const has_webpack_plugin_1 = require("../../../utils/has-webpack-plugin");
|
|
7
7
|
function addAppFiles(tree, options) {
|
|
8
|
+
var _a;
|
|
8
9
|
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files'), options.appProjectRoot, {
|
|
9
10
|
tmpl: '',
|
|
10
11
|
name: options.name,
|
|
@@ -13,7 +14,7 @@ function addAppFiles(tree, options) {
|
|
|
13
14
|
rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot),
|
|
14
15
|
webpackPluginOptions: (0, has_webpack_plugin_1.hasWebpackPlugin)(tree)
|
|
15
16
|
? {
|
|
16
|
-
outputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : options.appProjectRoot, 'src'),
|
|
17
|
+
outputPath: (0, devkit_1.joinPathFragments)('dist', (_a = (options.rootProject ? options.name : options.appProjectRoot)) !== null && _a !== void 0 ? _a : '', 'src'),
|
|
17
18
|
main: './src/index' + (options.js ? '.js' : '.ts'),
|
|
18
19
|
tsConfig: './tsconfig.app.json',
|
|
19
20
|
assets: ['./src/assets'],
|
|
@@ -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,kCAqCC;AA/CD,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,EAAE,IAAA,qCAAgB,EAAC,IAAI,CAAC;YAC1C,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;KACT,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"}
|
|
@@ -16,6 +16,7 @@ async function getLatestPackageVersion(pkg) {
|
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
18
|
async function addProjectDependencies(tree, options) {
|
|
19
|
+
var _a;
|
|
19
20
|
const bundlers = {
|
|
20
21
|
webpack: {
|
|
21
22
|
'@nx/webpack': devkit_1.NX_VERSION,
|
|
@@ -27,15 +28,21 @@ async function addProjectDependencies(tree, options) {
|
|
|
27
28
|
};
|
|
28
29
|
const latestForgeApiVersion = await getLatestPackageVersion('@forge/api');
|
|
29
30
|
const latestForgeResolverVersion = await getLatestPackageVersion('@forge/resolver');
|
|
31
|
+
if (!latestForgeApiVersion) {
|
|
32
|
+
devkit_1.logger.warn(`Failed to fetch latest version of @forge/api. Using 'latest' tag as version`);
|
|
33
|
+
}
|
|
34
|
+
if (!latestForgeResolverVersion) {
|
|
35
|
+
devkit_1.logger.warn(`Failed to fetch latest version of @forge/resolver. Using 'latest' tag as version`);
|
|
36
|
+
}
|
|
30
37
|
const forgeDependencies = {
|
|
31
|
-
'@forge/api': latestForgeApiVersion,
|
|
32
|
-
'@forge/resolver': latestForgeResolverVersion,
|
|
38
|
+
'@forge/api': latestForgeApiVersion !== null && latestForgeApiVersion !== void 0 ? latestForgeApiVersion : 'latest',
|
|
39
|
+
'@forge/resolver': latestForgeResolverVersion !== null && latestForgeResolverVersion !== void 0 ? latestForgeResolverVersion : 'latest',
|
|
33
40
|
};
|
|
34
41
|
return (0, devkit_1.addDependenciesToPackageJson)(tree, {
|
|
35
42
|
...forgeDependencies,
|
|
36
43
|
tslib: versions_1.tsLibVersion,
|
|
37
44
|
}, {
|
|
38
|
-
...bundlers[options.bundler],
|
|
45
|
+
...bundlers[(_a = options.bundler) !== null && _a !== void 0 ? _a : 'webpack'],
|
|
39
46
|
'@types/node': versions_1.typesNodeVersion,
|
|
40
47
|
});
|
|
41
48
|
}
|
|
@@ -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":";;AA2BA,
|
|
1
|
+
{"version":3,"file":"add-project-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/add-project-dependencies.ts"],"names":[],"mappings":";;AA2BA,wDA8CC;AAzED,uCAMoB;AACpB,wDAImC;AAGnC,KAAK,UAAU,uBAAuB,CACpC,GAAW;;IAEX,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,8BAA8B,GAAG,EAAE,CAAC,CAAC;QAClE,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,MAAM,IAAI,KAAK,CAAC,qCAAqC,GAAG,EAAE,CAAC,CAAC;IAC9D,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"}
|
|
@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
|
|
|
5
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
|
+
var _a, _b, _c;
|
|
8
9
|
return {
|
|
9
10
|
executor: `@nx/webpack:webpack`,
|
|
10
11
|
outputs: ['{options.outputPath}'],
|
|
@@ -12,11 +13,11 @@ function getWebpackBuildConfig(project, options) {
|
|
|
12
13
|
options: {
|
|
13
14
|
target: 'node',
|
|
14
15
|
compiler: 'tsc',
|
|
15
|
-
outputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : options.appProjectRoot, 'src'),
|
|
16
|
-
main: (0, devkit_1.joinPathFragments)(project.sourceRoot, 'index' + (options.js ? '.js' : '.ts')),
|
|
16
|
+
outputPath: (0, devkit_1.joinPathFragments)('dist', (_a = (options.rootProject ? options.name : options.appProjectRoot)) !== null && _a !== void 0 ? _a : '', 'src'),
|
|
17
|
+
main: (0, devkit_1.joinPathFragments)((_b = project.sourceRoot) !== null && _b !== void 0 ? _b : '', 'index' + (options.js ? '.js' : '.ts')),
|
|
17
18
|
outputFileName: 'index.js',
|
|
18
19
|
tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
|
|
19
|
-
assets: [(0, devkit_1.joinPathFragments)(project.sourceRoot, 'assets')],
|
|
20
|
+
assets: [(0, devkit_1.joinPathFragments)((_c = project.sourceRoot) !== null && _c !== void 0 ? _c : '', 'assets')],
|
|
20
21
|
webpackConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'webpack.config.js'),
|
|
21
22
|
},
|
|
22
23
|
configurations: {
|
|
@@ -26,20 +27,21 @@ function getWebpackBuildConfig(project, options) {
|
|
|
26
27
|
};
|
|
27
28
|
}
|
|
28
29
|
function getEsBuildConfig(project, options) {
|
|
30
|
+
var _a, _b, _c;
|
|
29
31
|
return {
|
|
30
32
|
executor: '@nx/esbuild:esbuild',
|
|
31
33
|
outputs: ['{options.outputPath}'],
|
|
32
34
|
defaultConfiguration: 'production',
|
|
33
35
|
options: {
|
|
34
36
|
platform: 'node',
|
|
35
|
-
outputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : options.appProjectRoot, 'src'),
|
|
37
|
+
outputPath: (0, devkit_1.joinPathFragments)('dist', (_a = (options.rootProject ? options.name : options.appProjectRoot)) !== null && _a !== void 0 ? _a : '', 'src'),
|
|
36
38
|
// Use CJS for Node apps for widest compatibility.
|
|
37
39
|
format: ['cjs'],
|
|
38
40
|
bundle: true,
|
|
39
|
-
main: (0, devkit_1.joinPathFragments)(project.sourceRoot, 'index' + (options.js ? '.js' : '.ts')),
|
|
41
|
+
main: (0, devkit_1.joinPathFragments)((_b = project.sourceRoot) !== null && _b !== void 0 ? _b : '', 'index' + (options.js ? '.js' : '.ts')),
|
|
40
42
|
outputFileName: 'index.js',
|
|
41
43
|
tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
|
|
42
|
-
assets: [(0, devkit_1.joinPathFragments)(project.sourceRoot, 'assets')],
|
|
44
|
+
assets: [(0, devkit_1.joinPathFragments)((_c = project.sourceRoot) !== null && _c !== void 0 ? _c : '', 'assets')],
|
|
43
45
|
generatePackageJson: false,
|
|
44
46
|
esbuildOptions: {
|
|
45
47
|
sourcemap: true,
|
|
@@ -64,6 +66,7 @@ function getEsBuildConfig(project, options) {
|
|
|
64
66
|
* available targets.
|
|
65
67
|
*/
|
|
66
68
|
function addProject(tree, options) {
|
|
69
|
+
var _a, _b;
|
|
67
70
|
const project = {
|
|
68
71
|
root: options.appProjectRoot,
|
|
69
72
|
sourceRoot: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src'),
|
|
@@ -73,14 +76,16 @@ function addProject(tree, options) {
|
|
|
73
76
|
};
|
|
74
77
|
if (options.bundler === 'esbuild') {
|
|
75
78
|
(0, target_defaults_utils_1.addBuildTargetDefaults)(tree, '@nx/esbuild:esbuild');
|
|
79
|
+
(_a = project.targets) !== null && _a !== void 0 ? _a : (project.targets = {});
|
|
76
80
|
project.targets.build = getEsBuildConfig(project, options);
|
|
77
81
|
}
|
|
78
82
|
else if (options.bundler === 'webpack') {
|
|
79
83
|
if (!(0, has_webpack_plugin_1.hasWebpackPlugin)(tree)) {
|
|
80
84
|
(0, target_defaults_utils_1.addBuildTargetDefaults)(tree, `@nx/webpack:webpack`);
|
|
85
|
+
(_b = project.targets) !== null && _b !== void 0 ? _b : (project.targets = {});
|
|
81
86
|
project.targets.build = getWebpackBuildConfig(project, options);
|
|
82
87
|
}
|
|
83
88
|
}
|
|
84
|
-
(0, devkit_1.addProjectConfiguration)(tree, options.name, project, options.standaloneConfig);
|
|
89
|
+
(0, devkit_1.addProjectConfiguration)(tree, options.name || '', project, options.standaloneConfig);
|
|
85
90
|
}
|
|
86
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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"}
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalizeOptions = normalizeOptions;
|
|
4
|
-
const eslint_1 = require("@nx/eslint");
|
|
5
4
|
const devkit_1 = require("@nx/devkit");
|
|
6
5
|
const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
|
|
7
6
|
async function normalizeOptions(tree, options) {
|
|
8
7
|
var _a, _b, _c, _d;
|
|
9
|
-
await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'application');
|
|
10
8
|
const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
|
|
11
9
|
name: options.name,
|
|
12
10
|
projectType: 'application',
|
|
@@ -20,14 +18,14 @@ async function normalizeOptions(tree, options) {
|
|
|
20
18
|
: [];
|
|
21
19
|
const nxJson = (0, devkit_1.readNxJson)(tree);
|
|
22
20
|
const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
|
|
23
|
-
nxJson.useInferencePlugins !== false;
|
|
21
|
+
(nxJson === null || nxJson === void 0 ? void 0 : nxJson.useInferencePlugins) !== false;
|
|
24
22
|
return {
|
|
25
23
|
addPlugin,
|
|
26
24
|
...options,
|
|
27
25
|
name: appProjectName,
|
|
28
26
|
appProjectRoot,
|
|
29
27
|
parsedTags,
|
|
30
|
-
linter: (_b = options.linter) !== null && _b !== void 0 ? _b :
|
|
28
|
+
linter: (_b = options.linter) !== null && _b !== void 0 ? _b : 'eslint',
|
|
31
29
|
unitTestRunner: (_c = options.unitTestRunner) !== null && _c !== void 0 ? _c : 'jest',
|
|
32
30
|
rootProject: (_d = options.rootProject) !== null && _d !== void 0 ? _d : false,
|
|
33
31
|
};
|
|
@@ -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":";;AAIA,4CAkCC;AAtCD,uCAA8C;AAE9C,uGAA2G;AAEpG,KAAK,UAAU,gBAAgB,CACpC,IAAU,EACV,OAAoC;;IAEpC,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,GAChE,MAAM,IAAA,gEAAkC,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,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,OAAO;QACtC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,mBAAmB,MAAK,KAAK,CAAC;IAExC,OAAO;QACL,SAAS;QACT,GAAG,OAAO;QACV,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,11 +1,11 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { LinterType } from '@nx/eslint';
|
|
2
2
|
|
|
3
3
|
interface ApplicationGeneratorOptions {
|
|
4
4
|
directory: string;
|
|
5
5
|
name?: string;
|
|
6
6
|
skipFormat?: boolean;
|
|
7
7
|
skipPackageJson?: boolean;
|
|
8
|
-
linter?:
|
|
8
|
+
linter?: LinterType;
|
|
9
9
|
standaloneConfig?: boolean;
|
|
10
10
|
tags?: string;
|
|
11
11
|
bundler?: 'esbuild' | 'webpack';
|
|
@@ -20,9 +20,10 @@ interface ApplicationGeneratorOptions {
|
|
|
20
20
|
}
|
|
21
21
|
|
|
22
22
|
interface NormalizedOptions extends ApplicationGeneratorOptions {
|
|
23
|
+
name: string;
|
|
23
24
|
addPlugin: boolean;
|
|
24
25
|
appProjectRoot: string;
|
|
25
|
-
linter:
|
|
26
|
+
linter: LinterType;
|
|
26
27
|
unitTestRunner: 'jest' | 'none';
|
|
27
28
|
parsedTags: string[];
|
|
28
29
|
}
|
|
@@ -18,11 +18,12 @@ function updateNxJson(host) {
|
|
|
18
18
|
(0, devkit_1.writeJson)(host, 'nx.json', nxJson);
|
|
19
19
|
}
|
|
20
20
|
async function default_1(tree, options) {
|
|
21
|
+
var _a;
|
|
21
22
|
updateNxJson(tree);
|
|
22
23
|
const tasks = [];
|
|
23
24
|
if (!options.skipPackageJson) {
|
|
24
25
|
tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@toolsplus/nx-forge'], []));
|
|
25
|
-
const addDependenciesTask = await addDependencies(tree, options.keepExistingVersions);
|
|
26
|
+
const addDependenciesTask = await addDependencies(tree, (_a = options.keepExistingVersions) !== null && _a !== void 0 ? _a : false);
|
|
26
27
|
tasks.push(addDependenciesTask);
|
|
27
28
|
}
|
|
28
29
|
if (!options.skipFormat) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/generators/init/generator.ts"],"names":[],"mappings":";;AAsCA,4BAwBC;;AA9DD,uCAUoB;AAEpB,iFAAsD;AAEtD,KAAK,UAAU,eAAe,CAC5B,IAAU,EACV,oBAA6B;IAE7B,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,qBAAqB,EAAE,sBAAiB,CAAC,OAAO;KACjD,EACD,SAAS,EACT,oBAAoB,CACrB,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,IAAU;IAC9B,MAAM,MAAM,GAAwB,IAAA,iBAAQ,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC9D,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;IACtC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,qBAAqB,CAAC,EAAE,CAAC;QAC7D,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAC7C,CAAC;IACD,IAAA,kBAAS,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAEc,KAAK,oBAClB,IAAU,EACV,OAA4B
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/generators/init/generator.ts"],"names":[],"mappings":";;AAsCA,4BAwBC;;AA9DD,uCAUoB;AAEpB,iFAAsD;AAEtD,KAAK,UAAU,eAAe,CAC5B,IAAU,EACV,oBAA6B;IAE7B,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,qBAAqB,EAAE,sBAAiB,CAAC,OAAO;KACjD,EACD,SAAS,EACT,oBAAoB,CACrB,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,IAAU;IAC9B,MAAM,MAAM,GAAwB,IAAA,iBAAQ,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC9D,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;IACtC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,qBAAqB,CAAC,EAAE,CAAC;QAC7D,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAC7C,CAAC;IACD,IAAA,kBAAS,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAEc,KAAK,oBAClB,IAAU,EACV,OAA4B;;IAE5B,YAAY,CAAC,IAAI,CAAC,CAAC;IAEnB,MAAM,KAAK,GAAwB,EAAE,CAAC;IAEtC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;QAC7B,KAAK,CAAC,IAAI,CACR,IAAA,0CAAiC,EAAC,IAAI,EAAE,CAAC,qBAAqB,CAAC,EAAE,EAAE,CAAC,CACrE,CAAC;QACF,MAAM,mBAAmB,GAAG,MAAM,eAAe,CAC/C,IAAI,EACJ,MAAA,OAAO,CAAC,oBAAoB,mCAAI,KAAK,CACtC,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;AACpC,CAAC"}
|
|
@@ -25,7 +25,8 @@ const getUIResourceDependencies = async ([projectName, manifestFile], context) =
|
|
|
25
25
|
};
|
|
26
26
|
};
|
|
27
27
|
return uiResourceProjectNames.reduce((acc, uiResourceProjectName) => {
|
|
28
|
-
|
|
28
|
+
var _a;
|
|
29
|
+
return ((_a = manifestFile.deps) !== null && _a !== void 0 ? _a : []).some(([source, target, type]) => type === 'static' &&
|
|
29
30
|
target === uiResourceProjectName &&
|
|
30
31
|
source === projectName)
|
|
31
32
|
? acc // Dependency already exists, skip adding it again.
|
|
@@ -36,7 +37,7 @@ const createDependencies = async (options, context) => {
|
|
|
36
37
|
let dependencies = [];
|
|
37
38
|
for (const projectName in context.filesToProcess.projectFileMap) {
|
|
38
39
|
const changed = context.filesToProcess.projectFileMap[projectName];
|
|
39
|
-
for
|
|
40
|
+
for (const manifestFile of changed.filter((f) => f.file.endsWith('manifest.yml'))) {
|
|
40
41
|
devkit_1.logger.info(`[nx-forge] Processing ${projectName}:${manifestFile.file}`);
|
|
41
42
|
const uiResourceDependencies = await getUIResourceDependencies([projectName, manifestFile], context);
|
|
42
43
|
dependencies = dependencies.concat(uiResourceDependencies);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-dependencies.js","sourceRoot":"","sources":["../../../../../packages/nx-forge/src/graph/create-dependencies.ts"],"names":[],"mappings":";;;AAAA,uCAOoB;AACpB,8DAGqC;AAErC,MAAM,yBAAyB,GAAG,KAAK,EACrC,CAAC,WAAW,EAAE,YAAY,CAAqB,EAC/C,OAAkC,EACI,EAAE;IACxC,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAe,EAAC,YAAY,CAAC,IAAI,EAAE;QAC9D,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;IACH,MAAM,sBAAsB,GAAG,IAAA,4CAA6B,EAAC,cAAc,CAAC,CAAC;IAE7E,MAAM,6BAA6B,GAAG,CACpC,qBAA6B,EACF,EAAE;QAC7B,MAAM,8BAA8B,GAClC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC;QAE1C,IAAI,CAAC,8BAA8B,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CACb,6FAA6F,qBAAqB,kDAAkD,WAAW,oHAAoH,CACpS,CAAC;QACJ,CAAC;QAED,MAAM,oBAAoB,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAE3D,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CACb,6DAA6D,WAAW,EAAE,CAC3E,CAAC;QACJ,CAAC;QAED,OAAO;YACL,UAAU,EAAE,YAAY,CAAC,IAAI;YAC7B,MAAM,EAAE,WAAW;YACnB,MAAM,EAAE,qBAAqB;YAC7B,IAAI,EAAE,uBAAc,CAAC,MAAM;SAC5B,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,sBAAsB,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"create-dependencies.js","sourceRoot":"","sources":["../../../../../packages/nx-forge/src/graph/create-dependencies.ts"],"names":[],"mappings":";;;AAAA,uCAOoB;AACpB,8DAGqC;AAErC,MAAM,yBAAyB,GAAG,KAAK,EACrC,CAAC,WAAW,EAAE,YAAY,CAAqB,EAC/C,OAAkC,EACI,EAAE;IACxC,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAe,EAAC,YAAY,CAAC,IAAI,EAAE;QAC9D,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;IACH,MAAM,sBAAsB,GAAG,IAAA,4CAA6B,EAAC,cAAc,CAAC,CAAC;IAE7E,MAAM,6BAA6B,GAAG,CACpC,qBAA6B,EACF,EAAE;QAC7B,MAAM,8BAA8B,GAClC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC;QAE1C,IAAI,CAAC,8BAA8B,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CACb,6FAA6F,qBAAqB,kDAAkD,WAAW,oHAAoH,CACpS,CAAC;QACJ,CAAC;QAED,MAAM,oBAAoB,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAE3D,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CACb,6DAA6D,WAAW,EAAE,CAC3E,CAAC;QACJ,CAAC;QAED,OAAO;YACL,UAAU,EAAE,YAAY,CAAC,IAAI;YAC7B,MAAM,EAAE,WAAW;YACnB,MAAM,EAAE,qBAAqB;YAC7B,IAAI,EAAE,uBAAc,CAAC,MAAM;SAC5B,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,sBAAsB,CAAC,MAAM,CAClC,CAAC,GAAG,EAAE,qBAAqB,EAAE,EAAE;;QAC7B,OAAO,CAAC,MAAA,YAAY,CAAC,IAAI,mCAAI,EAAE,CAAC,CAAC,IAAI,CACnC,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CACzB,IAAI,KAAK,QAAQ;YACjB,MAAM,KAAK,qBAAqB;YAChC,MAAM,KAAK,WAAW,CACzB;YACC,CAAC,CAAC,GAAG,CAAC,mDAAmD;YACzD,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,6BAA6B,CAAC,qBAAqB,CAAC,CAAC,CAAC;IACrE,CAAC,EACD,EAAE,CACH,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAuB,KAAK,EACzD,OAAO,EACP,OAAO,EACP,EAAE;IACF,IAAI,YAAY,GAAgC,EAAE,CAAC;IAEnD,KAAK,MAAM,WAAW,IAAI,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;QAChE,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QACnE,KAAK,MAAM,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAC9C,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAChC,EAAE,CAAC;YACF,eAAM,CAAC,IAAI,CAAC,yBAAyB,WAAW,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;YACzE,MAAM,sBAAsB,GAAG,MAAM,yBAAyB,CAC5D,CAAC,WAAW,EAAE,YAAY,CAAC,EAC3B,OAAO,CACR,CAAC;YACF,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AArBW,QAAA,kBAAkB,sBAqB7B"}
|
|
@@ -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,uCAKoB;AACpB,+EAA0E;AAC1E,2EAAsE;AACtE,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,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,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,
|
|
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,2EAAsE;AACtE,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,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,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,OAA6B;IAE7B,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"}
|
|
@@ -6,7 +6,6 @@ const devkit_1 = require("@nx/devkit");
|
|
|
6
6
|
const manifest_yml_1 = require("../../utils/forge/manifest-yml");
|
|
7
7
|
const manifest_1 = require("./utils/manifest");
|
|
8
8
|
async function update(host) {
|
|
9
|
-
var _a;
|
|
10
9
|
const projects = (0, devkit_1.getProjects)(host);
|
|
11
10
|
const isForgeProject = (config) => {
|
|
12
11
|
return (config.projectType === 'application' &&
|
|
@@ -14,7 +13,8 @@ async function update(host) {
|
|
|
14
13
|
};
|
|
15
14
|
for (const [name, config] of projects.entries()) {
|
|
16
15
|
if (config && isForgeProject(config)) {
|
|
17
|
-
if (
|
|
16
|
+
if (config.implicitDependencies &&
|
|
17
|
+
config.implicitDependencies.length > 0) {
|
|
18
18
|
const manifest = await (0, manifest_1.readManifestYml)(host, (0, devkit_1.joinPathFragments)(config.root, 'manifest.yml'));
|
|
19
19
|
const customUIProjectNames = (0, manifest_yml_1.extractUIResourceProjectNames)(manifest);
|
|
20
20
|
config.implicitDependencies = config.implicitDependencies.filter((d) => !customUIProjectNames.includes(d));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-implicit-custom-ui-dependencies.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/migrations/update-2-3-0/remove-implicit-custom-ui-dependencies.ts"],"names":[],"mappings":";;AAWA,
|
|
1
|
+
{"version":3,"file":"remove-implicit-custom-ui-dependencies.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/migrations/update-2-3-0/remove-implicit-custom-ui-dependencies.ts"],"names":[],"mappings":";;AAWA,yBA4BC;AAvCD,sDAAsD;AACtD,uCAMoB;AACpB,iEAA+E;AAC/E,+CAAmD;AAEpC,KAAK,UAAU,MAAM,CAAC,IAAU;IAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAEnC,MAAM,cAAc,GAAG,CAAC,MAA4B,EAAW,EAAE;QAC/D,OAAO,CACL,MAAM,CAAC,WAAW,KAAK,aAAa;YACpC,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAC5D,CAAC;IACJ,CAAC,CAAC;IAEF,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;QAChD,IAAI,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,IACE,MAAM,CAAC,oBAAoB;gBAC3B,MAAM,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,EACtC,CAAC;gBACD,MAAM,QAAQ,GAAG,MAAM,IAAA,0BAAe,EACpC,IAAI,EACJ,IAAA,0BAAiB,EAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CAC/C,CAAC;gBACF,MAAM,oBAAoB,GAAG,IAAA,4CAA6B,EAAC,QAAQ,CAAC,CAAC;gBACrE,MAAM,CAAC,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAC9D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CACzC,CAAC;gBACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -7,10 +7,11 @@ const manifest_1 = require("@forge/manifest");
|
|
|
7
7
|
const FULL_SCHEMA = tslib_1.__importStar(require("@forge/manifest/out/schema/manifest-schema.json"));
|
|
8
8
|
const manifestSchemaValidator = new manifest_1.SchemaValidator(FULL_SCHEMA);
|
|
9
9
|
const readManifestYml = async (tree, path) => {
|
|
10
|
+
var _a;
|
|
10
11
|
const result = await manifestSchemaValidator.validate({
|
|
11
12
|
yamlContent: (0, yml_1.readYaml)(tree, path),
|
|
12
13
|
});
|
|
13
|
-
if (result.success) {
|
|
14
|
+
if (result.success && ((_a = result.manifestObject) === null || _a === void 0 ? void 0 : _a.typedContent)) {
|
|
14
15
|
return result.manifestObject.typedContent;
|
|
15
16
|
}
|
|
16
17
|
throw new Error(`Cannot validate manifest ${path}: ${result.errors}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/migrations/update-2-3-0/utils/manifest.ts"],"names":[],"mappings":";;;;AACA,+BAA4C;AAC5C,8CAAkE;AAClE,qGAA+E;AAE/E,MAAM,uBAAuB,GAAG,IAAI,0BAAe,CACjD,WAAW,CACZ,CAAC;AAEK,MAAM,eAAe,GAAG,KAAK,
|
|
1
|
+
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/migrations/update-2-3-0/utils/manifest.ts"],"names":[],"mappings":";;;;AACA,+BAA4C;AAC5C,8CAAkE;AAClE,qGAA+E;AAE/E,MAAM,uBAAuB,GAAG,IAAI,0BAAe,CACjD,WAAW,CACZ,CAAC;AAEK,MAAM,eAAe,GAAG,KAAK,EAClC,IAAU,EACV,IAAY,EACa,EAAE;;IAC3B,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,QAAQ,CAAC;QACpD,WAAW,EAAE,IAAA,cAAQ,EAAC,IAAI,EAAE,IAAI,CAAC;KAClC,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,OAAO,KAAI,MAAA,MAAM,CAAC,cAAc,0CAAE,YAAY,CAAA,EAAE,CAAC;QAC1D,OAAO,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC;IAC5C,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AACxE,CAAC,CAAC;AAbW,QAAA,eAAe,mBAa1B;AAEK,MAAM,gBAAgB,GAAG,CAC9B,IAAU,EACV,IAAY,EACZ,KAAqB,EACrB,EAAE;IACF,IAAA,eAAS,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;AAC/B,CAAC,CAAC;AANW,QAAA,gBAAgB,oBAM3B"}
|
|
@@ -10,14 +10,15 @@ const js_yaml_1 = require("js-yaml");
|
|
|
10
10
|
* @param options - Optional YAML load options
|
|
11
11
|
*/
|
|
12
12
|
const readYaml = (tree, path, options) => {
|
|
13
|
+
var _a;
|
|
13
14
|
if (!tree.exists(path)) {
|
|
14
15
|
throw new Error(`Cannot find ${path}`);
|
|
15
16
|
}
|
|
16
17
|
try {
|
|
17
|
-
return (0, js_yaml_1.load)(tree.read(path, 'utf-8'), options);
|
|
18
|
+
return (0, js_yaml_1.load)((_a = tree.read(path, 'utf-8')) !== null && _a !== void 0 ? _a : '', options);
|
|
18
19
|
}
|
|
19
20
|
catch (e) {
|
|
20
|
-
throw new Error(`Cannot parse ${path}: ${e.message}`);
|
|
21
|
+
throw new Error(`Cannot parse ${path}: ${e instanceof Error ? e.message : String(e)}`);
|
|
21
22
|
}
|
|
22
23
|
};
|
|
23
24
|
exports.readYaml = readYaml;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yml.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/migrations/update-2-3-0/utils/yml.ts"],"names":[],"mappings":";;;AAEA,qCAA+D;AAE/D;;;;;;GAMG;AACI,MAAM,QAAQ,GAAG,CACtB,IAAU,EACV,IAAY,EACZ,OAAqB,EACL,EAAE
|
|
1
|
+
{"version":3,"file":"yml.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/migrations/update-2-3-0/utils/yml.ts"],"names":[],"mappings":";;;AAEA,qCAA+D;AAE/D;;;;;;GAMG;AACI,MAAM,QAAQ,GAAG,CACtB,IAAU,EACV,IAAY,EACZ,OAAqB,EACL,EAAE;;IAClB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,CAAC;QACH,OAAO,IAAA,cAAI,EAAC,MAAA,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,mCAAI,EAAE,EAAE,OAAO,CAAmB,CAAC;IACzE,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CACb,gBAAgB,IAAI,KAAK,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CACtE,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAfW,QAAA,QAAQ,YAenB;AAEF;;;;;;;GAOG;AACI,MAAM,SAAS,GAAG,CACvB,IAAU,EACV,IAAY,EACZ,KAAQ,EACR,OAAqB,EACf,EAAE;IACR,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAA,cAAI,EAAC,KAAK,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC;AAC/C,CAAC,CAAC;AAPW,QAAA,SAAS,aAOpB"}
|
package/src/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.js
CHANGED
|
@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
|
|
|
5
5
|
const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
|
|
6
6
|
async function default_1(tree) {
|
|
7
7
|
const update = (options, projectName, targetName, configurationName) => {
|
|
8
|
+
var _a;
|
|
8
9
|
// There should not be any configurations, if there are skip the update - only handle the default config
|
|
9
10
|
if (configurationName)
|
|
10
11
|
return;
|
|
@@ -21,7 +22,8 @@ async function default_1(tree) {
|
|
|
21
22
|
return config;
|
|
22
23
|
});
|
|
23
24
|
`);
|
|
24
|
-
projectConfiguration.targets
|
|
25
|
+
const targets = ((_a = projectConfiguration.targets) !== null && _a !== void 0 ? _a : (projectConfiguration.targets = {}));
|
|
26
|
+
targets[targetName] = { ...targets[targetName], options };
|
|
25
27
|
(0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
|
|
26
28
|
}
|
|
27
29
|
};
|
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":";;AASA,
|
|
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":";;AASA,4BAyCC;AAlDD,uCAKoB;AACpB,6FAA0F;AAG3E,KAAK,oBAAW,IAAU;IACvC,MAAM,MAAM,GAAG,CACb,OAA6B,EAC7B,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;;;;;;;;;SASC,CACF,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,+CAAsB,EACpB,IAAI,EACJ,2BAA2B,EAC3B,MAAM,CACP,CAAC;IAEF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;AAC1B,CAAC"}
|
|
@@ -15,7 +15,7 @@ export type ResourceTypeIndex = {
|
|
|
15
15
|
*/
|
|
16
16
|
export declare const getResourceTypeIndex: (manifestSchema: ManifestSchema) => ResourceTypeIndex;
|
|
17
17
|
/**
|
|
18
|
-
* Determines
|
|
18
|
+
* Determines the type of the given resource.
|
|
19
19
|
*
|
|
20
20
|
* The resource type is determined by the following reduction:
|
|
21
21
|
*
|
|
@@ -23,14 +23,14 @@ export declare const getResourceTypeIndex: (manifestSchema: ManifestSchema) => R
|
|
|
23
23
|
* UI or UI Kit resource.
|
|
24
24
|
* - If the resource key is referenced via resource string interpolation
|
|
25
25
|
* (resource:<resource-key>;) anywhere in the manifest, infer a static resource.
|
|
26
|
-
* - Else infer Custom UI. These
|
|
26
|
+
* - Else infer Custom UI. These kinds of resources are typically used as Modal
|
|
27
27
|
* dialogs in Custom UIs. They are not referenced in the manifest and instead,
|
|
28
28
|
* opened via @forge/bridge in Custom UI code.
|
|
29
29
|
*
|
|
30
30
|
* @see https://developer.atlassian.com/platform/forge/apis-reference/ui-api-bridge/modal/
|
|
31
31
|
*
|
|
32
32
|
* @param manifestSchema Complete manifest definition
|
|
33
|
-
* @
|
|
33
|
+
* @returns Function that takes the resource to resolve against the manifest definition
|
|
34
34
|
*/
|
|
35
35
|
export declare const resourceTypeByResourceDefinition: (manifestSchema: ManifestSchema) => (resource: HostedResourcesSchema) => ResourceType;
|
|
36
36
|
/**
|
|
@@ -43,6 +43,6 @@ export declare const resourceTypeByResourceDefinition: (manifestSchema: Manifest
|
|
|
43
43
|
*
|
|
44
44
|
* @param manifestSchema Complete manifest definition
|
|
45
45
|
* @param acceptedResourceTypes Allows to filer for specific resource types
|
|
46
|
-
* @
|
|
46
|
+
* @returns Function that takes a resource to resolve against the manifest definition
|
|
47
47
|
*/
|
|
48
48
|
export declare const isResourceType: (manifestSchema: ManifestSchema, acceptedResourceTypes: ResourceType[]) => (resource: HostedResourcesSchema) => boolean;
|