@rxap/plugin-angular 16.2.0-dev.13 → 16.2.0-dev.15

package/CHANGELOG.md

@@ -3,6 +3,32 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [16.2.0-dev.15](https://gitlab.com/rxap/packages/compare/@rxap/plugin-angular@16.2.0-dev.14...@rxap/plugin-angular@16.2.0-dev.15) (2024-04-12)
+
+### Bug Fixes
+
+- add index and scss files if not updated ([2a0d639](https://gitlab.com/rxap/packages/commit/2a0d639814d389ab3eb18601b88cdbe684228452))
+- coerce the test setup file ([e30586b](https://gitlab.com/rxap/packages/commit/e30586b7f616d9f9e95b167ccbb10e4c9aebee94))
+- preserve custom directory ([deecebb](https://gitlab.com/rxap/packages/commit/deecebbf21a796c327b5721dd7ce07e20038d4ad))
+- use correct component path prefixes and option defaults ([4594d6a](https://gitlab.com/rxap/packages/commit/4594d6a1cbde8cdb52c8e73072a7a2ea67c77d7b))
+
+### Features
+
+- add init-component generator ([a023d64](https://gitlab.com/rxap/packages/commit/a023d6402b09cf049b82f70a4a1a1e0c2a1671ae))
+- support option --skip-docker ([38341fc](https://gitlab.com/rxap/packages/commit/38341fcc50d2c705251630f6933ebd81829ed6f3))
+
+# [16.2.0-dev.14](https://gitlab.com/rxap/packages/compare/@rxap/plugin-angular@16.2.0-dev.13...@rxap/plugin-angular@16.2.0-dev.14) (2024-04-10)
+
+### Bug Fixes
+
+- add stories and cy files to is config exclude ([d80af1b](https://gitlab.com/rxap/packages/commit/d80af1b770521cbab4a975e0140e5575c87a5f42))
+- detected layout children array by component name ([0ca7179](https://gitlab.com/rxap/packages/commit/0ca7179bd81e3cbb7922eaca440de0fe18f460d6))
+
+### Features
+
+- add format files ([672c753](https://gitlab.com/rxap/packages/commit/672c7533b8b0248d19c9dc2ad4a203c482cfd9ae))
+- add layoutRoutePath and standaloneImport options ([8ae83ff](https://gitlab.com/rxap/packages/commit/8ae83ff71d3793130df5e10f24113be6b1d791fd))
+
 # [16.2.0-dev.13](https://gitlab.com/rxap/packages/compare/@rxap/plugin-angular@16.2.0-dev.12...@rxap/plugin-angular@16.2.0-dev.13) (2024-04-10)
 
 ### Bug Fixes

package/README.md

@@ -19,7 +19,7 @@ yarn add @rxap/plugin-angular
 ```
 **Install peer dependencies:**
 ```bash
-yarn add @nx/angular@^16.10.0 @nx/devkit@^16.10.0 @nx/linter@^16.10.0 @rxap/plugin-application@^16.2.0-dev.7 @rxap/plugin-docker@^16.1.0-dev.11 @rxap/plugin-library@^16.1.0-dev.11 @rxap/plugin-localazy@^16.1.1-dev.3 @rxap/plugin-utilities@^16.2.0-dev.1 @rxap/ts-morph@^1.1.0-dev.27 @rxap/utilities@^16.1.0-dev.9 @rxap/workspace-ts-morph@^16.1.0-dev.0 @rxap/workspace-utilities@^16.1.0-dev.11 nx@^16.10.0 ts-morph@^18.0.0 tslib@2.6.2 
+yarn add @nx/angular@^16.10.0 @nx/devkit@^16.10.0 @nx/linter@^16.10.0 @rxap/plugin-application@^16.2.0-dev.10 @rxap/plugin-gitlab-ci@^16.2.0-dev.3 @rxap/plugin-library@^16.1.0-dev.12 @rxap/plugin-localazy@^16.1.1-dev.3 @rxap/plugin-utilities@^16.2.0-dev.1 @rxap/ts-morph@^1.1.0-dev.29 @rxap/utilities@^16.1.0-dev.9 @rxap/workspace-ts-morph@^16.1.0-dev.0 @rxap/workspace-utilities@^16.1.0-dev.13 nx@^16.10.0 ts-morph@^18.0.0 tslib@2.6.2 
 ```
 **Execute the init generator:**
 ```bash
@@ -69,6 +69,13 @@ yarn nx g @rxap/plugin-angular:schematic
 yarn nx g @rxap/plugin-angular:init-feature
 ```
 
+## init-component
+> init-component generator
+
+```bash
+yarn nx g @rxap/plugin-angular:init-component
+```
+
 ## init
 > init generator
 
@@ -110,6 +117,13 @@ yarn nx g @rxap/plugin-angular:schematic
 ```bash
 yarn nx g @rxap/plugin-angular:init-feature
 ```
+
+## init-component
+> init-component generator
+
+```bash
+yarn nx g @rxap/plugin-angular:init-component
+```
 # Executors
 
 ## tailwind

package/generators.json

@@ -29,6 +29,11 @@
       "factory": "./src/generators/init-feature/generator",
       "schema": "./src/generators/init-feature/schema.json",
       "description": "init-feature generator"
+    },
+    "init-component": {
+      "factory": "./src/generators/init-component/generator",
+      "schema": "./src/generators/init-component/schema.json",
+      "description": "init-component generator"
     }
   },
   "schematics": {
@@ -61,6 +66,11 @@
       "factory": "./src/generators/init-feature/index",
       "schema": "./src/generators/init-feature/schema.json",
       "description": "init-feature generator"
+    },
+    "init-component": {
+      "factory": "./src/generators/init-component/index",
+      "schema": "./src/generators/init-component/schema.json",
+      "description": "init-component generator"
     }
   }
 }

package/package.json

@@ -1,9 +1,10 @@
 {
-  "version": "16.2.0-dev.13",
+  "version": "16.2.0-dev.15",
   "name": "@rxap/plugin-angular",
   "license": "GPL-3.0-or-later",
   "dependencies": {
     "@apidevtools/json-schema-ref-parser": "9.0.9",
+    "@nx/devkit": "16.10.0",
     "colors": "1.4.0",
     "fs-extra": "11.1.1",
     "glob": "10.3.10",
@@ -18,20 +19,20 @@
     "@nx/angular": "^16.10.0",
     "@nx/devkit": "^16.10.0",
     "@nx/linter": "^16.10.0",
-    "@rxap/plugin-application": "^16.2.0-dev.7",
-    "@rxap/plugin-docker": "^16.1.0-dev.11",
-    "@rxap/plugin-library": "^16.1.0-dev.11",
+    "@rxap/plugin-application": "^16.2.0-dev.10",
+    "@rxap/plugin-gitlab-ci": "^16.2.0-dev.3",
+    "@rxap/plugin-library": "^16.1.0-dev.12",
     "@rxap/plugin-localazy": "^16.1.1-dev.3",
     "@rxap/plugin-utilities": "^16.2.0-dev.1",
-    "@rxap/ts-morph": "^1.1.0-dev.27",
+    "@rxap/ts-morph": "^1.1.0-dev.29",
     "@rxap/utilities": "^16.1.0-dev.9",
     "@rxap/workspace-ts-morph": "^16.1.0-dev.0",
-    "@rxap/workspace-utilities": "^16.1.0-dev.11",
+    "@rxap/workspace-utilities": "^16.1.0-dev.13",
     "nx": "^16.10.0",
     "ts-morph": "^18.0.0",
     "tslib": "2.6.2",
     "@rxap/generator-ts-morph": "1.0.2-dev.1",
-    "@rxap/node-utilities": "1.2.0-dev.1"
+    "@rxap/node-utilities": "1.2.0-dev.2"
   },
   "author": {
     "name": "Merzough Münker",
@@ -65,15 +66,19 @@
       },
       {
         "package": "@rxap/plugin-application",
-        "version": "16.2.0-dev.7"
+        "version": "16.2.0-dev.10"
       },
       {
         "package": "@rxap/plugin-docker",
-        "version": "16.1.0-dev.11"
+        "version": "16.1.0-dev.12"
+      },
+      {
+        "package": "@rxap/plugin-gitlab-ci",
+        "version": "16.2.0-dev.3"
       },
       {
         "package": "@rxap/plugin-library",
-        "version": "16.1.0-dev.11"
+        "version": "16.1.0-dev.12"
       },
       {
         "package": "@rxap/plugin-localazy",
@@ -89,7 +94,7 @@
       },
       {
         "package": "@rxap/ts-morph",
-        "version": "1.1.0-dev.27"
+        "version": "1.1.0-dev.29"
       },
       {
         "package": "@rxap/utilities",
@@ -101,7 +106,7 @@
       },
       {
         "package": "@rxap/workspace-utilities",
-        "version": "16.1.0-dev.11"
+        "version": "16.1.0-dev.13"
       }
     ]
   },
@@ -116,6 +121,6 @@
   },
   "schematics": "./generators.json",
   "type": "commonjs",
-  "gitHead": "529bd5db98c2cffaab2ca9469770b266a57b9115",
+  "gitHead": "e13d3880ec9119dcbb6b6a5ae8a1ee4d4c4500dc",
   "main": "./src/index.js"
 }

package/src/generators/init/generator.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initGenerator = void 0;
 const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
 const utilities_1 = require("@rxap/utilities");
 const workspace_utilities_1 = require("@rxap/workspace-utilities");
 const generator_1 = require("../init-library/generator");
@@ -40,6 +41,9 @@ function initGenerator(tree, options) {
             },
             indexExport: false,
         });
+        if (!options.skipFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
     });
 }
 exports.initGenerator = initGenerator;

package/src/generators/init/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init/generator.ts"],"names":[],"mappings":";;;;AACA,+CAAmD;AACnD,mEAA4E;AAC5E,yDAA6D;AAG7D,SAAsB,aAAa,CAAC,IAAU,EAAE,OAA4B;;QAC1E,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;QAEhD,IAAA,qDAA+B,EAC7B,IAAI,EACJ,GAAG,EACH,sBAAsB,EACtB,MAAM,EACN,IAAA,4BAAgB,EAAC,OAAO,EAAE,CAAE,UAAU,EAAE,WAAW,EAAE,cAAc,CAAE,CAAC,CACvE,CAAC;QAEF,MAAM,IAAA,mBAAoB,EAAC,IAAI,EAAE;YAC/B,QAAQ,EAAE;gBACR,YAAY;gBACZ,OAAO;gBACP,UAAU;gBACV,QAAQ;aACT;YACD,MAAM,EAAE;gBACN,SAAS,EAAE,SAAS;gBACpB,WAAW,EAAE,IAAI;aAClB;YACD,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;QAEH,MAAM,IAAA,mBAAoB,EAAC,IAAI,EAAE;YAC/B,QAAQ,EAAE;gBACR,SAAS;gBACT,cAAc;gBACd,OAAO;gBACP,YAAY;gBACZ,QAAQ;gBACR,UAAU;gBACV,uBAAuB;gBACvB,SAAS;gBACT,WAAW;gBACX,mBAAmB;aACpB;YACD,MAAM,EAAE;gBACN,SAAS,EAAE,SAAS;aACrB;YACD,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;IAEL,CAAC;CAAA;AA5CD,sCA4CC;AAED,kBAAe,aAAa,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAGoB;AACpB,+CAAmD;AACnD,mEAA4E;AAC5E,yDAA6D;AAG7D,SAAsB,aAAa,CAAC,IAAU,EAAE,OAA4B;;QAC1E,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;QAEhD,IAAA,qDAA+B,EAC7B,IAAI,EACJ,GAAG,EACH,sBAAsB,EACtB,MAAM,EACN,IAAA,4BAAgB,EAAC,OAAO,EAAE,CAAE,UAAU,EAAE,WAAW,EAAE,cAAc,CAAE,CAAC,CACvE,CAAC;QAEF,MAAM,IAAA,mBAAoB,EAAC,IAAI,EAAE;YAC/B,QAAQ,EAAE;gBACR,YAAY;gBACZ,OAAO;gBACP,UAAU;gBACV,QAAQ;aACT;YACD,MAAM,EAAE;gBACN,SAAS,EAAE,SAAS;gBACpB,WAAW,EAAE,IAAI;aAClB;YACD,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;QAEH,MAAM,IAAA,mBAAoB,EAAC,IAAI,EAAE;YAC/B,QAAQ,EAAE;gBACR,SAAS;gBACT,cAAc;gBACd,OAAO;gBACP,YAAY;gBACZ,QAAQ;gBACR,UAAU;gBACV,uBAAuB;gBACvB,SAAS;gBACT,WAAW;gBACX,mBAAmB;aACpB;YACD,MAAM,EAAE;gBACN,SAAS,EAAE,SAAS;aACrB;YACD,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IAEH,CAAC;CAAA;AAhDD,sCAgDC;AAED,kBAAe,aAAa,CAAC"}

package/src/generators/init/schema.d.ts

@@ -2,4 +2,5 @@ export interface InitGeneratorSchema {
   projects?: string[];
   overwrite?: boolean;
   skipProjects?: boolean;
+  skipFormat?: boolean;
 }

package/src/generators/init/schema.json

@@ -16,6 +16,10 @@
       "default": false,
       "description": "Whether to overwrite existing files"
     },
+    "skipFormat": {
+      "type": "boolean",
+      "default": false
+    },
     "skipProjects": {
       "type": "boolean",
       "default": false,

package/src/generators/init-application/coerce-project.js

@@ -34,18 +34,18 @@ function CoerceProject(tree, projectName, options) {
         if (options.moduleFederation) {
             if (options.moduleFederation === 'host') {
                 const defaultOptions = (0, workspace_utilities_1.GetDefaultGeneratorOptions)(tree, '@nx/angular:host');
-                const schema = Object.assign(Object.assign(Object.assign({ style: 'scss', inlineStyle: false, inlineTemplate: false, skipTests: false, skipFormat: false, skipPackageJson: false, unitTestRunner: generators_1.UnitTestRunner.Jest, e2eTestRunner: generators_1.E2eTestRunner.None, linter: linter_1.Linter.EsLint, strict: true, standaloneConfig: true }, defaultOptions), formOptions), { name: projectName, dynamic: true, projectNameAndRootFormat: 'as-provided', directory });
+                const schema = Object.assign(Object.assign(Object.assign(Object.assign({ style: 'scss', inlineStyle: false, inlineTemplate: false, skipTests: false, skipFormat: false, skipPackageJson: false, unitTestRunner: generators_1.UnitTestRunner.Jest, e2eTestRunner: generators_1.E2eTestRunner.None, linter: linter_1.Linter.EsLint, strict: true, standaloneConfig: true }, defaultOptions), { directory }), formOptions), { name: projectName, dynamic: true, projectNameAndRootFormat: 'as-provided' });
                 yield (0, generators_1.host)(tree, schema);
             }
             else {
                 const defaultOptions = (0, workspace_utilities_1.GetDefaultGeneratorOptions)(tree, '@nx/angular:remote');
-                const schema = Object.assign(Object.assign(Object.assign({ style: 'scss', inlineStyle: false, inlineTemplate: false, skipTests: false, skipFormat: false, skipPackageJson: false, unitTestRunner: generators_1.UnitTestRunner.Jest, e2eTestRunner: generators_1.E2eTestRunner.None, linter: linter_1.Linter.EsLint, strict: true, standaloneConfig: true }, defaultOptions), formOptions), { host: options.host, name: projectName, projectNameAndRootFormat: 'as-provided', directory });
+                const schema = Object.assign(Object.assign(Object.assign(Object.assign({ style: 'scss', inlineStyle: false, inlineTemplate: false, skipTests: false, skipFormat: false, skipPackageJson: false, unitTestRunner: generators_1.UnitTestRunner.Jest, e2eTestRunner: generators_1.E2eTestRunner.None, linter: linter_1.Linter.EsLint, strict: true, standaloneConfig: true }, defaultOptions), { directory }), formOptions), { host: options.host, name: projectName, projectNameAndRootFormat: 'as-provided' });
                 yield (0, generators_1.remote)(tree, schema);
             }
         }
         else {
             const defaultOptions = (0, workspace_utilities_1.GetDefaultGeneratorOptions)(tree, '@nx/angular:application');
-            const schema = Object.assign(Object.assign(Object.assign({ style: 'scss', routing: true, inlineStyle: false, inlineTemplate: false, skipTests: false, skipFormat: false, skipPackageJson: false, unitTestRunner: generators_1.UnitTestRunner.Jest, e2eTestRunner: generators_1.E2eTestRunner.None, linter: linter_1.Linter.EsLint, strict: true, standaloneConfig: true, minimal: true }, defaultOptions), formOptions), { name: projectName, projectNameAndRootFormat: 'as-provided', directory });
+            const schema = Object.assign(Object.assign(Object.assign(Object.assign({ style: 'scss', routing: true, inlineStyle: false, inlineTemplate: false, skipTests: false, skipFormat: false, skipPackageJson: false, unitTestRunner: generators_1.UnitTestRunner.Jest, e2eTestRunner: generators_1.E2eTestRunner.None, linter: linter_1.Linter.EsLint, strict: true, standaloneConfig: true, minimal: true }, defaultOptions), { directory }), formOptions), { name: projectName, projectNameAndRootFormat: 'as-provided' });
             yield (0, generators_1.applicationGenerator)(tree, schema);
         }
     });

package/src/generators/init-application/coerce-project.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-project.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init-application/coerce-project.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"coerce-project.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init-application/coerce-project.ts"],"names":[],"mappings":";;;;AAAA,uDAMgC;AAKhC,mEAAgE;AAChE,mEAGmC;AAGnC,SAAsB,cAAc,CAAC,IAAU,EAAE,OAAuC;;;QAEtF,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACnB,OAAO;SACR;QAED,KAAK,MAAM,WAAW,IAAI,MAAA,OAAO,CAAC,QAAQ,mCAAI,EAAE,EAAE;YAEhD,IAAI,CAAC,IAAA,gCAAU,EAAC,IAAI,EAAE,WAAW,CAAC,EAAE;gBAElC,MAAM,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aAEjD;SAEF;;CAEF;AAhBD,wCAgBC;AAED,SAAsB,aAAa,CAAC,IAAU,EAAE,WAAmB,EAAE,OAAuC;;QAE1G,IAAI,IAAA,gCAAU,EAAC,IAAI,EAAE,WAAW,CAAC,EAAE;YACjC,OAAO,CAAC,GAAG,CAAC,WAAY,WAAY,iBAAiB,CAAC,CAAC;YACvD,OAAO;SACR;QAED,IAAI,SAAS,GAAG,gBAAgB,CAAC;QACjC,IAAI,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YACrC,SAAS,IAAI,UAAU,CAAC;SACzB;QACD,SAAS,IAAI,IAAK,WAAW,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAE,EAAE,CAAC;QAExF,MAAM,WAAW,GAAQ,OAAO,OAAO,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAElF,IAAI,OAAO,CAAC,gBAAgB,EAAE;YAE5B,IAAI,OAAO,CAAC,gBAAgB,KAAK,MAAM,EAAE;gBACvC,MAAM,cAAc,GAAG,IAAA,gDAA0B,EAAsC,IAAI,EAAE,kBAAkB,CAAC,CAAC;gBACjH,MAAM,MAAM,6DACV,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,KAAK,EAClB,cAAc,EAAE,KAAK,EACrB,SAAS,EAAE,KAAK,EAChB,UAAU,EAAE,KAAK,EACjB,eAAe,EAAE,KAAK,EACtB,cAAc,EAAE,2BAAc,CAAC,IAAI,EACnC,aAAa,EAAE,0BAAa,CAAC,IAAI,EACjC,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,MAAM,EAAE,IAAI,EACZ,gBAAgB,EAAE,IAAI,IACnB,cAAc,KACjB,SAAS,KACN,WAAW,KACd,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,IAAI,EACb,wBAAwB,EAAE,aAAa,GACxC,CAAC;gBACF,MAAM,IAAA,iBAAoB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aAC1C;iBAAM;gBACL,MAAM,cAAc,GAAG,IAAA,gDAA0B,EAAwC,IAAI,EAAE,oBAAoB,CAAC,CAAC;gBACrH,MAAM,MAAM,6DACV,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,KAAK,EAClB,cAAc,EAAE,KAAK,EACrB,SAAS,EAAE,KAAK,EAChB,UAAU,EAAE,KAAK,EACjB,eAAe,EAAE,KAAK,EACtB,cAAc,EAAE,2BAAc,CAAC,IAAI,EACnC,aAAa,EAAE,0BAAa,CAAC,IAAI,EACjC,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,MAAM,EAAE,IAAI,EACZ,gBAAgB,EAAE,IAAI,IACnB,cAAc,KACjB,SAAS,KACN,WAAW,KACd,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,IAAI,EAAE,WAAW,EACjB,wBAAwB,EAAE,aAAa,GACxC,CAAC;gBACF,MAAM,IAAA,mBAAsB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aAC5C;SAEF;aAAM;YACL,MAAM,cAAc,GAAG,IAAA,gDAA0B,EAA6C,IAAI,EAAE,yBAAyB,CAAC,CAAC;YAC/H,MAAM,MAAM,6DACV,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,IAAI,EACb,WAAW,EAAE,KAAK,EAClB,cAAc,EAAE,KAAK,EACrB,SAAS,EAAE,KAAK,EAChB,UAAU,EAAE,KAAK,EACjB,eAAe,EAAE,KAAK,EACtB,cAAc,EAAE,2BAAc,CAAC,IAAI,EACnC,aAAa,EAAE,0BAAa,CAAC,IAAI,EACjC,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,MAAM,EAAE,IAAI,EACZ,gBAAgB,EAAE,IAAI,EACtB,OAAO,EAAE,IAAI,IACV,cAAc,KACjB,SAAS,KACN,WAAW,KACd,IAAI,EAAE,WAAW,EACjB,wBAAwB,EAAE,aAAa,GACxC,CAAC;YACF,MAAM,IAAA,iCAA2B,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SACjD;IAEH,CAAC;CAAA;AAxFD,sCAwFC"}

package/src/generators/init-application/generate-monolithic.js

@@ -16,12 +16,13 @@ function generateMonolithic(tree, projectName, project, options) {
     (0, workspace_ts_morph_1.TsMorphAngularProjectTransform)(tree, {
         project: projectName,
     }, (_, [appSourceFile, layoutSourceFile, navigationSourceFile]) => {
+        var _a;
         (0, ts_morph_1.CoerceLayoutRoutes)(layoutSourceFile);
         (0, ts_morph_1.CoerceAppRoutes)(appSourceFile, {
             itemList: [
                 {
                     route: {
-                        path: '',
+                        path: (_a = options.layoutRoutePath) !== null && _a !== void 0 ? _a : '',
                         loadChildren: './layout.routes'
                     }
                 }

package/src/generators/init-application/generate-monolithic.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-monolithic.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init-application/generate-monolithic.ts"],"names":[],"mappings":";;;AAIA,6CAIwB;AACxB,iEAA0E;AAC1E,+BAA4B;AAG5B,SAAgB,kBAAkB,CAAC,IAAU,EAAE,WAAmB,EAAE,OAA6B,EAAE,OAAuC;IAExI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,6CAA8C,WAAY,EAAE,CAAC,CAAC;KAC/E;IAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC,EAAE;QAChE,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;YAC3B,IAAI,CAAC,KAAK,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAE,CAAC,CAAC;SACpF;KACF;IAED,IAAA,mDAA8B,EAAC,IAAI,EAAE;QACnC,OAAO,EAAE,WAAW;KACrB,EAAE,CAAC,CAAC,EAAE,CAAE,aAAa,EAAE,gBAAgB,EAAE,oBAAoB,CAAE,EAAE,EAAE;QAClE,IAAA,6BAAkB,EAAC,gBAAgB,CAAC,CAAC;QACrC,IAAA,0BAAe,EAAC,aAAa,EAAE;YAC7B,QAAQ,EAAE;gBACR;oBACE,KAAK,EAAE;wBACL,IAAI,EAAE,EAAE;wBACR,YAAY,EAAE,iBAAiB;qBAChC;iBACF;aACF;SACF,CAAC,CAAC;QACH,IAAA,8BAAmB,EAAC,oBAAoB,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IAC9E,CAAC,EAAE,CAAE,oBAAoB,EAAE,uBAAuB,EAAE,wBAAwB,CAAE,CAAC,CAAC;AAElF,CAAC;AA7BD,gDA6BC"}
+{"version":3,"file":"generate-monolithic.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init-application/generate-monolithic.ts"],"names":[],"mappings":";;;AAIA,6CAIwB;AACxB,iEAA0E;AAC1E,+BAA4B;AAG5B,SAAgB,kBAAkB,CAAC,IAAU,EAAE,WAAmB,EAAE,OAA6B,EAAE,OAAuC;IAExI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,6CAA8C,WAAY,EAAE,CAAC,CAAC;KAC/E;IAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC,EAAE;QAChE,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;YAC3B,IAAI,CAAC,KAAK,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAE,CAAC,CAAC;SACpF;KACF;IAED,IAAA,mDAA8B,EAAC,IAAI,EAAE;QACnC,OAAO,EAAE,WAAW;KACrB,EAAE,CAAC,CAAC,EAAE,CAAE,aAAa,EAAE,gBAAgB,EAAE,oBAAoB,CAAE,EAAE,EAAE;;QAClE,IAAA,6BAAkB,EAAC,gBAAgB,CAAC,CAAC;QACrC,IAAA,0BAAe,EAAC,aAAa,EAAE;YAC7B,QAAQ,EAAE;gBACR;oBACE,KAAK,EAAE;wBACL,IAAI,EAAE,MAAA,OAAO,CAAC,eAAe,mCAAI,EAAE;wBACnC,YAAY,EAAE,iBAAiB;qBAChC;iBACF;aACF;SACF,CAAC,CAAC;QACH,IAAA,8BAAmB,EAAC,oBAAoB,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IAC9E,CAAC,EAAE,CAAE,oBAAoB,EAAE,uBAAuB,EAAE,wBAAwB,CAAE,CAAC,CAAC;AAElF,CAAC;AA7BD,gDA6BC"}

package/src/generators/init-application/generator.js

@@ -4,7 +4,7 @@ exports.initApplicationGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const plugin_application_1 = require("@rxap/plugin-application");
-const plugin_docker_1 = require("@rxap/plugin-docker");
+const plugin_gitlab_ci_1 = require("@rxap/plugin-gitlab-ci");
 const plugin_localazy_1 = require("@rxap/plugin-localazy");
 const ts_morph_1 = require("@rxap/ts-morph");
 const utilities_1 = require("@rxap/utilities");
@@ -12,6 +12,7 @@ const workspace_ts_morph_1 = require("@rxap/workspace-ts-morph");
 const workspace_utilities_1 = require("@rxap/workspace-utilities");
 const path_1 = require("path");
 const ts_morph_2 = require("ts-morph");
+const coerce_test_setup_1 = require("../../lib/coerce-test-setup");
 const coerce_project_1 = require("./coerce-project");
 const generate_authentication_1 = require("./generate-authentication");
 const generate_monolithic_1 = require("./generate-monolithic");
@@ -31,9 +32,13 @@ function updateProjectTargets(project, options) {
     if (!project.targets['build']) {
         throw new Error(`The project '${project.name}' has no build target`);
     }
-    if (project.targets['docker']) {
-        (_b = (_z = project.targets['docker']).options) !== null && _b !== void 0 ? _b : (_z.options = {});
-        (_c = (_0 = project.targets['docker'].options).dockerfile) !== null && _c !== void 0 ? _c : (_0.dockerfile = options.moduleFederation === 'remote' ? (0, path_1.join)(project.sourceRoot, 'Dockerfile') : 'shared/angular/Dockerfile');
+    if (!options.skipDocker) {
+        if (project.targets['docker']) {
+            (_b = (_z = project.targets['docker']).options) !== null && _b !== void 0 ? _b : (_z.options = {});
+            (_c = (_0 = project.targets['docker'].options).dockerfile) !== null && _c !== void 0 ? _c : (_0.dockerfile = options.moduleFederation === 'remote' ?
+                (0, path_1.join)(project.sourceRoot, 'Dockerfile') :
+                'shared/angular/Dockerfile');
+        }
     }
     (0, workspace_utilities_1.CoerceTarget)(project, 'serve', {
         options: {
@@ -422,7 +427,10 @@ function cleanup(tree, projectName, options) {
                 project: options.host,
             }, (_, [appRoutes]) => {
                 (0, ts_morph_1.RemoveRoute)(appRoutes, {
-                    loadRemoteModule: projectName,
+                    loadRemoteModule: {
+                        name: projectName,
+                        entry: './Routes',
+                    },
                     name: 'appRoutes'
                 });
                 appRoutes.organizeImports();
@@ -621,13 +629,20 @@ function updateTsConfig(tree, projectName) {
     const projectRoot = (0, workspace_utilities_1.GetProjectRoot)(tree, projectName);
     for (const tsConfigName of ['app', 'editor', 'spec']) {
         (0, workspace_utilities_1.UpdateTsConfigJson)(tree, tsConfig => {
-            var _a, _b;
-            var _c;
+            var _a, _b, _c;
+            var _d;
             (_a = tsConfig.compilerOptions) !== null && _a !== void 0 ? _a : (tsConfig.compilerOptions = {});
-            (_b = (_c = tsConfig.compilerOptions).types) !== null && _b !== void 0 ? _b : (_c.types = []);
+            (_b = (_d = tsConfig.compilerOptions).types) !== null && _b !== void 0 ? _b : (_d.types = []);
             if (!tsConfig.compilerOptions.types.includes('@angular/localize')) {
                 tsConfig.compilerOptions.types.push('@angular/localize');
             }
+            if (['app', 'spec'].includes(tsConfigName)) {
+                (_c = tsConfig.exclude) !== null && _c !== void 0 ? _c : (tsConfig.exclude = []);
+                (0, utilities_1.CoerceArrayItems)(tsConfig.exclude, [
+                    'src/**/*.stories.ts',
+                    'src/**/*.cy.ts',
+                ]);
+            }
         }, { infix: tsConfigName, basePath: projectRoot });
     }
 }
@@ -638,7 +653,7 @@ function linkMfeRemoteWithHost(tree, projectName, options) {
     const hostSourceRoot = (0, workspace_utilities_1.GetProjectSourceRoot)(tree, options.host);
     const isHostMonolithic = tree.exists((0, path_1.join)(hostSourceRoot, 'app/layout.routes.ts'));
     const path = projectName.replace('user-interface-', '').replace('feature-', '');
-    if (isHostMonolithic) {
+    if (isHostMonolithic && !options.standaloneImport) {
         (0, workspace_ts_morph_1.TsMorphAngularProjectTransform)(tree, {
             project: options.host,
         }, (project, [layoutSourceFile]) => {
@@ -649,7 +664,7 @@ function linkMfeRemoteWithHost(tree, projectName, options) {
                             path,
                             loadRemoteModule: projectName
                         },
-                        path: ['']
+                        component: 'LayoutComponent'
                     }
                 ]
             });
@@ -673,30 +688,19 @@ function linkMfeRemoteWithHost(tree, projectName, options) {
     }
 }
 function initApplicationGenerator(tree, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+    var _a, _b, _c;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (_a = options.moduleFederation) !== null && _a !== void 0 ? _a : (options.moduleFederation = undefined);
-        (_b = options.sentry) !== null && _b !== void 0 ? _b : (options.sentry = true);
-        (_c = options.openApi) !== null && _c !== void 0 ? _c : (options.openApi = false);
-        (_d = options.config) !== null && _d !== void 0 ? _d : (options.config = true);
-        (_e = options.localazy) !== null && _e !== void 0 ? _e : (options.localazy = false);
-        (_f = options.i18n) !== null && _f !== void 0 ? _f : (options.i18n = false);
-        (_g = options.serviceWorker) !== null && _g !== void 0 ? _g : (options.serviceWorker = false);
-        (_h = options.languages) !== null && _h !== void 0 ? _h : (options.languages = options.i18n ? ['en'] : []);
-        (_j = options.material) !== null && _j !== void 0 ? _j : (options.material = true);
-        (_k = options.generateMain) !== null && _k !== void 0 ? _k : (options.generateMain = false);
-        (_l = options.overwrite) !== null && _l !== void 0 ? _l : (options.overwrite = false);
-        (_m = options.monolithic) !== null && _m !== void 0 ? _m : (options.monolithic = false);
-        options.openApi = options.openApi || options.monolithic;
-        (_o = options.authentik) !== null && _o !== void 0 ? _o : (options.authentik = false);
-        (_p = options.oauth) !== null && _p !== void 0 ? _p : (options.oauth = false);
-        (_q = options.authentication) !== null && _q !== void 0 ? _q : (options.authentication = false);
-        options.oauth = options.oauth || options.authentik;
-        (_r = options.project) !== null && _r !== void 0 ? _r : (options.project = undefined);
-        (_s = options.projects) !== null && _s !== void 0 ? _s : (options.projects = []);
-        (_t = options.cleanup) !== null && _t !== void 0 ? _t : (options.cleanup = true);
-        (_u = options.host) !== null && _u !== void 0 ? _u : (options.host = undefined);
+        if (options.authentik) {
+            options.oauth = true;
+        }
+        if (options.monolithic) {
+            options.openApi = true;
+        }
+        if (options.i18n) {
+            (_a = options.languages) !== null && _a !== void 0 ? _a : (options.languages = ['en']);
+        }
         if (options.project) {
+            (_b = options.projects) !== null && _b !== void 0 ? _b : (options.projects = []);
             (0, utilities_1.CoerceArrayItems)(options.projects, [options.project]);
         }
         if (options.host) {
@@ -732,6 +736,7 @@ function initApplicationGenerator(tree, options) {
         yield (0, workspace_utilities_1.AddPackageJsonDependency)(tree, '@rxap/pipes', 'latest', { soft: true });
         yield (0, workspace_utilities_1.AddPackageJsonDependency)(tree, '@rxap/mixin', 'latest', { soft: true });
         yield (0, workspace_utilities_1.AddPackageJsonDependency)(tree, '@rxap/reflect-metadata', 'latest', { soft: true });
+        yield (0, workspace_utilities_1.AddPackageJsonDevDependency)(tree, '@rxap/browser-tailwind', 'latest', { soft: true, withoutNonRxapPeerDependencies: false });
         const angularVersion = '~16.2.0';
         // must always be added as some rxap components use the i18n tag
         yield (0, workspace_utilities_1.AddPackageJsonDependency)(tree, '@angular/localize', angularVersion, { soft: true });
@@ -803,7 +808,7 @@ function initApplicationGenerator(tree, options) {
         if (!tree.exists('shared/angular/assets/custom.svg')) {
             tree.write('shared/angular/assets/custom.svg', '<svg></svg>');
         }
-        if (options.i18n) {
+        if (options.i18n && !options.skipDocker) {
             let dockerfileContent = tree.read('shared/angular/Dockerfile', 'utf-8');
             dockerfileContent = dockerfileContent.replace('registry.gitlab.com/rxap/docker/nginx:', 'registry.gitlab.com/rxap/docker/i18n-nginx:');
             tree.write('shared/angular/Dockerfile', dockerfileContent);
@@ -831,14 +836,14 @@ function initApplicationGenerator(tree, options) {
                 console.log(`init angular application project: ${projectName}`);
                 const sourceRoot = (0, workspace_utilities_1.GetProjectSourceRoot)(tree, projectName);
                 (0, plugin_application_1.ApplicationInitProject)(tree, projectName, project, options);
-                if (options.overwrite) {
-                    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files', 'root'), sourceRoot, Object.assign(Object.assign({}, options), { relativePathToWorkspaceRoot: (0, path_1.relative)(sourceRoot, ''), name: projectName.replace(/^user-interface-/, ''), classify: utilities_1.classify, prefix: (0, workspace_utilities_1.GetProjectPrefix)(tree, projectName, 'rxap') }));
+                if (options.overwrite || !((_c = tree.read((0, path_1.join)(sourceRoot, 'styles.scss'), 'utf-8')) === null || _c === void 0 ? void 0 : _c.match(/@use ".+\/shared\/angular\/styles";/))) {
+                    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files', 'root'), sourceRoot, Object.assign(Object.assign({ serviceWorker: false }, options), { relativePathToWorkspaceRoot: (0, path_1.relative)(sourceRoot, ''), name: projectName.replace(/^user-interface-/, ''), classify: utilities_1.classify, prefix: (0, workspace_utilities_1.GetProjectPrefix)(tree, projectName, 'rxap') }));
                 }
                 updateProjectTargets(project, options);
                 updateTags(project, options);
                 updateGitIgnore(project, tree, options);
                 updateTsConfig(tree, projectName);
-                if (options.cleanup) {
+                if (options.cleanup || options.coerce) {
                     cleanup(tree, projectName, options);
                 }
                 coerceEnvironmentFiles(tree, Object.assign(Object.assign({}, options), { project: projectName }));
@@ -992,6 +997,7 @@ function initApplicationGenerator(tree, options) {
                     target: (0, path_1.join)(sourceRoot, 'assets'),
                     overwrite: options.overwrite,
                 });
+                (0, coerce_test_setup_1.coerceTestSetup)(tree, projectName);
                 // apply changes to the project configuration
                 (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
             }
@@ -999,7 +1005,10 @@ function initApplicationGenerator(tree, options) {
         if (options.localazy) {
             yield (0, plugin_localazy_1.LocalazyGitlabCiGenerator)(tree, {});
         }
-        yield (0, plugin_docker_1.DockerGitlabCiGenerator)(tree, {});
+        (0, plugin_gitlab_ci_1.GenerateGitlabCi)(tree, {});
+        if (!options.skipFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
     });
 }
 exports.initApplicationGenerator = initApplicationGenerator;