@ng-doc/add 17.6.12 → 17.6.13
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 +1 -1
- package/schematics/ng-add/constants/assets.d.ts +3 -1
- package/schematics/ng-add/constants/assets.js +5 -2
- package/schematics/ng-add/constants/assets.js.map +1 -1
- package/schematics/ng-add/steps/add-assets.js +1 -1
- package/schematics/ng-add/steps/add-assets.js.map +1 -1
- package/schematics/ng-add/steps/add-tsconfig-paths.js +4 -2
- package/schematics/ng-add/steps/add-tsconfig-paths.js.map +1 -1
- package/schematics/ng-add/utils/get-project-name.d.ts +8 -0
- package/schematics/ng-add/utils/get-project-name.js +17 -0
- package/schematics/ng-add/utils/get-project-name.js.map +1 -0
- package/schematics/ng-add/utils/get-project.js +2 -5
- package/schematics/ng-add/utils/get-project.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import { WorkspaceDefinition } from '@schematics/angular/utility/workspace';
|
|
1
2
|
import { Schema } from '../schema';
|
|
2
3
|
/**
|
|
3
4
|
*
|
|
4
5
|
* @param options
|
|
6
|
+
* @param workspace
|
|
5
7
|
*/
|
|
6
|
-
export declare function getNgDocAssets(options: Schema): Array<{
|
|
8
|
+
export declare function getNgDocAssets(options: Schema, workspace: WorkspaceDefinition): Array<{
|
|
7
9
|
output: string;
|
|
8
10
|
input: string;
|
|
9
11
|
glob: string;
|
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getNgDocAssets = void 0;
|
|
4
|
+
const get_project_name_1 = require("../utils/get-project-name");
|
|
4
5
|
/**
|
|
5
6
|
*
|
|
6
7
|
* @param options
|
|
8
|
+
* @param workspace
|
|
7
9
|
*/
|
|
8
|
-
function getNgDocAssets(options) {
|
|
10
|
+
function getNgDocAssets(options, workspace) {
|
|
11
|
+
const projectName = (0, get_project_name_1.getProjectName)(options, workspace);
|
|
9
12
|
return [
|
|
10
13
|
{
|
|
11
14
|
glob: '**/*',
|
|
@@ -19,7 +22,7 @@ function getNgDocAssets(options) {
|
|
|
19
22
|
},
|
|
20
23
|
{
|
|
21
24
|
glob: '**/*',
|
|
22
|
-
input: `ng-doc/${
|
|
25
|
+
input: `ng-doc/${projectName}/assets`,
|
|
23
26
|
output: 'assets/ng-doc',
|
|
24
27
|
},
|
|
25
28
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/constants/assets.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/constants/assets.ts"],"names":[],"mappings":";;;AAGA,gEAA2D;AAE3D;;;;GAIG;AACH,SAAgB,cAAc,CAC7B,OAAe,EACf,SAA8B;IAM9B,MAAM,WAAW,GAAG,IAAA,iCAAc,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAEvD,OAAO;QACN;YACC,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,iCAAiC;YACxC,MAAM,EAAE,mBAAmB;SAC3B;QACD;YACC,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,oCAAoC;YAC3C,MAAM,EAAE,sBAAsB;SAC9B;QACD;YACC,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,UAAU,WAAW,SAAS;YACrC,MAAM,EAAE,eAAe;SACvB;KACD,CAAC;AACH,CAAC;AA3BD,wCA2BC"}
|
|
@@ -24,7 +24,7 @@ function addAssets(options) {
|
|
|
24
24
|
}
|
|
25
25
|
const targetOptions = (0, schematics_1.getProjectTargetOptions)(project, 'build');
|
|
26
26
|
const assets = targetOptions['assets'];
|
|
27
|
-
targetOptions['assets'] = Array.from(new Set([...(0, assets_1.getNgDocAssets)(options), ...(assets ?? [])]));
|
|
27
|
+
targetOptions['assets'] = Array.from(new Set([...(0, assets_1.getNgDocAssets)(options, workspace), ...(assets ?? [])]));
|
|
28
28
|
logger.info('✅ Done!');
|
|
29
29
|
}
|
|
30
30
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-assets.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/steps/add-assets.ts"],"names":[],"mappings":";;;AAAA,wDAAkE;AAGlE,qEAI+C;AAE/C,gDAAqD;AAErD,sDAAkD;AAElD;;;;GAIG;AACH,SAAgB,SAAS,CAAC,OAAe;IACxC,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACtD,OAAO,IAAA,2BAAe,EAAC,CAAC,SAA8B,EAAE,EAAE;YACzD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YAExD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YAC7C,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;YAEzD,IAAI,CAAC;gBACJ,MAAM,OAAO,GAAkC,IAAA,wBAAU,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;gBAE9E,IAAI,CAAC,OAAO,EAAE,CAAC;oBACd,MAAM,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;oBAExE,OAAO;gBACR,CAAC;gBAED,MAAM,aAAa,GAA0C,IAAA,oCAAuB,EACnF,OAAO,EACP,OAAO,CACP,CAAC;gBAEF,MAAM,MAAM,GAA0B,aAAa,CAAC,QAAQ,CAA0B,CAAC;gBAEvF,aAAa,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,IAAI,CACnC,IAAI,GAAG,CAAC,CAAC,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"add-assets.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/steps/add-assets.ts"],"names":[],"mappings":";;;AAAA,wDAAkE;AAGlE,qEAI+C;AAE/C,gDAAqD;AAErD,sDAAkD;AAElD;;;;GAIG;AACH,SAAgB,SAAS,CAAC,OAAe;IACxC,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACtD,OAAO,IAAA,2BAAe,EAAC,CAAC,SAA8B,EAAE,EAAE;YACzD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YAExD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YAC7C,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;YAEzD,IAAI,CAAC;gBACJ,MAAM,OAAO,GAAkC,IAAA,wBAAU,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;gBAE9E,IAAI,CAAC,OAAO,EAAE,CAAC;oBACd,MAAM,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;oBAExE,OAAO;gBACR,CAAC;gBAED,MAAM,aAAa,GAA0C,IAAA,oCAAuB,EACnF,OAAO,EACP,OAAO,CACP,CAAC;gBAEF,MAAM,MAAM,GAA0B,aAAa,CAAC,QAAQ,CAA0B,CAAC;gBAEvF,aAAa,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,IAAI,CACnC,IAAI,GAAG,CAAC,CAAC,GAAG,IAAA,uBAAc,EAAC,OAAO,EAAE,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,CACnE,CAAC;gBAEF,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACxB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAC7B,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC;AAlCD,8BAkCC"}
|
|
@@ -6,6 +6,7 @@ const ng_morph_1 = require("ng-morph");
|
|
|
6
6
|
const path = require("path");
|
|
7
7
|
const modules_1 = require("../constants/modules");
|
|
8
8
|
const get_project_1 = require("../utils/get-project");
|
|
9
|
+
const get_project_name_1 = require("../utils/get-project-name");
|
|
9
10
|
/**
|
|
10
11
|
*
|
|
11
12
|
* @param options
|
|
@@ -24,13 +25,14 @@ function addTsconfigPaths(options) {
|
|
|
24
25
|
}
|
|
25
26
|
const buildTarget = project.targets.get('build');
|
|
26
27
|
const serveTarget = project.targets.get('serve');
|
|
28
|
+
const projectName = (0, get_project_name_1.getProjectName)(options, workspace);
|
|
27
29
|
if (buildTarget) {
|
|
28
30
|
const tsConfigPath = buildTarget.options && buildTarget.options['tsConfig'];
|
|
29
|
-
tsConfigPath && updateTsConfigPaths(tree, String(tsConfigPath),
|
|
31
|
+
tsConfigPath && updateTsConfigPaths(tree, String(tsConfigPath), projectName);
|
|
30
32
|
}
|
|
31
33
|
if (serveTarget) {
|
|
32
34
|
const tsConfigPath = serveTarget.options && serveTarget.options['tsConfig'];
|
|
33
|
-
tsConfigPath && updateTsConfigPaths(tree, String(tsConfigPath),
|
|
35
|
+
tsConfigPath && updateTsConfigPaths(tree, String(tsConfigPath), projectName);
|
|
34
36
|
}
|
|
35
37
|
logger.info('✅ Done!');
|
|
36
38
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-tsconfig-paths.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/steps/add-tsconfig-paths.ts"],"names":[],"mappings":";;;AACA,qEAK+C;AAC/C,uCAAoC;AACpC,6BAA6B;AAE7B,kDAAsD;AAEtD,sDAAkD;
|
|
1
|
+
{"version":3,"file":"add-tsconfig-paths.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/steps/add-tsconfig-paths.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getProjectName = void 0;
|
|
4
|
+
/**
|
|
5
|
+
*
|
|
6
|
+
* @param options
|
|
7
|
+
* @param workspace
|
|
8
|
+
*/
|
|
9
|
+
function getProjectName(options, workspace) {
|
|
10
|
+
const firstBuildableProjectName = Array.from(workspace.projects.entries()).find(([, project]) => project.targets.get('build'))?.[0];
|
|
11
|
+
return (options.project ||
|
|
12
|
+
workspace.extensions['defaultProject']?.toString() ||
|
|
13
|
+
firstBuildableProjectName ||
|
|
14
|
+
'');
|
|
15
|
+
}
|
|
16
|
+
exports.getProjectName = getProjectName;
|
|
17
|
+
//# sourceMappingURL=get-project-name.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-project-name.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/utils/get-project-name.ts"],"names":[],"mappings":";;;AAIA;;;;GAIG;AACH,SAAgB,cAAc,CAAC,OAAe,EAAE,SAA8B;IAC7E,MAAM,yBAAyB,GAAuB,KAAK,CAAC,IAAI,CAC/D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,CAC5B,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,CAA8B,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAExF,OAAO,CACN,OAAO,CAAC,OAAO;QACf,SAAS,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,QAAQ,EAAE;QAClD,yBAAyB;QACzB,EAAE,CACF,CAAC;AACH,CAAC;AAXD,wCAWC"}
|
|
@@ -1,17 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getProject = void 0;
|
|
4
|
+
const get_project_name_1 = require("./get-project-name");
|
|
4
5
|
/**
|
|
5
6
|
*
|
|
6
7
|
* @param options
|
|
7
8
|
* @param workspace
|
|
8
9
|
*/
|
|
9
10
|
function getProject(options, workspace) {
|
|
10
|
-
const
|
|
11
|
-
const projectName = options.project ||
|
|
12
|
-
workspace.extensions['defaultProject']?.toString() ||
|
|
13
|
-
firstBuildableProjectName ||
|
|
14
|
-
'';
|
|
11
|
+
const projectName = (0, get_project_name_1.getProjectName)(options, workspace);
|
|
15
12
|
return workspace.projects.get(projectName);
|
|
16
13
|
}
|
|
17
14
|
exports.getProject = getProject;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-project.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/utils/get-project.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"get-project.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/utils/get-project.ts"],"names":[],"mappings":";;;AAGA,yDAAoD;AAEpD;;;;GAIG;AACH,SAAgB,UAAU,CACzB,OAAe,EACf,SAA8B;IAE9B,MAAM,WAAW,GAAG,IAAA,iCAAc,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAEvD,OAAO,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AAC5C,CAAC;AAPD,gCAOC"}
|