@rxap/plugin-library 19.4.0-dev.0 → 19.4.0-dev.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/CHANGELOG.md +7 -0
- package/package.json +2 -2
- package/src/generators/init-publishable/coerce-init-generator.js +20 -14
- package/src/generators/init-publishable/coerce-init-generator.js.map +1 -1
- package/src/generators/init-with-migrations/coerce-assets-configuration.js +15 -11
- package/src/generators/init-with-migrations/coerce-assets-configuration.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,13 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [19.4.0-dev.1](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@19.4.0-dev.0...@rxap/plugin-library@19.4.0-dev.1) (2024-07-25)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- use correct assets pattern for ng-package assets ([262964d](https://gitlab.com/rxap/packages/commit/262964d0b207971792bcdb1a302239c8c9eaa421))
|
|
11
|
+
- use correct assets pattern for ng-package assets ([e0ffd08](https://gitlab.com/rxap/packages/commit/e0ffd0887b5a6aa4a82237499d1d19ebe20c48e0))
|
|
12
|
+
|
|
6
13
|
# [19.4.0-dev.0](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@19.3.2-dev.8...@rxap/plugin-library@19.4.0-dev.0) (2024-07-24)
|
|
7
14
|
|
|
8
15
|
### Features
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "19.4.0-dev.
|
|
2
|
+
"version": "19.4.0-dev.1",
|
|
3
3
|
"name": "@rxap/plugin-library",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -48,6 +48,6 @@
|
|
|
48
48
|
},
|
|
49
49
|
"schematics": "./generators.json",
|
|
50
50
|
"type": "commonjs",
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "915dce5e90d6633f881f0bcaafbeb8e5395821d4",
|
|
52
52
|
"main": "./src/index.js"
|
|
53
53
|
}
|
|
@@ -23,29 +23,35 @@ function CoerceInitGenerator(tree, projectName, project, options) {
|
|
|
23
23
|
// region setup build assets options
|
|
24
24
|
const projectSourceRoot = (0, workspace_utilities_1.GetProjectSourceRoot)(tree, projectName);
|
|
25
25
|
const projectRoot = (0, workspace_utilities_1.GetProjectRoot)(tree, projectName);
|
|
26
|
-
const generatorsAssets = [
|
|
27
|
-
{
|
|
28
|
-
input: './' + (0, path_1.join)(projectSourceRoot, 'generators'),
|
|
29
|
-
glob: '**/!(*.ts',
|
|
30
|
-
output: './src/generators',
|
|
31
|
-
},
|
|
32
|
-
{
|
|
33
|
-
input: './' + projectRoot,
|
|
34
|
-
glob: 'generators.json',
|
|
35
|
-
output: '.',
|
|
36
|
-
},
|
|
37
|
-
];
|
|
38
26
|
if ((0, workspace_utilities_1.IsAngularProject)(project)) {
|
|
39
27
|
const ngPackagr = (0, workspace_utilities_1.ReadNgPackageJson)(tree, project);
|
|
40
28
|
(_b = ngPackagr.assets) !== null && _b !== void 0 ? _b : (ngPackagr.assets = []);
|
|
41
|
-
(0, workspace_utilities_1.CoerceAssets)(ngPackagr.assets,
|
|
29
|
+
(0, workspace_utilities_1.CoerceAssets)(ngPackagr.assets, [
|
|
30
|
+
{
|
|
31
|
+
input: (0, path_1.join)('src', 'generators'),
|
|
32
|
+
glob: '**/!(*.ts|*.js|*.json)',
|
|
33
|
+
output: (0, path_1.join)('src', 'generators'),
|
|
34
|
+
},
|
|
35
|
+
'generators.json'
|
|
36
|
+
]);
|
|
42
37
|
(0, workspace_utilities_1.WriteNgPackageJson)(tree, project, ngPackagr);
|
|
43
38
|
}
|
|
44
39
|
else {
|
|
45
40
|
const buildTarget = (0, workspace_utilities_1.GetTarget)(project, 'build');
|
|
46
41
|
(_c = buildTarget.options) !== null && _c !== void 0 ? _c : (buildTarget.options = {});
|
|
47
42
|
(_d = (_e = buildTarget.options).assets) !== null && _d !== void 0 ? _d : (_e.assets = []);
|
|
48
|
-
(0, workspace_utilities_1.CoerceAssets)(buildTarget.options.assets,
|
|
43
|
+
(0, workspace_utilities_1.CoerceAssets)(buildTarget.options.assets, [
|
|
44
|
+
{
|
|
45
|
+
input: './' + (0, path_1.join)(projectSourceRoot, 'generators'),
|
|
46
|
+
glob: '**/!(*.ts|*.js|*.json)',
|
|
47
|
+
output: './src/generators',
|
|
48
|
+
},
|
|
49
|
+
{
|
|
50
|
+
input: './' + projectRoot,
|
|
51
|
+
glob: 'generators.json',
|
|
52
|
+
output: '.',
|
|
53
|
+
},
|
|
54
|
+
]);
|
|
49
55
|
}
|
|
50
56
|
// endregion
|
|
51
57
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-init-generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-publishable/coerce-init-generator.ts"],"names":[],"mappings":";;;;AAIA,sDAA2D;AAC3D,mEAWmC;AACnC,+BAA4B;AAG5B,SAAsB,mBAAmB,CACvC,IAAU,EAAE,WAAmB,EAAE,OAA6B,EAAE,OAAuC;;;;QAEvG,IAAI,IAAA,sCAAgB,EAAC,OAAO,CAAC,EAAE,CAAC;YAC9B,MAAM,SAAS,GAAG,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACnD,MAAA,SAAS,CAAC,0BAA0B,oCAApC,SAAS,CAAC,0BAA0B,GAAK,EAAE,EAAC;YAC5C,SAAS,CAAC,0BAA0B,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACxD,SAAS,CAAC,0BAA0B,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC,CAAC;YACjG,IAAA,wCAAkB,EAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QAC/C,CAAC;QAED,IAAI,IAAA,kCAAY,EAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,CAAC;YAC5C,OAAO;QACT,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,YAAa,WAAY,wBAAwB,CAAC,MAAM,CAAC,CAAC;QAEtE,oCAAoC;QACpC,MAAM,iBAAiB,GAAG,IAAA,0CAAoB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,IAAA,oCAAc,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEtD,
|
|
1
|
+
{"version":3,"file":"coerce-init-generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-publishable/coerce-init-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,13 @@ exports.coerceAssetsConfiguration = void 0;
|
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
6
6
|
const path_1 = require("path");
|
|
7
|
-
function
|
|
8
|
-
|
|
7
|
+
function coerceAssetsInBuildTarget(tree, projectName, project) {
|
|
8
|
+
var _a;
|
|
9
|
+
const projectRoot = (0, workspace_utilities_1.GetProjectRoot)(tree, projectName);
|
|
10
|
+
const buildTarget = (0, workspace_utilities_1.GetTarget)(project, 'build');
|
|
11
|
+
const buildTargetOptions = (0, workspace_utilities_1.GetTargetOptions)(buildTarget);
|
|
12
|
+
(_a = buildTargetOptions.assets) !== null && _a !== void 0 ? _a : (buildTargetOptions.assets = []);
|
|
13
|
+
(0, workspace_utilities_1.CoerceAssets)(buildTargetOptions.assets, [
|
|
9
14
|
{
|
|
10
15
|
input: `./${projectRoot}`,
|
|
11
16
|
glob: "migrations.json",
|
|
@@ -17,14 +22,6 @@ function coerceAssets(assets, projectRoot) {
|
|
|
17
22
|
output: "./src/migrations"
|
|
18
23
|
}
|
|
19
24
|
]);
|
|
20
|
-
}
|
|
21
|
-
function coerceAssetsInBuildTarget(tree, projectName, project) {
|
|
22
|
-
var _a;
|
|
23
|
-
const projectRoot = (0, workspace_utilities_1.GetProjectRoot)(tree, projectName);
|
|
24
|
-
const buildTarget = (0, workspace_utilities_1.GetTarget)(project, 'build');
|
|
25
|
-
const buildTargetOptions = (0, workspace_utilities_1.GetTargetOptions)(buildTarget);
|
|
26
|
-
(_a = buildTargetOptions.assets) !== null && _a !== void 0 ? _a : (buildTargetOptions.assets = []);
|
|
27
|
-
coerceAssets(buildTargetOptions.assets, projectRoot);
|
|
28
25
|
(0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
|
|
29
26
|
}
|
|
30
27
|
function coerceAssetsInNgPackageJson(tree, projectName, project) {
|
|
@@ -35,7 +32,14 @@ function coerceAssetsInNgPackageJson(tree, projectName, project) {
|
|
|
35
32
|
(0, workspace_utilities_1.UpdateJsonFile)(tree, (ngPackageJson) => {
|
|
36
33
|
var _a;
|
|
37
34
|
(_a = ngPackageJson.assets) !== null && _a !== void 0 ? _a : (ngPackageJson.assets = []);
|
|
38
|
-
|
|
35
|
+
(0, workspace_utilities_1.CoerceAssets)(ngPackageJson.assets, [
|
|
36
|
+
'migrations.json',
|
|
37
|
+
{
|
|
38
|
+
input: (0, path_1.join)('src', 'migrations'),
|
|
39
|
+
glob: "**/!(*.ts|*.js|*.json)",
|
|
40
|
+
output: (0, path_1.join)('src', 'migrations')
|
|
41
|
+
}
|
|
42
|
+
]);
|
|
39
43
|
}, (0, path_1.join)(projectRoot, 'ng-package.json'));
|
|
40
44
|
}
|
|
41
45
|
function coerceAssetsConfiguration(tree, projectName, project) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-assets-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-with-migrations/coerce-assets-configuration.ts"],"names":[],"mappings":";;;AAAA,uCAIoB;AACpB,mEASmC;AACnC,+BAA4B;AAE5B,SAAS,
|
|
1
|
+
{"version":3,"file":"coerce-assets-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-with-migrations/coerce-assets-configuration.ts"],"names":[],"mappings":";;;AAAA,uCAIoB;AACpB,mEASmC;AACnC,+BAA4B;AAE5B,SAAS,yBAAyB,CAAC,IAAU,EAAE,WAAmB,EAAE,OAA6B;;IAE/F,MAAM,WAAW,GAAG,IAAA,oCAAc,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAEtD,MAAM,WAAW,GAAG,IAAA,+BAAS,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChD,MAAM,kBAAkB,GAAwB,IAAA,sCAAgB,EAAC,WAAW,CAAC,CAAC;IAC9E,MAAA,kBAAkB,CAAC,MAAM,oCAAzB,kBAAkB,CAAC,MAAM,GAAK,EAAE,EAAC;IACjC,IAAA,kCAAY,EAAC,kBAAkB,CAAC,MAAM,EAAE;QACtC;YACE,KAAK,EAAE,KAAK,WAAW,EAAE;YACzB,IAAI,EAAE,iBAAiB;YACvB,MAAM,EAAE,GAAG;SACZ;QACD;YACE,KAAK,EAAE,KAAK,WAAW,iBAAiB;YACxC,IAAI,EAAE,wBAAwB;YAC9B,MAAM,EAAE,kBAAkB;SAC3B;KACF,CAAC,CAAC;IACH,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;AACzD,CAAC;AAED,SAAS,2BAA2B,CAAC,IAAU,EAAE,WAAmB,EAAE,OAA6B;IACjG,MAAM,WAAW,GAAG,IAAA,oCAAc,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAEtD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CAAC,iEAAiE,WAAW,EAAE,CAAC,CAAC;IAClG,CAAC;IAED,IAAA,oCAAc,EAAC,IAAI,EAAE,CAAC,aAA4B,EAAE,EAAE;;QACpD,MAAA,aAAa,CAAC,MAAM,oCAApB,aAAa,CAAC,MAAM,GAAK,EAAE,EAAC;QAC5B,IAAA,kCAAY,EAAC,aAAa,CAAC,MAAM,EAAE;YACjC,iBAAiB;YACjB;gBACE,KAAK,EAAE,IAAA,WAAI,EAAC,KAAK,EAAE,YAAY,CAAC;gBAChC,IAAI,EAAE,wBAAwB;gBAC9B,MAAM,EAAE,IAAA,WAAI,EAAC,KAAK,EAAE,YAAY,CAAC;aAClC;SACF,CAAC,CAAC;IACL,CAAC,EAAE,IAAA,WAAI,EAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC,CAAC;AAE3C,CAAC;AAED,SAAgB,yBAAyB,CAAC,IAAU,EAAE,WAAmB,EAAE,OAA6B;IAEtG,IAAI,IAAA,sCAAgB,EAAC,OAAO,CAAC,EAAE,CAAC;QAC9B,2BAA2B,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAC1D,CAAC;SAAM,CAAC;QACN,yBAAyB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC;AAEH,CAAC;AARD,8DAQC"}
|