@o3r/schematics 8.2.0-alpha.25 → 8.2.0-alpha.26
Sign up to get free protection for your applications and to get access to all the features.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/schematics",
|
|
3
|
-
"version": "8.2.0-alpha.
|
|
3
|
+
"version": "8.2.0-alpha.26",
|
|
4
4
|
"description": "Schematics module of the Otter framework",
|
|
5
5
|
"main": "./src/index.js",
|
|
6
6
|
"keywords": [
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
}
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@o3r/dev-tools": "^8.2.0-alpha.
|
|
31
|
+
"@o3r/dev-tools": "^8.2.0-alpha.26",
|
|
32
32
|
"comment-json": "^4.1.0",
|
|
33
33
|
"globby": "^11.1.0",
|
|
34
34
|
"minimatch": "^6.1.6",
|
|
@@ -51,8 +51,8 @@
|
|
|
51
51
|
"@nrwl/jest": "~15.9.0",
|
|
52
52
|
"@nrwl/js": "~15.9.0",
|
|
53
53
|
"@nrwl/linter": "~15.9.0",
|
|
54
|
-
"@o3r/build-helpers": "^8.2.0-alpha.
|
|
55
|
-
"@o3r/eslint-plugin": "^8.2.0-alpha.
|
|
54
|
+
"@o3r/build-helpers": "^8.2.0-alpha.26",
|
|
55
|
+
"@o3r/eslint-plugin": "^8.2.0-alpha.26",
|
|
56
56
|
"@schematics/angular": "~15.2.0",
|
|
57
57
|
"@types/jest": "~28.1.2",
|
|
58
58
|
"@types/node": "^17.0.45",
|
package/src/utility/routes.d.ts
CHANGED
|
@@ -34,6 +34,7 @@ export declare function getRoutesNodeArray(tree: Tree, context: SchematicContext
|
|
|
34
34
|
* @param context Context of the rule
|
|
35
35
|
* @param appRoutingModulePath Path of the App Routing Module
|
|
36
36
|
* @param route The Route to insert
|
|
37
|
+
* @param standalone Whether the page component is standalone
|
|
37
38
|
*/
|
|
38
|
-
export declare function insertRoute(tree: Tree, context: SchematicContext, appRoutingModulePath: string, route: Route): import("@angular-devkit/schematics/src/tree/interface").Tree;
|
|
39
|
+
export declare function insertRoute(tree: Tree, context: SchematicContext, appRoutingModulePath: string, route: Route, standalone?: boolean): import("@angular-devkit/schematics/src/tree/interface").Tree;
|
|
39
40
|
//# sourceMappingURL=routes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../../src/utility/routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,KAAK,EAAE,MAAM,gFAAgF,CAAC;AAErG;;GAEG;AACH,MAAM,WAAW,KAAK;IACpB,yBAAyB;IACzB,IAAI,EAAE,MAAM,CAAC;IAEb,yCAAyC;IACzC,MAAM,EAAE,MAAM,CAAC;IAEf,kCAAkC;IAClC,MAAM,EAAE,MAAM,CAAC;CAChB;AAmCD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,GAAG,EAAE,CAAC,mBAAmB,GAAG,IAAI,CAuBvI;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,uBAAuB,CAAC,GAAG,IAAI,CAuBvJ;AAED
|
|
1
|
+
{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../../src/utility/routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,KAAK,EAAE,MAAM,gFAAgF,CAAC;AAErG;;GAEG;AACH,MAAM,WAAW,KAAK;IACpB,yBAAyB;IACzB,IAAI,EAAE,MAAM,CAAC;IAEb,yCAAyC;IACzC,MAAM,EAAE,MAAM,CAAC;IAEf,kCAAkC;IAClC,MAAM,EAAE,MAAM,CAAC;CAChB;AAmCD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,GAAG,EAAE,CAAC,mBAAmB,GAAG,IAAI,CAuBvI;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,uBAAuB,CAAC,GAAG,IAAI,CAuBvJ;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,GAAE,OAAe,gEAezI"}
|
package/src/utility/routes.js
CHANGED
|
@@ -84,13 +84,14 @@ exports.getRoutesNodeArray = getRoutesNodeArray;
|
|
|
84
84
|
* @param context Context of the rule
|
|
85
85
|
* @param appRoutingModulePath Path of the App Routing Module
|
|
86
86
|
* @param route The Route to insert
|
|
87
|
+
* @param standalone Whether the page component is standalone
|
|
87
88
|
*/
|
|
88
|
-
function insertRoute(tree, context, appRoutingModulePath, route) {
|
|
89
|
+
function insertRoute(tree, context, appRoutingModulePath, route, standalone = false) {
|
|
89
90
|
const routes = getRoutesNodeArray(tree, context, appRoutingModulePath);
|
|
90
91
|
if (routes) {
|
|
91
92
|
const noStarRoutes = routes.filter((r) => !hasRoutePath(r, '**'));
|
|
92
93
|
const index = noStarRoutes.length >= 1 ? noStarRoutes[noStarRoutes.length - 1].end : routes.end;
|
|
93
|
-
const routeString = `{path: '${route.path}',
|
|
94
|
+
const routeString = `{path: '${route.path}', load${standalone ? 'Component' : 'Children'}: () => import('${route.import}').then((m) => m.${route.module})}`;
|
|
94
95
|
const content = noStarRoutes.length >= 1 ? `,\n${routeString}` : routeString;
|
|
95
96
|
const recorder = tree.beginUpdate(appRoutingModulePath);
|
|
96
97
|
recorder.insertLeft(index, content);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../src/utility/routes.ts"],"names":[],"mappings":";;;AACA,qGAAqG;AAgBrG;;;;;GAKG;AACH,SAAS,YAAY,CAAC,KAAiC,EAAE,IAAY;IACnE,OAAO,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CACxC,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,kBAAkB;QACjD,QAAQ,CAAC,IAAsB,CAAC,IAAI,KAAK,MAAM;QAC/C,QAAQ,CAAC,WAA6B,CAAC,IAAI,KAAK,IAAI,CACtD,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAS,mBAAmB,CAAC,WAAmC;IAC9D,IAAI,WAAW,CAAC,IAAI,EAAE;QACpB,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,EAAE;YACzD,OAAQ,WAAW,CAAC,IAA6B,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,QAAQ,CAAC;SACnF;QAED,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,SAAS,EAAE;YACrD,OAAS,WAAW,CAAC,IAAyB,CAAC,WAAoC,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,QAAQ,CAAC;SACrH;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,oBAAoB,CAAC,IAAU,EAAE,OAAyB,EAAE,oBAA4B;IACtG,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAE/C,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,oBAAoB,EAAE,CAAC,CAAC;QAC5D,OAAO,IAAI,CAAC;KACb;IAED,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,oBAAoB,EACpB,MAAM,CAAC,QAAQ,EAAE,EACjB,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,OAAO,UAAU,CAAC,UAAU;SACzB,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC;SACzE,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAE,SAAkC,CAAC,eAAe,CAAC,YAAY,CAAC;SACpF,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;SAC/D,MAAM,CAAC,CAAC,WAAW,EAAE,YAAY,EAAE,EAAE,CACpC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EACvD,IAAqC,CACtC,CAAC;AACN,CAAC;AAvBD,oDAuBC;AAED;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAAC,IAAU,EAAE,OAAyB,EAAE,oBAA4B;IACpG,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,IAAI,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC;IAEpF,IAAI,CAAC,iBAAiB,EAAE;QACtB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC;KACb;IAED,MAAM,YAAY,GAAI,iBAAiB,CAAC,WAAyC,CAAC,QAAoD,CAAC;IAEvI,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;IACzE,IAAI,UAAU,EAAE;QACd,MAAM,YAAY,GAAG,UAAU,CAAC,UAAU;aACvC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC;aACxE,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAE,QAAQ,CAAC,IAAsB,CAAC,IAAI,KAAK,UAAU,CAAC;aAC1E,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAE,QAAkC,CAAC,WAAwC,CAAC,CAAC;QAEnG,IAAI,YAAY,CAAC,CAAC,CAAC,EAAE;YACnB,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,QAAoD,CAAC;SAC7E;KACF;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAvBD,gDAuBC;AAED
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../src/utility/routes.ts"],"names":[],"mappings":"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"}
|