@toolsplus/nx-forge 2.3.0 → 3.0.0-beta.1
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/README.md +14 -4
- package/migrations.json +5 -0
- package/package.json +7 -9
- package/src/executors/build/executor.js +4 -9
- package/src/executors/build/executor.js.map +1 -1
- package/src/executors/build/lib/compile-webpack.js +2 -0
- package/src/executors/build/lib/compile-webpack.js.map +1 -1
- package/src/executors/build/lib/copy-forge-app-assets.js +4 -3
- package/src/executors/build/lib/copy-forge-app-assets.js.map +1 -1
- package/src/executors/build/lib/generate-package-json.js +5 -2
- package/src/executors/build/lib/generate-package-json.js.map +1 -1
- package/src/executors/build/lib/normalize-options.js +1 -2
- package/src/executors/build/lib/normalize-options.js.map +1 -1
- package/src/executors/build/lib/patch-manifest-yml.js +2 -1
- package/src/executors/build/lib/patch-manifest-yml.js.map +1 -1
- package/src/executors/build/lib/process-custom-ui-dependencies.js +1 -1
- package/src/executors/build/lib/process-custom-ui-dependencies.js.map +1 -1
- package/src/executors/build/schema.d.ts +2 -0
- package/src/executors/build/schema.json +18 -0
- package/src/executors/tunnel/executor.js +4 -9
- package/src/executors/tunnel/executor.js.map +1 -1
- package/src/generators/application/files/webpack.config.js +5 -0
- package/src/generators/application/generator.js +3 -7
- package/src/generators/application/generator.js.map +1 -1
- package/src/generators/application/lib/get-build-config.js +1 -0
- package/src/generators/application/lib/get-build-config.js.map +1 -1
- package/src/generators/application/lib/normalize-options.js +2 -2
- package/src/generators/application/schema.d.ts +1 -1
- package/src/graph/forge-project-graph.js +9 -14
- package/src/graph/forge-project-graph.js.map +1 -1
- package/src/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.d.ts +2 -0
- package/src/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.js +34 -0
- package/src/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.js.map +1 -0
package/README.md
CHANGED
|
@@ -8,7 +8,7 @@ Building on top of Nx means shared code can easily be extracted into libraries,
|
|
|
8
8
|
The following setup procedure assumes you already have a Nx workspace. If you do not, make sure to create one using
|
|
9
9
|
|
|
10
10
|
```shell
|
|
11
|
-
npx create-nx-workspace <workspace-name> --preset=apps
|
|
11
|
+
npx create-nx-workspace@latest <workspace-name> --preset=apps
|
|
12
12
|
```
|
|
13
13
|
|
|
14
14
|
You will be asked if you would like to use Nx Cloud or not (either option is fine). Once, the workspace has been created run `cd <workspace-name>`.
|
|
@@ -26,13 +26,13 @@ npm install --save-dev @nx/node
|
|
|
26
26
|
Add the plugin to your Nx workspace using
|
|
27
27
|
|
|
28
28
|
```shell
|
|
29
|
-
npm install --save-dev @toolsplus/nx-
|
|
29
|
+
npm install --save-dev @toolsplus/nx-forge
|
|
30
30
|
```
|
|
31
31
|
|
|
32
32
|
or
|
|
33
33
|
|
|
34
34
|
```shell
|
|
35
|
-
yarn add --dev @toolsplus/nx-
|
|
35
|
+
yarn add --dev @toolsplus/nx-forge
|
|
36
36
|
```
|
|
37
37
|
|
|
38
38
|
### Generate a Forge app
|
|
@@ -40,7 +40,7 @@ yarn add --dev @toolsplus/nx-nx-forge
|
|
|
40
40
|
Once installed, run the Forge app generator to generate a Forge app.
|
|
41
41
|
|
|
42
42
|
```shell
|
|
43
|
-
nx g @toolsplus/nx-
|
|
43
|
+
nx g @toolsplus/nx-forge:app <nx-forge-app-name>
|
|
44
44
|
```
|
|
45
45
|
|
|
46
46
|
> Hint: You can use the `--dry-run` flag to see what will be generated.
|
|
@@ -147,22 +147,32 @@ For any of the plugin targets below append `--help` or `-h` to explore all avail
|
|
|
147
147
|
|
|
148
148
|
Run `nx register <nx-forge-app-name>` to register the Forge app with the Forge platform.
|
|
149
149
|
|
|
150
|
+
[Schema reference](./src/executors/register/schema.json)
|
|
151
|
+
|
|
150
152
|
### Build
|
|
151
153
|
|
|
152
154
|
Run `nx build <nx-forge-app-name>` to build the project. The build artifacts will be stored in the `dist/` directory.
|
|
153
155
|
|
|
156
|
+
[Schema reference](./src/executors/build/schema.json)
|
|
157
|
+
|
|
154
158
|
### Deploy
|
|
155
159
|
|
|
156
160
|
Run `nx deploy <nx-forge-app-name>` to deploy the project. The build artifacts will be deployed using the Forge CLI deploy command.
|
|
157
161
|
|
|
162
|
+
[Schema reference](./src/executors/deploy/schema.json)
|
|
163
|
+
|
|
158
164
|
### Install
|
|
159
165
|
|
|
160
166
|
Run `nx install <nx-forge-app-name>` to install the Forge app. The CLI will prompt for site, product if they are not provided as parameters.
|
|
161
167
|
|
|
168
|
+
[Schema reference](./src/executors/install/schema.json)
|
|
169
|
+
|
|
162
170
|
### Tunnel (experimental)
|
|
163
171
|
|
|
164
172
|
Run `nx serve <nx-forge-app-name>` to serve the project. This will start the `serve` target for all Custom UI projects defined in the app `manifest.yml` on their specified tunnel port. After that, it will start a build process in watch mode for the Forge app itself, before ultimately, starting the `nx-forge tunnel` process for the Forge app.
|
|
165
173
|
|
|
174
|
+
[Schema reference](./src/executors/tunnel/schema.json)
|
|
175
|
+
|
|
166
176
|
## Migrate to a newer plugin version
|
|
167
177
|
|
|
168
178
|
As of plugin version 2.2.0 the plugin ships with migration scripts that allow you to use the [`nx migrate`](https://nx.dev/packages/nx/documents/migrate) to update your workspace to a newer version of `nx-forge`.
|
package/migrations.json
CHANGED
|
@@ -11,6 +11,11 @@
|
|
|
11
11
|
"description": "Removes implicit Custom UI dependencies from Forge app projects",
|
|
12
12
|
"cli": "nx",
|
|
13
13
|
"implementation": "./src/migrations/update-2-3-0/remove-implicit-custom-ui-dependencies"
|
|
14
|
+
},
|
|
15
|
+
"update-3-0-0-webpack-config-setup": {
|
|
16
|
+
"version": "3.0.0-beta.0",
|
|
17
|
+
"description": "Add webpack.config.js file when webpackConfig is not defined",
|
|
18
|
+
"implementation": "./src/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup"
|
|
14
19
|
}
|
|
15
20
|
}
|
|
16
21
|
}
|
package/package.json
CHANGED
|
@@ -1,22 +1,20 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@toolsplus/nx-forge",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.0-beta.1",
|
|
4
4
|
"description": "Atlassian Forge plugin for Nx",
|
|
5
|
-
"main": "src/index.js",
|
|
5
|
+
"main": "./src/index.js",
|
|
6
6
|
"generators": "./generators.json",
|
|
7
7
|
"executors": "./executors.json",
|
|
8
8
|
"peerDependencies": {
|
|
9
|
-
"@nx/
|
|
10
|
-
"@nx/
|
|
11
|
-
"@nx/
|
|
9
|
+
"@nx/webpack": "^17.0.0",
|
|
10
|
+
"@nx/workspace": "^17.0.0",
|
|
11
|
+
"@nx/node": "^17.0.0"
|
|
12
12
|
},
|
|
13
13
|
"nx-migrations": {
|
|
14
14
|
"migrations": "./migrations.json"
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@
|
|
18
|
-
"fs-extra": "^10.0.1",
|
|
19
|
-
"js-yaml": "^4.1.0"
|
|
17
|
+
"@nx/devkit": "17.2.8"
|
|
20
18
|
},
|
|
21
|
-
"
|
|
19
|
+
"type": "commonjs"
|
|
22
20
|
}
|
|
@@ -21,17 +21,12 @@ function runExecutor(rawOptions, context) {
|
|
|
21
21
|
const options = (0, normalize_options_1.normalizeOptions)(rawOptions, context.root, sourceRoot, root);
|
|
22
22
|
const compilation = (0, compile_webpack_1.compileWebpack)(options, context);
|
|
23
23
|
try {
|
|
24
|
-
for (var _d = true, compilation_1 = tslib_1.__asyncValues(compilation), compilation_1_1; compilation_1_1 = yield compilation_1.next(), _a = compilation_1_1.done, !_a;) {
|
|
24
|
+
for (var _d = true, compilation_1 = tslib_1.__asyncValues(compilation), compilation_1_1; compilation_1_1 = yield compilation_1.next(), _a = compilation_1_1.done, !_a; _d = true) {
|
|
25
25
|
_c = compilation_1_1.value;
|
|
26
26
|
_d = false;
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
throw new Error(`Failed to compile files for project ${context.projectName}.`);
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
finally {
|
|
34
|
-
_d = true;
|
|
27
|
+
const result = _c;
|
|
28
|
+
if (!result.success) {
|
|
29
|
+
throw new Error(`Failed to compile files for project ${context.projectName}.`);
|
|
35
30
|
}
|
|
36
31
|
}
|
|
37
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/build/executor.ts"],"names":[],"mappings":";;;AACA,uCAAoC;AAEpC,+DAA2D;AAC3D,yFAAmF;AACnF,iEAA4D;AAC5D,uEAAkE;AAClE,2DAAuD;AACvD,uEAAiE;AAEjE,SAA8B,WAAW,CACvC,UAAgC,EAChC,OAAwB;;;QAExB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GACxB,OAAO,CAAC,sBAAuB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAY,CAAC,CAAC;QAEjE,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,8BAA8B,CAAC,CAAC;SACvE;QAED,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,wBAAwB,CAAC,CAAC;SACjE;QAED,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAC7E,MAAM,WAAW,GAAG,IAAA,gCAAc,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;;YAErD,KAA2B,eAAA,gBAAA,sBAAA,WAAW,CAAA,iBAAA;
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/build/executor.ts"],"names":[],"mappings":";;;AACA,uCAAoC;AAEpC,+DAA2D;AAC3D,yFAAmF;AACnF,iEAA4D;AAC5D,uEAAkE;AAClE,2DAAuD;AACvD,uEAAiE;AAEjE,SAA8B,WAAW,CACvC,UAAgC,EAChC,OAAwB;;;QAExB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GACxB,OAAO,CAAC,sBAAuB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAY,CAAC,CAAC;QAEjE,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,8BAA8B,CAAC,CAAC;SACvE;QAED,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,wBAAwB,CAAC,CAAC;SACjE;QAED,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAC7E,MAAM,WAAW,GAAG,IAAA,gCAAc,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;;YAErD,KAA2B,eAAA,gBAAA,sBAAA,WAAW,CAAA,iBAAA,2FAAE;gBAAb,2BAAW;gBAAX,WAAW;gBAA3B,MAAM,MAAM,KAAA,CAAA;gBACrB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;oBACnB,MAAM,IAAI,KAAK,CACb,uCAAuC,OAAO,CAAC,WAAW,GAAG,CAC9D,CAAC;iBACH;aACF;;;;;;;;;QAED,IAAA,0CAAkB,EAAC,OAAO,CAAC,CAAC;QAC5B,MAAM,iBAAiB,GAAG,MAAM,IAAA,4DAA2B,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9E,MAAM,IAAA,qCAAgB,EAAC,OAAO,CAAC,CAAC;QAChC,IAAA,2CAAmB,EACjB,OAAO,CAAC,WAAY,EACpB,OAAO,CAAC,YAAa,EACrB,iBAAiB,EACjB,OAAO,CACR,CAAC;QAEF,eAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACtC,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;;CACH;AAxCD,8BAwCC"}
|
|
@@ -18,6 +18,8 @@ function compileWebpack(options, context) {
|
|
|
18
18
|
fileReplacements: [],
|
|
19
19
|
extractLicenses: false,
|
|
20
20
|
externalDependencies: 'all',
|
|
21
|
+
sourceMap: options.sourceMap,
|
|
22
|
+
webpackConfig: options.webpackConfig,
|
|
21
23
|
};
|
|
22
24
|
return (0, webpack_1.webpackExecutor)(webpackOptions, context);
|
|
23
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile-webpack.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/compile-webpack.ts"],"names":[],"mappings":";;;AAAA,uCAAgE;AAEhE,yCAAoE;AAGpE,SAAgB,cAAc,CAC5B,OAA0B,EAC1B,OAAwB;IAExB,MAAM,cAAc,GAA2B;QAC7C,MAAM,EAAE,MAAM;QACd,QAAQ,EAAE,KAAK;QACf,UAAU,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC;QACxD,cAAc,EAAE,UAAU;QAC1B,QAAQ,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB;QACpD,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,eAAe;QAC3C,mBAAmB,EAAE,KAAK;QAC1B,MAAM,EAAE,EAAE;QACV,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,YAAY,EAAE,EAAE;QAChB,gBAAgB,EAAE,EAAE;QACpB,eAAe,EAAE,KAAK;QACtB,oBAAoB,EAAE,KAAK;
|
|
1
|
+
{"version":3,"file":"compile-webpack.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/compile-webpack.ts"],"names":[],"mappings":";;;AAAA,uCAAgE;AAEhE,yCAAoE;AAGpE,SAAgB,cAAc,CAC5B,OAA0B,EAC1B,OAAwB;IAExB,MAAM,cAAc,GAA2B;QAC7C,MAAM,EAAE,MAAM;QACd,QAAQ,EAAE,KAAK;QACf,UAAU,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC;QACxD,cAAc,EAAE,UAAU;QAC1B,QAAQ,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB;QACpD,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,eAAe;QAC3C,mBAAmB,EAAE,KAAK;QAC1B,MAAM,EAAE,EAAE;QACV,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,YAAY,EAAE,EAAE;QAChB,gBAAgB,EAAE,EAAE;QACpB,eAAe,EAAE,KAAK;QACtB,oBAAoB,EAAE,KAAK;QAC3B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,aAAa,EAAE,OAAO,CAAC,aAAa;KACrC,CAAC;IAEF,OAAO,IAAA,yBAAe,EAAC,cAAc,EAAE,OAAO,CAAC,CAAC;AAClD,CAAC;AAvBD,wCAuBC"}
|
|
@@ -7,12 +7,13 @@ const devkit_1 = require("@nx/devkit");
|
|
|
7
7
|
const fileutils_1 = require("@nx/workspace/src/utilities/fileutils");
|
|
8
8
|
function copyForgeAppAssets(options) {
|
|
9
9
|
devkit_1.logger.info('Copying Forge app assets...');
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
const absoluteOutputPath = (0, path_1.resolve)(options.root, options.outputPath);
|
|
11
|
+
if (!(0, fileutils_1.directoryExists)(absoluteOutputPath)) {
|
|
12
|
+
(0, fs_1.mkdirSync)(absoluteOutputPath, { recursive: true });
|
|
12
13
|
}
|
|
13
14
|
// Copies the Forge app manifest file from the project root directory into the
|
|
14
15
|
// build output directory.
|
|
15
|
-
(0, fs_1.copyFileSync)((0, path_1.join)(options.root, options.projectRoot, 'manifest.yml'), (0, path_1.join)(
|
|
16
|
+
(0, fs_1.copyFileSync)((0, path_1.join)(options.root, options.projectRoot, 'manifest.yml'), (0, path_1.join)(absoluteOutputPath, 'manifest.yml'));
|
|
16
17
|
devkit_1.logger.info('Done copying Forge app assets.');
|
|
17
18
|
}
|
|
18
19
|
exports.copyForgeAppAssets = copyForgeAppAssets;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copy-forge-app-assets.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/copy-forge-app-assets.ts"],"names":[],"mappings":";;;AAAA,2BAA6C;AAC7C,+
|
|
1
|
+
{"version":3,"file":"copy-forge-app-assets.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/copy-forge-app-assets.ts"],"names":[],"mappings":";;;AAAA,2BAA6C;AAC7C,+BAAqC;AACrC,uCAAoC;AACpC,qEAAwE;AAGxE,SAAgB,kBAAkB,CAAC,OAA0B;IAC3D,eAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IAE3C,MAAM,kBAAkB,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAErE,IAAI,CAAC,IAAA,2BAAe,EAAC,kBAAkB,CAAC,EAAE;QACxC,IAAA,cAAS,EAAC,kBAAkB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KACpD;IAED,8EAA8E;IAC9E,0BAA0B;IAC1B,IAAA,iBAAY,EACV,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,EACvD,IAAA,WAAI,EAAC,kBAAkB,EAAE,cAAc,CAAC,CACzC,CAAC;IAEF,eAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;AAChD,CAAC;AAjBD,gDAiBC"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.generatePackageJson = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const object_sort_1 = require("nx/src/utils/object-sort");
|
|
6
|
+
const path_1 = require("path");
|
|
6
7
|
/**
|
|
7
8
|
* Merges the existing package.json details with a generated package.json that includes
|
|
8
9
|
* all required dependencies.
|
|
@@ -17,7 +18,7 @@ function generatePackageJson(projectName, graph, customUIResources, options) {
|
|
|
17
18
|
const packageJson = createPackageJson(projectName, graph, customUIResources, options);
|
|
18
19
|
packageJson.main = (_a = packageJson.main) !== null && _a !== void 0 ? _a : options.outputFileName;
|
|
19
20
|
delete packageJson.devDependencies;
|
|
20
|
-
(0, devkit_1.writeJsonFile)(`${options.outputPath}/package.json`, packageJson);
|
|
21
|
+
(0, devkit_1.writeJsonFile)(`${(0, path_1.resolve)(options.root, options.outputPath)}/package.json`, packageJson);
|
|
21
22
|
}
|
|
22
23
|
exports.generatePackageJson = generatePackageJson;
|
|
23
24
|
/**
|
|
@@ -30,7 +31,9 @@ exports.generatePackageJson = generatePackageJson;
|
|
|
30
31
|
*
|
|
31
32
|
* @see https://github.com/nrwl/nx/blob/15.2.4/packages/workspace/src/utilities/create-package-json.ts
|
|
32
33
|
*/
|
|
33
|
-
function createPackageJson(projectName, graph, customUIResources, options
|
|
34
|
+
function createPackageJson(projectName, graph, customUIResources, options
|
|
35
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
36
|
+
) {
|
|
34
37
|
const customUIProjectNames = customUIResources.map((r) => r.path);
|
|
35
38
|
const npmDeps = findAllNpmDeps(projectName, graph, customUIProjectNames);
|
|
36
39
|
// default package.json if one does not exist
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/generate-package-json.ts"],"names":[],"mappings":";;;AACA,uCAAyE;AACzE,0DAA4D;
|
|
1
|
+
{"version":3,"file":"generate-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/generate-package-json.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalizeOptions = void 0;
|
|
4
|
-
const path_1 = require("path");
|
|
5
4
|
function normalizeOptions(options, root, sourceRoot, projectRoot) {
|
|
6
5
|
var _a, _b;
|
|
7
6
|
return Object.assign(Object.assign({}, options), { root,
|
|
8
7
|
sourceRoot,
|
|
9
|
-
projectRoot, customUIPath: (_a = options.customUIPath) !== null && _a !== void 0 ? _a : 'customUI',
|
|
8
|
+
projectRoot, customUIPath: (_a = options.customUIPath) !== null && _a !== void 0 ? _a : 'customUI', outputFileName: 'index.js', watch: (_b = options.watch) !== null && _b !== void 0 ? _b : false });
|
|
10
9
|
}
|
|
11
10
|
exports.normalizeOptions = normalizeOptions;
|
|
12
11
|
//# sourceMappingURL=normalize-options.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/normalize-options.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/normalize-options.ts"],"names":[],"mappings":";;;AAEA,SAAgB,gBAAgB,CAC9B,OAA6B,EAC7B,IAAY,EACZ,UAAkB,EAClB,WAAmB;;IAEnB,uCACK,OAAO,KACV,IAAI;QACJ,UAAU;QACV,WAAW,EACX,YAAY,EAAE,MAAA,OAAO,CAAC,YAAY,mCAAI,UAAU,EAChD,cAAc,EAAE,UAAU,EAC1B,KAAK,EAAE,MAAA,OAAO,CAAC,KAAK,mCAAI,KAAK,IAC7B;AACJ,CAAC;AAfD,4CAeC"}
|
|
@@ -4,6 +4,7 @@ exports.patchManifestYml = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
const manifest_yml_1 = require("../../../utils/forge/manifest-yml");
|
|
7
|
+
const path_1 = require("path");
|
|
7
8
|
/**
|
|
8
9
|
* Patches the output manifest.yml file to replace resource path parameters to point to the actual Custom UI build
|
|
9
10
|
* artifacts instead of the Nx project reference.
|
|
@@ -14,7 +15,7 @@ const manifest_yml_1 = require("../../../utils/forge/manifest-yml");
|
|
|
14
15
|
*/
|
|
15
16
|
function patchManifestYml(options) {
|
|
16
17
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
17
|
-
const manifestPath = (0, devkit_1.joinPathFragments)(options.outputPath, 'manifest.yml');
|
|
18
|
+
const manifestPath = (0, devkit_1.joinPathFragments)((0, path_1.resolve)(options.root, options.outputPath), 'manifest.yml');
|
|
18
19
|
devkit_1.logger.info(`Patching ${manifestPath}...`);
|
|
19
20
|
const manifestSchema = yield (0, manifest_yml_1.readManifestYml)(manifestPath);
|
|
20
21
|
const resources = manifestSchema.resources || [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patch-manifest-yml.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/patch-manifest-yml.ts"],"names":[],"mappings":";;;;AAAA,uCAAuD;AAIvD,oEAG2C;
|
|
1
|
+
{"version":3,"file":"patch-manifest-yml.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/patch-manifest-yml.ts"],"names":[],"mappings":";;;;AAAA,uCAAuD;AAIvD,oEAG2C;AAC3C,+BAA+B;AAE/B;;;;;;;GAOG;AACH,SAAsB,gBAAgB,CAAC,OAA0B;;QAC/D,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,EACzC,cAAc,CACf,CAAC;QAEF,eAAM,CAAC,IAAI,CAAC,YAAY,YAAY,KAAK,CAAC,CAAC;QAE3C,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAe,EAAC,YAAY,CAAC,CAAC;QAE3D,MAAM,SAAS,GAAc,cAAc,CAAC,SAAS,IAAI,EAAE,CAAC;QAC5D,MAAM,eAAe,mCAChB,cAAc,KACjB,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,GACxE,CAAC;QAEF,IAAA,+BAAgB,EAAC,YAAY,EAAE,eAAe,CAAC,CAAC;QAEhD,eAAM,CAAC,IAAI,CAAC,iBAAiB,YAAY,GAAG,CAAC,CAAC;IAChD,CAAC;CAAA;AAnBD,4CAmBC;AAED,SAAS,aAAa,CACpB,YAAoB,EACpB,QAA+B;IAE/B,uCACK,QAAQ,KACX,IAAI,EAAE,GAAG,YAAY,IAAI,QAAQ,CAAC,IAAI,EAAE,IACxC;AACJ,CAAC"}
|
|
@@ -44,7 +44,7 @@ const verifyAndCopyCustomUIDependency = (resource, context, options) => {
|
|
|
44
44
|
throw new Error(`Project ${customUIProjectName} is missing build artifacts. Make sure the project produces Custom UI compatible build artifacts.`);
|
|
45
45
|
}
|
|
46
46
|
devkit_1.logger.info(`Copying ${customUIProjectName} Custom UI build artifacts...`);
|
|
47
|
-
(0, fs_extra_1.copySync)(absoluteCustomUIBuildTargetOutputPath, (0, devkit_1.joinPathFragments)(options.outputPath, options.customUIPath, customUIProjectName), { recursive: true });
|
|
47
|
+
(0, fs_extra_1.copySync)(absoluteCustomUIBuildTargetOutputPath, (0, devkit_1.joinPathFragments)(options.root, options.outputPath, options.customUIPath, customUIProjectName), { recursive: true });
|
|
48
48
|
devkit_1.logger.info(`Done copying ${customUIProjectName} Custom UI build artifacts.`);
|
|
49
49
|
};
|
|
50
50
|
//# sourceMappingURL=process-custom-ui-dependencies.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-custom-ui-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/process-custom-ui-dependencies.ts"],"names":[],"mappings":";;;;AAAA,uCAAoC;AACpC,2BAA6C;AAE7C,uCAAuD;AAIvD,oEAAoE;AAEpE;;;;;;;;;;;GAWG;AACH,SAAsB,2BAA2B,CAC/C,OAA0B,EAC1B,OAAwB;;;QAExB,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,EACjE,cAAc,CACf,CAAC;QACF,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAe,EAAC,YAAY,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAG,MAAA,cAAc,CAAC,SAAS,mCAAI,EAAE,CAAC;QAEjD,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACtB,+BAA+B,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CACrD,CAAC;QAEF,OAAO,SAAS,CAAC;;CAClB;AAjBD,kEAiBC;AAED,MAAM,+BAA+B,GAAG,CACtC,QAA+B,EAC/B,OAAwB,EACxB,OAA0B,EACpB,EAAE;;IACR,MAAM,mBAAmB,GAAG,QAAQ,CAAC,IAAI,CAAC;IAE1C,MAAM,4BAA4B,GAChC,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAE/D,IAAI,CAAC,4BAA4B,EAAE;QACjC,MAAM,IAAI,KAAK,CACb,sDAAsD,mBAAmB,oFAAoF,CAC9J,CAAC;KACH;IAED,MAAM,6BAA6B,GACjC,MAAA,MAAA,4BAA4B,CAAC,OAAO,CAAC,OAAO,CAAC,0CAAE,OAAO,0CAAE,UAAU,CAAC;IACrE,MAAM,qCAAqC,GAAG,IAAA,0BAAiB,EAC7D,OAAO,CAAC,IAAI,EACZ,6BAA6B,CAC9B,CAAC;IAEF,IACE,CAAC,6BAA6B;QAC9B,CAAC,IAAA,eAAU,EAAC,qCAAqC,CAAC;QAClD,IAAA,gBAAW,EAAC,qCAAqC,CAAC,CAAC,MAAM,KAAK,CAAC,EAC/D;QACA,MAAM,IAAI,KAAK,CACb,WAAW,mBAAmB,mGAAmG,CAClI,CAAC;KACH;IAED,eAAM,CAAC,IAAI,CAAC,WAAW,mBAAmB,+BAA+B,CAAC,CAAC;IAC3E,IAAA,mBAAQ,EACN,qCAAqC,EACrC,IAAA,0BAAiB,EACf,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,YAAY,EACpB,mBAAmB,CACpB,EACD,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;IACF,eAAM,CAAC,IAAI,CAAC,gBAAgB,mBAAmB,6BAA6B,CAAC,CAAC;AAChF,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"process-custom-ui-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/process-custom-ui-dependencies.ts"],"names":[],"mappings":";;;;AAAA,uCAAoC;AACpC,2BAA6C;AAE7C,uCAAuD;AAIvD,oEAAoE;AAEpE;;;;;;;;;;;GAWG;AACH,SAAsB,2BAA2B,CAC/C,OAA0B,EAC1B,OAAwB;;;QAExB,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,EACjE,cAAc,CACf,CAAC;QACF,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAe,EAAC,YAAY,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAG,MAAA,cAAc,CAAC,SAAS,mCAAI,EAAE,CAAC;QAEjD,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACtB,+BAA+B,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CACrD,CAAC;QAEF,OAAO,SAAS,CAAC;;CAClB;AAjBD,kEAiBC;AAED,MAAM,+BAA+B,GAAG,CACtC,QAA+B,EAC/B,OAAwB,EACxB,OAA0B,EACpB,EAAE;;IACR,MAAM,mBAAmB,GAAG,QAAQ,CAAC,IAAI,CAAC;IAE1C,MAAM,4BAA4B,GAChC,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAE/D,IAAI,CAAC,4BAA4B,EAAE;QACjC,MAAM,IAAI,KAAK,CACb,sDAAsD,mBAAmB,oFAAoF,CAC9J,CAAC;KACH;IAED,MAAM,6BAA6B,GACjC,MAAA,MAAA,4BAA4B,CAAC,OAAO,CAAC,OAAO,CAAC,0CAAE,OAAO,0CAAE,UAAU,CAAC;IACrE,MAAM,qCAAqC,GAAG,IAAA,0BAAiB,EAC7D,OAAO,CAAC,IAAI,EACZ,6BAA6B,CAC9B,CAAC;IAEF,IACE,CAAC,6BAA6B;QAC9B,CAAC,IAAA,eAAU,EAAC,qCAAqC,CAAC;QAClD,IAAA,gBAAW,EAAC,qCAAqC,CAAC,CAAC,MAAM,KAAK,CAAC,EAC/D;QACA,MAAM,IAAI,KAAK,CACb,WAAW,mBAAmB,mGAAmG,CAClI,CAAC;KACH;IAED,eAAM,CAAC,IAAI,CAAC,WAAW,mBAAmB,+BAA+B,CAAC,CAAC;IAC3E,IAAA,mBAAQ,EACN,qCAAqC,EACrC,IAAA,0BAAiB,EACf,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,YAAY,EACpB,mBAAmB,CACpB,EACD,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;IACF,eAAM,CAAC,IAAI,CAAC,gBAAgB,mBAAmB,6BAA6B,CAAC,CAAC;AAChF,CAAC,CAAC"}
|
|
@@ -18,6 +18,24 @@
|
|
|
18
18
|
"type": "boolean",
|
|
19
19
|
"description": "Enable re-building when files change.",
|
|
20
20
|
"default": false
|
|
21
|
+
},
|
|
22
|
+
"sourceMap": {
|
|
23
|
+
"description": "Output sourcemaps. Use 'hidden' for use with error reporting tools without generating sourcemap comment.",
|
|
24
|
+
"oneOf": [
|
|
25
|
+
{
|
|
26
|
+
"type": "boolean"
|
|
27
|
+
},
|
|
28
|
+
{
|
|
29
|
+
"type": "string"
|
|
30
|
+
}
|
|
31
|
+
]
|
|
32
|
+
},
|
|
33
|
+
"webpackConfig": {
|
|
34
|
+
"type": "string",
|
|
35
|
+
"description": "Path to a function which takes a webpack config, some context and returns the resulting webpack config. See https://nx.dev/guides/customize-webpack",
|
|
36
|
+
"x-completion-type": "file",
|
|
37
|
+
"x-completion-glob": "webpack?(*)@(.js|.ts)",
|
|
38
|
+
"x-priority": "important"
|
|
21
39
|
}
|
|
22
40
|
},
|
|
23
41
|
"required": ["outputPath"]
|
|
@@ -37,17 +37,12 @@ function runTunnelExecutor(options, context) {
|
|
|
37
37
|
const combined = (0, async_iterable_1.combineAsyncIterables)(runAllCustomUiServe, runForgeAppBuild, runForgeTunnel);
|
|
38
38
|
try {
|
|
39
39
|
try {
|
|
40
|
-
for (var _d = true, combined_1 = tslib_1.__asyncValues(combined), combined_1_1; combined_1_1 = yield combined_1.next(), _a = combined_1_1.done, !_a;) {
|
|
40
|
+
for (var _d = true, combined_1 = tslib_1.__asyncValues(combined), combined_1_1; combined_1_1 = yield combined_1.next(), _a = combined_1_1.done, !_a; _d = true) {
|
|
41
41
|
_c = combined_1_1.value;
|
|
42
42
|
_d = false;
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
return output;
|
|
47
|
-
}
|
|
48
|
-
finally {
|
|
49
|
-
_d = true;
|
|
50
|
-
}
|
|
43
|
+
const output = _c;
|
|
44
|
+
if (!output.success)
|
|
45
|
+
return output;
|
|
51
46
|
}
|
|
52
47
|
}
|
|
53
48
|
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/tunnel/executor.ts"],"names":[],"mappings":";;;AAAA,uCAAkE;AAClE,wEAA4E;AAE5E,iDAAyC;AACzC,iFAAuE;AAEvE;;;;;;;;;;GAUG;AACH,SAA8B,iBAAiB,CAC7C,OAA8B,EAC9B,OAAwB;;;QAExB,MAAM,sBAAsB,GAAG,MAAM,IAAA,gDAAmB,EAAC,OAAO,CAAC,CAAC;QAClE,IAAI,mBAAmB,GAAG,SAAS,CAAC;QAEpC,IAAI,sBAAsB,CAAC,MAAM,GAAG,CAAC,EAAE;YACrC,MAAM,CAAC,kBAAkB,EAAE,GAAG,kBAAkB,CAAC,GAAG,sBAAsB,CAAC;YAE3E,iDAAiD;YACjD,mBAAmB,GAAG,MAAM,IAAA,oBAAW,EACrC,EAAE,OAAO,EAAE,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,EAC5D,EAAE,IAAI,EAAE,kBAAkB,CAAC,IAAI,EAAE,EACjC,OAAO,CACR,CAAC;YAEF,KAAK,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,GAAI,EAAE,EAAE;gBAC5D,mBAAmB,GAAG,IAAA,sCAAqB,EACzC,mBAAmB,EACnB,MAAM,IAAA,oBAAW,EACf,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,EACzC,EAAE,IAAI,EAAE,EACR,OAAO,CACR,CACF,CAAC;aACH;SACF;QAED,MAAM,gBAAgB,GAAG,MAAM,IAAA,oBAAW,EACxC,EAAE,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,EACjD,EAAE,KAAK,EAAE,IAAI,EAAE,EACf,OAAO,CACR,CAAC;QAEF,mDAAmD;QACnD,MAAM,cAAc,GAAG,iBAAiB,CACtC,IAAA,oBAAS,kCAAM,OAAO,KAAE,sBAAsB,KAAI,OAAO,CAAC,CAC3D,CAAC;QAEF,4DAA4D;QAC5D,sDAAsD;QACtD,MAAM,QAAQ,GAAG,IAAA,sCAAqB,EACpC,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,CACf,CAAC;QAEF,IAAI;;gBACF,KAA2B,eAAA,aAAA,sBAAA,QAAQ,CAAA,cAAA;
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/tunnel/executor.ts"],"names":[],"mappings":";;;AAAA,uCAAkE;AAClE,wEAA4E;AAE5E,iDAAyC;AACzC,iFAAuE;AAEvE;;;;;;;;;;GAUG;AACH,SAA8B,iBAAiB,CAC7C,OAA8B,EAC9B,OAAwB;;;QAExB,MAAM,sBAAsB,GAAG,MAAM,IAAA,gDAAmB,EAAC,OAAO,CAAC,CAAC;QAClE,IAAI,mBAAmB,GAAG,SAAS,CAAC;QAEpC,IAAI,sBAAsB,CAAC,MAAM,GAAG,CAAC,EAAE;YACrC,MAAM,CAAC,kBAAkB,EAAE,GAAG,kBAAkB,CAAC,GAAG,sBAAsB,CAAC;YAE3E,iDAAiD;YACjD,mBAAmB,GAAG,MAAM,IAAA,oBAAW,EACrC,EAAE,OAAO,EAAE,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,EAC5D,EAAE,IAAI,EAAE,kBAAkB,CAAC,IAAI,EAAE,EACjC,OAAO,CACR,CAAC;YAEF,KAAK,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,GAAI,EAAE,EAAE;gBAC5D,mBAAmB,GAAG,IAAA,sCAAqB,EACzC,mBAAmB,EACnB,MAAM,IAAA,oBAAW,EACf,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,EACzC,EAAE,IAAI,EAAE,EACR,OAAO,CACR,CACF,CAAC;aACH;SACF;QAED,MAAM,gBAAgB,GAAG,MAAM,IAAA,oBAAW,EACxC,EAAE,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,EACjD,EAAE,KAAK,EAAE,IAAI,EAAE,EACf,OAAO,CACR,CAAC;QAEF,mDAAmD;QACnD,MAAM,cAAc,GAAG,iBAAiB,CACtC,IAAA,oBAAS,kCAAM,OAAO,KAAE,sBAAsB,KAAI,OAAO,CAAC,CAC3D,CAAC;QAEF,4DAA4D;QAC5D,sDAAsD;QACtD,MAAM,QAAQ,GAAG,IAAA,sCAAqB,EACpC,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,CACf,CAAC;QAEF,IAAI;;gBACF,KAA2B,eAAA,aAAA,sBAAA,QAAQ,CAAA,cAAA,kFAAE;oBAAV,wBAAQ;oBAAR,WAAQ;oBAAxB,MAAM,MAAM,KAAA,CAAA;oBACrB,IAAI,CAAC,MAAM,CAAC,OAAO;wBAAE,OAAO,MAAM,CAAC;iBACpC;;;;;;;;;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,eAAM,CAAC,KAAK,CAAC,+BAA+B,GAAG,EAAE,CAAC,CAAC;YACnD,MAAM,GAAG,CAAC;SACX;QAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;CAC1B;AA1DD,oCA0DC;AAED,SAAgB,iBAAiB,CAC/B,CAAa;;QAEb,4BAAM,sBAAM,CAAC,CAAA,CAAA,CAAC;IAChB,CAAC;CAAA"}
|
|
@@ -2,9 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const
|
|
5
|
+
const eslint_1 = require("@nx/eslint");
|
|
6
6
|
const jest_1 = require("@nx/jest");
|
|
7
|
-
const lint_project_1 = require("@nx/linter/src/generators/lint-project/lint-project");
|
|
8
7
|
const generator_1 = require("../init/generator");
|
|
9
8
|
const lib_1 = require("./lib");
|
|
10
9
|
function default_1(tree, rawOptions) {
|
|
@@ -18,16 +17,13 @@ function default_1(tree, rawOptions) {
|
|
|
18
17
|
tasks.push(initTask);
|
|
19
18
|
(0, lib_1.createFiles)(tree, options);
|
|
20
19
|
(0, lib_1.addProject)(tree, options);
|
|
21
|
-
if (options.linter ===
|
|
22
|
-
const lintTask = yield (0,
|
|
20
|
+
if (options.linter === eslint_1.Linter.EsLint) {
|
|
21
|
+
const lintTask = yield (0, eslint_1.lintProjectGenerator)(tree, {
|
|
23
22
|
linter: options.linter,
|
|
24
23
|
project: options.name,
|
|
25
24
|
tsConfigPaths: [
|
|
26
25
|
(0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
|
|
27
26
|
],
|
|
28
|
-
eslintFilePatterns: [
|
|
29
|
-
(0, lint_project_1.mapLintPattern)(options.appProjectRoot, options.js ? 'js' : 'ts'),
|
|
30
|
-
],
|
|
31
27
|
unitTestRunner: options.unitTestRunner,
|
|
32
28
|
skipFormat: true,
|
|
33
29
|
setParserOptionsProject: options.setParserOptionsProject,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/generators/application/generator.ts"],"names":[],"mappings":";;;AAAA,uCAOoB;AACpB,uCAA0D;AAC1D,mCAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/generators/application/generator.ts"],"names":[],"mappings":";;;AAAA,uCAOoB;AACpB,uCAA0D;AAC1D,mCAAgD;AAChD,iDAA8C;AAE9C,+BAAkE;AAElE,mBACE,IAAU,EACV,UAAuC;;QAEvC,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAEnD,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,QAAQ,GAAG,MAAM,IAAA,mBAAa,EAAC,IAAI,EAAE;YACzC,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErB,IAAA,iBAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,IAAA,gBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1B,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;YACpC,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;gBAChD,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,aAAa,EAAE;oBACb,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC;iBAC/D;gBACD,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,UAAU,EAAE,IAAI;gBAChB,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;aACzD,CAAC,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtB;QAED,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;YACrC,MAAM,QAAQ,GAAG,MAAM,IAAA,2BAAoB,EAAC,IAAI,EAAE;gBAChD,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,SAAS,EAAE,MAAM;gBACjB,eAAe,EAAE,IAAI;gBACrB,UAAU,EAAE,OAAO,CAAC,EAAE;gBACtB,QAAQ,EAAE,KAAK;gBACf,eAAe,EAAE,MAAM;gBACvB,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtB;QAED,IAAI,OAAO,CAAC,EAAE,EAAE;YACd,IAAA,4BAAmB,EAAC,IAAI,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;SACpE;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AApDD,4BAoDC"}
|
|
@@ -8,6 +8,7 @@ function getBuildConfig(project, options) {
|
|
|
8
8
|
outputs: ['{options.outputPath}'],
|
|
9
9
|
options: {
|
|
10
10
|
outputPath: (0, devkit_1.joinPathFragments)('dist', options.appProjectRoot),
|
|
11
|
+
webpackConfig: (0, devkit_1.joinPathFragments)(project.root, 'webpack.config.js'),
|
|
11
12
|
},
|
|
12
13
|
};
|
|
13
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-build-config.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/get-build-config.ts"],"names":[],"mappings":";;;AACA,uCAIoB;AAEpB,SAAgB,cAAc,CAC5B,OAA6B,EAC7B,OAA0B;IAE1B,OAAO;QACL,QAAQ,EAAE,2BAA2B;QACrC,OAAO,EAAE,CAAC,sBAAsB,CAAC;QACjC,OAAO,EAAE;YACP,UAAU,EAAE,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"get-build-config.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/get-build-config.ts"],"names":[],"mappings":";;;AACA,uCAIoB;AAEpB,SAAgB,cAAc,CAC5B,OAA6B,EAC7B,OAA0B;IAE1B,OAAO;QACL,QAAQ,EAAE,2BAA2B;QACrC,OAAO,EAAE,CAAC,sBAAsB,CAAC;QACjC,OAAO,EAAE;YACP,UAAU,EAAE,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC;YAC7D,aAAa,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,mBAAmB,CAAC;SACpE;KACF,CAAC;AACJ,CAAC;AAZD,wCAYC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalizeOptions = void 0;
|
|
4
|
-
const
|
|
4
|
+
const eslint_1 = require("@nx/eslint");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
function normalizeOptions(tree, options) {
|
|
7
7
|
var _a, _b;
|
|
@@ -15,7 +15,7 @@ function normalizeOptions(tree, options) {
|
|
|
15
15
|
const parsedTags = options.tags
|
|
16
16
|
? options.tags.split(',').map((s) => s.trim())
|
|
17
17
|
: [];
|
|
18
|
-
return Object.assign(Object.assign({}, options), { name: (0, devkit_1.names)(appProjectName).fileName, appProjectRoot, linter: (_a = options.linter) !== null && _a !== void 0 ? _a :
|
|
18
|
+
return Object.assign(Object.assign({}, options), { name: (0, devkit_1.names)(appProjectName).fileName, appProjectRoot, linter: (_a = options.linter) !== null && _a !== void 0 ? _a : eslint_1.Linter.EsLint, unitTestRunner: (_b = options.unitTestRunner) !== null && _b !== void 0 ? _b : 'jest', parsedTags });
|
|
19
19
|
}
|
|
20
20
|
exports.normalizeOptions = normalizeOptions;
|
|
21
21
|
//# sourceMappingURL=normalize-options.js.map
|
|
@@ -23,7 +23,7 @@ const getCustomUIStaticDependencies = ([projectName, manifestFile], context) =>
|
|
|
23
23
|
};
|
|
24
24
|
};
|
|
25
25
|
return customUIProjectNames.reduce((acc, customUIProjectName) => {
|
|
26
|
-
return (manifestFile.
|
|
26
|
+
return (manifestFile.deps || []).find(([source, target, type]) => type === 'static' &&
|
|
27
27
|
target === customUIProjectName &&
|
|
28
28
|
source === projectName)
|
|
29
29
|
? acc // Dependency already exists, skip adding it again.
|
|
@@ -36,21 +36,16 @@ function processProjectGraph(graph, context) {
|
|
|
36
36
|
const builder = new devkit_1.ProjectGraphBuilder(graph);
|
|
37
37
|
for (const [projectName, files] of Object.entries(context.filesToProcess)) {
|
|
38
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;) {
|
|
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
40
|
_c = _f.value;
|
|
41
41
|
_d = false;
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
});
|
|
50
|
-
}
|
|
51
|
-
finally {
|
|
52
|
-
_d = true;
|
|
53
|
-
}
|
|
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
|
+
});
|
|
54
49
|
}
|
|
55
50
|
}
|
|
56
51
|
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forge-project-graph.js","sourceRoot":"","sources":["../../../../../packages/nx-forge/src/graph/forge-project-graph.ts"],"names":[],"mappings":";;;;AAAA,uCAMoB;AACpB,8DAGqC;AAQrC,MAAM,6BAA6B,GAAG,CACpC,CAAC,WAAW,EAAE,YAAY,CAAqB,EAC/C,OAAqC,EACR,EAAE;IAC/B,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAe,EAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAChE,MAAM,oBAAoB,GAAG,IAAA,0CAA2B,EAAC,cAAc,CAAC,CAAC;IAEzE,MAAM,2BAA2B,GAAG,CAClC,mBAA2B,EACT,EAAE;QACpB,MAAM,4BAA4B,GAChC,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;QAE/D,IAAI,CAAC,4BAA4B,EAAE;YACjC,MAAM,IAAI,KAAK,CACb,yFAAyF,mBAAmB,kDAAkD,WAAW,oGAAoG,CAC9Q,CAAC;SACH;QAED,MAAM,oBAAoB,GACxB,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAEvD,IAAI,CAAC,oBAAoB,EAAE;YACzB,MAAM,IAAI,KAAK,CACb,6DAA6D,WAAW,EAAE,CAC3E,CAAC;SACH;QAED,OAAO;YACL,iBAAiB,EAAE,YAAY,CAAC,IAAI;YACpC,iBAAiB,EAAE,WAAW;YAC9B,iBAAiB,EAAE,mBAAmB;SACvC,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,mBAAmB,EAAE,EAAE;QAC9D,OAAO,CAAC,YAAY,CAAC,
|
|
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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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
|
|
6
|
+
function default_1(tree) {
|
|
7
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
+
const update = (options, projectName, targetName, configurationName) => {
|
|
9
|
+
// There should not be any configurations, if there are skip the update - only handle the default config
|
|
10
|
+
if (configurationName)
|
|
11
|
+
return;
|
|
12
|
+
const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
|
|
13
|
+
if (!options.webpackConfig) {
|
|
14
|
+
options.webpackConfig = `${projectConfiguration.root}/webpack.config.js`;
|
|
15
|
+
tree.write(options.webpackConfig, `
|
|
16
|
+
const { composePlugins, withNx } = require('@nx/webpack');
|
|
17
|
+
|
|
18
|
+
// Nx plugins for webpack.
|
|
19
|
+
module.exports = composePlugins(withNx(), (config) => {
|
|
20
|
+
// Note: This was added by an Nx Forge migration. Webpack builds are required to have a corresponding Webpack config file.
|
|
21
|
+
// See: https://nx.dev/recipes/webpack/webpack-config-setup
|
|
22
|
+
return config;
|
|
23
|
+
});
|
|
24
|
+
`);
|
|
25
|
+
projectConfiguration.targets[targetName].options = options;
|
|
26
|
+
(0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
(0, executor_options_utils_1.forEachExecutorOptions)(tree, '@toolsplus/nx-forge:build', update);
|
|
30
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
exports.default = default_1;
|
|
34
|
+
//# 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
ADDED
|
@@ -0,0 +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":";;;AAAA,uCAKoB;AACpB,6FAA0F;AAG1F,mBAA+B,IAAU;;QACvC,MAAM,MAAM,GAAG,CACb,OAA6B,EAC7B,WAAmB,EACnB,UAAkB,EAClB,iBAAyB,EACzB,EAAE;YACF,wGAAwG;YACxG,IAAI,iBAAiB;gBAAE,OAAO;YAE9B,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAEzE,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;gBAC1B,OAAO,CAAC,aAAa,GAAG,GAAG,oBAAoB,CAAC,IAAI,oBAAoB,CAAC;gBACzE,IAAI,CAAC,KAAK,CACR,OAAO,CAAC,aAAa,EACrB;;;;;;;;;SASC,CACF,CAAC;gBAEF,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC;gBAC3D,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC;aACrE;QACH,CAAC,CAAC;QAEF,IAAA,+CAAsB,EACpB,IAAI,EACJ,2BAA2B,EAC3B,MAAM,CACP,CAAC;QAEF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAxCD,4BAwCC"}
|