@rxap/plugin-angular 16.1.0-dev.9 → 16.1.1-dev.0

package/package.json

@@ -1,87 +1,101 @@
 {
+  "version": "16.1.1-dev.0",
   "name": "@rxap/plugin-angular",
-  "version": "16.1.0-dev.9",
-  "type": "commonjs",
-  "generators": "./generators.json",
-  "publishConfig": {
-    "access": "public",
-    "directory": "../../../dist/packages/plugin/angular"
-  },
-  "keywords": [
-    "rxap",
-    "plugin",
-    "nx",
-    "nx-plugin",
-    "packages",
-    "angular"
-  ],
-  "homepage": "https:/gitlab.com/rxap/packages/packages/plugin/angular",
-  "bugs": {
-    "url": "https://gitlab.com/rxap/packages/-/issues",
-    "email": "incoming+rxap-packages-14898188-issue-@incoming.gitlab.com"
-  },
   "license": "GPL-3.0-or-later",
-  "repository": {
-    "type": "git",
-    "url": "https://gitlab.com/rxap/packages.git",
-    "directory": "packages/plugin/angular"
-  },
-  "author": {
-    "name": "Merzough Münker",
-    "email": "mmuenker@digitaix.com"
-  },
   "dependencies": {
-    "ignore": "^5.2.4",
+    "ignore": "5.2.4",
     "process": "0.11.10",
     "semver": "^7.3.5",
-    "tslib": "2.6.1",
+    "tslib": "2.6.2",
     "yaml": "2.3.1"
   },
   "peerDependencies": {
+    "@nx/angular": "^16.5.0",
     "@nx/devkit": "^16.5.0",
-    "@rxap/generator-utilities": "^1.1.0-dev.4",
-    "@rxap/plugin-localazy": "^16.1.0-dev.3",
-    "@rxap/plugin-utilities": "^16.1.0-dev.6",
-    "@rxap/schematics-ts-morph": "^16.0.0-dev.9",
-    "@rxap/workspace-ts-morph": "^0.1.0-dev.0",
-    "@rxap/workspace-utilities": "^0.1.0-dev.3",
+    "@rxap/generator-utilities": "^1.1.0",
+    "@rxap/plugin-localazy": "^16.1.0",
+    "@rxap/plugin-utilities": "^16.1.0",
+    "@rxap/ts-morph": "^1.0.1",
+    "@rxap/utilities": "^16.0.0",
+    "@rxap/workspace-ts-morph": "^16.0.1",
+    "@rxap/workspace-utilities": "^16.0.1",
     "nx": "^16.5.0",
     "ts-morph": "^18.0.0",
-    "@rxap/node-utilities": "1.1.0-dev.1",
-    "@rxap/schematics-utilities": "16.0.0-dev.7",
-    "@rxap/utilities": "16.0.0-dev.9"
+    "tslib": "2.6.2",
+    "@rxap/node-utilities": "1.1.0"
+  },
+  "author": {
+    "name": "Merzough Münker",
+    "email": "mmuenker@digitaix.com"
   },
+  "bugs": {
+    "url": "https://gitlab.com/rxap/packages/-/issues",
+    "email": "incoming+rxap-packages-14898188-issue-@incoming.gitlab.com"
+  },
+  "executors": "./executors.json",
+  "generators": "./generators.json",
+  "homepage": "https:/gitlab.com/rxap/packages/packages/plugin/angular",
+  "keywords": [
+    "angular",
+    "nx",
+    "nx-plugin",
+    "packages",
+    "plugin",
+    "plugin-angular",
+    "rxap"
+  ],
   "nx-migrations": {
     "packageGroup": [
       {
         "package": "@rxap/generator-utilities",
-        "version": "1.1.0-dev.4"
+        "version": "1.1.0"
+      },
+      {
+        "package": "@rxap/node-utilities",
+        "version": "1.1.0-dev.9"
       },
       {
         "package": "@rxap/plugin-localazy",
-        "version": "16.1.0-dev.3"
+        "version": "16.1.0"
       },
       {
         "package": "@rxap/plugin-utilities",
-        "version": "16.1.0-dev.6"
+        "version": "16.1.0"
       },
       {
         "package": "@rxap/schematics-ts-morph",
-        "version": "16.0.0-dev.9"
+        "version": "16.0.0-dev.12"
+      },
+      {
+        "package": "@rxap/ts-morph",
+        "version": "1.0.1"
+      },
+      {
+        "package": "@rxap/utilities",
+        "version": "16.0.0"
       },
       {
         "package": "@rxap/workspace-ts-morph",
-        "version": "0.1.0-dev.0"
+        "version": "16.0.1"
       },
       {
         "package": "@rxap/workspace-utilities",
-        "version": "0.1.0-dev.3"
+        "version": "16.0.1"
       }
     ]
   },
-  "executors": "./executors.json",
+  "publishConfig": {
+    "access": "public",
+    "directory": "../../../dist/packages/plugin/angular"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitlab.com/rxap/packages.git",
+    "directory": "packages/plugin/angular"
+  },
   "schematics": "./generators.json",
-  "gitHead": "ce712a92347389b07f22278dbecc0d0ddac0a73f",
+  "type": "commonjs",
+  "gitHead": "8f77d392776e5d09847a916b6ec2be509d678770",
   "main": "./src/index.js",
   "types": "./src/index.d.ts"
 }

package/src/generators/init/generator.js

@@ -4,6 +4,8 @@ exports.initGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const generator_utilities_1 = require("@rxap/generator-utilities");
+const workspace_utilities_1 = require("@rxap/workspace-utilities");
+const coerce_cypress_component_testing_1 = require("../../lib/coerce-cypress-component-testing");
 const skip_project_1 = require("../../lib/skip-project");
 const generator_1 = require("../init-application/generator");
 const generator_2 = require("../init-library/generator");
@@ -20,15 +22,20 @@ function initGenerator(tree, options) {
             if (skipProject(tree, options, project, projectName)) {
                 continue;
             }
-            console.log(`init project: ${projectName}`);
-            if ((0, generator_utilities_1.HasComponents)(tree, project.root)) {
-                yield (0, generator_utilities_1.CoerceCypressComponentTesting)(tree, project, projectName);
+            if ((0, workspace_utilities_1.IsLibraryProject)(project)) {
+                yield (0, generator_2.default)(tree, Object.assign(Object.assign({}, options), { projects: [projectName], skipProjects: options.skipProjects }));
             }
-            if (project.projectType === 'library') {
-                yield (0, generator_2.default)(tree, Object.assign(Object.assign({}, options), { projects: [projectName] }));
+            if ((0, workspace_utilities_1.IsApplicationProject)(project)) {
+                yield (0, generator_1.default)(tree, Object.assign(Object.assign({}, options), { projects: [projectName], skipProjects: options.skipProjects }));
             }
-            if (project.projectType === 'application') {
-                yield (0, generator_1.default)(tree, Object.assign(Object.assign({}, options), { projects: [projectName] }));
+            if (!options.skipProjects) {
+                console.log(`init project: ${projectName}`);
+                // execute the add cypress if the project has components after the library/application init
+                // as the library init will remove the default components so that cypress is only added
+                // if the project has really any components
+                if ((0, generator_utilities_1.HasComponents)(tree, project.root)) {
+                    yield (0, coerce_cypress_component_testing_1.CoerceCypressComponentTesting)(tree, project, projectName);
+                }
             }
         }
     });

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":";;;;AAAA,uCAIoB;AACpB,mEAGmC;AACnC,yDAA+D;AAC/D,6DAAqE;AACrE,yDAA6D;AAG7D,SAAS,WAAW,CAAC,IAAU,EAAE,OAA4B,EAAE,OAA6B,EAAE,WAAmB;IAE/G,IAAI,IAAA,oCAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAC9D,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAsB,aAAa,CAAC,IAAU,EAAE,OAA4B;;QAC1E,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;QAEhD,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;gBACpD,SAAS;aACV;YAED,OAAO,CAAC,GAAG,CAAC,iBAAkB,WAAY,EAAE,CAAC,CAAC;YAE9C,IAAI,IAAA,mCAAa,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE;gBACrC,MAAM,IAAA,mDAA6B,EAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;aACjE;YAED,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE;gBACrC,MAAM,IAAA,mBAAoB,EAAC,IAAI,kCAAO,OAAO,KAAE,QAAQ,EAAE,CAAE,WAAW,CAAE,IAAG,CAAC;aAC7E;YAED,IAAI,OAAO,CAAC,WAAW,KAAK,aAAa,EAAE;gBACzC,MAAM,IAAA,mBAAwB,EAAC,IAAI,kCAAO,OAAO,KAAE,QAAQ,EAAE,CAAE,WAAW,CAAE,IAAG,CAAC;aACjF;SAEF;IAEH,CAAC;CAAA;AAzBD,sCAyBC;AAED,kBAAe,aAAa,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAIoB;AACpB,mEAA0D;AAC1D,mEAGmC;AACnC,iGAA2F;AAC3F,yDAA+D;AAC/D,6DAAqE;AACrE,yDAA6D;AAG7D,SAAS,WAAW,CAAC,IAAU,EAAE,OAA4B,EAAE,OAA6B,EAAE,WAAmB;IAE/G,IAAI,IAAA,oCAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAC9D,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAsB,aAAa,CAAC,IAAU,EAAE,OAA4B;;QAC1E,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;QAEhD,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;gBACpD,SAAS;aACV;YAED,IAAI,IAAA,sCAAgB,EAAC,OAAO,CAAC,EAAE;gBAC7B,MAAM,IAAA,mBAAoB,EAAC,IAAI,kCAExB,OAAO,KACV,QAAQ,EAAE,CAAE,WAAW,CAAE,EACzB,YAAY,EAAE,OAAO,CAAC,YAAY,IAErC,CAAC;aACH;YAED,IAAI,IAAA,0CAAoB,EAAC,OAAO,CAAC,EAAE;gBACjC,MAAM,IAAA,mBAAwB,EAAC,IAAI,kCAE5B,OAAO,KACV,QAAQ,EAAE,CAAE,WAAW,CAAE,EACzB,YAAY,EAAE,OAAO,CAAC,YAAY,IAErC,CAAC;aACH;YAED,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;gBAEzB,OAAO,CAAC,GAAG,CAAC,iBAAkB,WAAY,EAAE,CAAC,CAAC;gBAE9C,2FAA2F;gBAC3F,uFAAuF;gBACvF,2CAA2C;gBAC3C,IAAI,IAAA,mCAAa,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE;oBACrC,MAAM,IAAA,gEAA6B,EAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;iBACjE;aAEF;SAEF;IAEH,CAAC;CAAA;AA5CD,sCA4CC;AAED,kBAAe,aAAa,CAAC"}

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

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

package/src/generators/init/schema.json

@@ -10,6 +10,16 @@
       "items": {
         "type": "string"
       }
+    },
+    "overwrite": {
+      "type": "boolean",
+      "default": false,
+      "description": "Whether to overwrite existing files"
+    },
+    "skipProjects": {
+      "type": "boolean",
+      "default": false,
+      "description": "Whether to skip executing project specific initialization"
     }
   },
   "required": []

package/src/generators/init-application/files/app/app.navigation.ts.template

@@ -0,0 +1,11 @@
+import {
+  NavigationWithInserts,
+  RXAP_NAVIGATION_CONFIG,
+} from '@rxap/layout';
+
+export const APP_NAVIGATION: () => NavigationWithInserts = () => [];
+
+export const APP_NAVIGATION_PROVIDER = {
+  provide: RXAP_NAVIGATION_CONFIG,
+  useValue: APP_NAVIGATION,
+};

package/src/generators/init-application/files/app/app.routes.ts.template

@@ -0,0 +1,14 @@
+import { Route } from '@angular/router';
+import { STATUS_CHECK_ROUTE } from '@rxap/ngx-status-check';
+
+export const appRoutes: Route[] = [
+  STATUS_CHECK_ROUTE,
+  {
+    path: '',
+    loadChildren: () => import('./layout.routes')
+  },
+  {
+    path: '**',
+    redirectTo: '',
+  },
+];

package/src/generators/init-application/files/app/layout.routes.ts.template

@@ -0,0 +1,33 @@
+import { provideAnimations } from '@angular/platform-browser/animations';
+import { Route } from '@angular/router';
+import {
+  LayoutComponent,
+  NavigationService,
+} from '@rxap/layout';
+import { StatusCheckGuard } from '@rxap/ngx-status-check';
+import { APP_NAVIGATION_PROVIDER } from './app.navigation';
+
+const ROUTES: Route[] = [
+  {
+    path: '',
+    component: LayoutComponent,
+    canActivateChild: [ StatusCheckGuard ],
+    children: [
+      {
+        path: '**',
+        redirectTo: '',
+      },
+    ],
+    providers: [
+      provideAnimations(),
+      APP_NAVIGATION_PROVIDER,
+      NavigationService,
+    ]
+  },
+  {
+    path: '**',
+    redirectTo: '',
+  },
+];
+
+export default ROUTES;

package/src/generators/init-application/files/assets/icons/create-pwa-icons.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+SIZES=("57x57" "60x60" "72x72" "76x76" "96x96" "114x114" "120x120" "128x128" "144x144" "152x152" "180x180" "192x192" "384x384" "512x512" "32x32" "96x96" "16x16")
+
+for size in "${SIZES[@]}"
+do
+   convert -resize "${size}" icon.png "icon-${size}.png"
+done
+
+optipng -o 7 icon-*
+optipng -o 7 icon.png

package/src/generators/init-application/files/assets/icons/icon.svg

@@ -0,0 +1,43 @@
+<svg height="522" viewBox="0 0 522 522" width="522" xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <style>.a {
+            fill: #73be90;
+        }
+
+        .b {
+            fill: #61d596;
+        }
+
+        .c {
+            fill: #e8a646;
+        }
+
+        .d {
+            fill: #01149f;
+        }
+
+        .e {
+            fill: #d3244d;
+        }
+
+        </style>
+    </defs>
+    <!-- -23.929 -23.35 -->
+    <g class="container" transform="translate(116 116)">
+        <g id="top-left" transform="translate(0 0)">
+            <path class="a" d="M0,38.975,145.245,184.22l42.782-42.783L42.782-3.808Z" transform="translate(0 3.808)"/>
+        </g>
+        <g id="bottom-right" transform="translate(102 102)">
+            <path class="b" d="M0,38.975,145.245,184.22l42.782-42.783L42.782-3.808Z" transform="translate(0 3.808)"/>
+        </g>
+        <g id="top-right" transform="translate(145 0)">
+            <path class="c" d="M93.342,0-9.12,102.462l42.782,42.783L136.125,42.783Z" transform="translate(9.12)"/>
+        </g>
+        <g id="center" transform="translate(102 102)">
+            <path class="d" d="M38.985,0-3.809,42.794,38.985,85.576,81.767,42.783Z" transform="translate(3.809)"/>
+        </g>
+        <g id="bottom-left" transform="translate(0 145)">
+            <path class="e" d="M93.342,0-9.12,102.462l42.782,42.783L136.125,42.783Z" transform="translate(9.12)"/>
+        </g>
+    </g>
+</svg>

package/src/generators/init-application/files/assets/logo.svg

@@ -0,0 +1,63 @@
+<svg height="332.179" viewBox="0 0 941.156 332.179" width="941.156" xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <style>.a, .d {
+            fill: #61d596;
+        }
+
+        .a, .b {
+            font-size: 69px;
+            letter-spacing: 0.235em;
+        }
+
+        .a {
+            font-family: Roboto-Medium, Roboto;
+            font-weight: 500;
+        }
+
+        .b, .f {
+            fill: #01149f;
+        }
+
+        .b {
+            font-family: Roboto-Regular, Roboto;
+        }
+
+        .c {
+            fill: #73be90;
+        }
+
+        .e {
+            fill: #e8a646;
+        }
+
+        .g {
+            fill: #d3244d;
+        }</style>
+    </defs>
+    <g transform="translate(-12.682 -13.102)">
+        <text class="a" transform="translate(413.838 112.096)">
+            <tspan x="0" y="0">REACTIVE</tspan>
+        </text>
+        <text class="b" transform="translate(413.838 193.854)">
+            <tspan x="0" y="0">APPLICAION</tspan>
+        </text>
+        <text class="b" transform="translate(413.838 277.519)">
+            <tspan x="0" y="0">PLATTFORM</tspan>
+        </text>
+        <g transform="translate(12.682 13.11)">
+            <path class="c" d="M0,45.113,166.084,211.2l48.921-48.921L48.921-3.808Z" transform="translate(0 3.808)"/>
+        </g>
+        <g transform="translate(129.847 130.275)">
+            <path class="d" d="M0,45.113,166.084,211.2l48.921-48.921L48.921-3.808Z" transform="translate(0 3.808)"/>
+        </g>
+        <g transform="translate(178.765 13.102)">
+            <path class="e" d="M108.043,0-9.12,117.164,39.8,166.085,156.964,48.921Z" transform="translate(9.12)"/>
+        </g>
+        <g transform="translate(129.835 130.268)">
+            <path class="f" d="M45.125,0-3.809,48.934,45.125,97.855,94.046,48.921Z" transform="translate(3.809)"/>
+        </g>
+        <g transform="translate(12.684 179.19)">
+            <path class="g" d="M108.043,0-9.12,117.164,39.8,166.085,156.964,48.921Z" transform="translate(9.12)"/>
+        </g>
+    </g>
+</svg>

package/src/generators/init-application/files/{shared → i18n}/i18n.index.html.hbs

@@ -31,7 +31,7 @@
 
   const redirectUrl = location.origin + '/' + redirectLanguage + pathname + (location.search ?? '');
 
-  alert('redirect to ' + redirectUrl);
+  console.log('redirect to ' + redirectUrl);
 
   location.replace(redirectUrl);
 

package/src/generators/init-application/files/monolithic/app/app.navigation.ts.template

@@ -0,0 +1,11 @@
+import {
+  NavigationWithInserts,
+  RXAP_NAVIGATION_CONFIG,
+} from '@rxap/layout';
+
+export const APP_NAVIGATION: () => NavigationWithInserts = () => [];
+
+export const APP_NAVIGATION_PROVIDER = {
+  provide: RXAP_NAVIGATION_CONFIG,
+  useValue: APP_NAVIGATION,
+};

package/src/generators/init-application/files/monolithic/app/app.routes.ts.template

@@ -0,0 +1,14 @@
+import { Route } from '@angular/router';
+import { STATUS_CHECK_ROUTE } from '@rxap/ngx-status-check';
+
+export const appRoutes: Route[] = [
+  STATUS_CHECK_ROUTE,
+  {
+    path: '',
+    loadChildren: () => import('./layout.routes')
+  },
+  {
+    path: '**',
+    redirectTo: '',
+  },
+];

package/src/generators/init-application/files/monolithic/app/layout.routes.ts.template

@@ -0,0 +1,32 @@
+import { provideAnimations } from '@angular/platform-browser/animations';
+import { Route } from '@angular/router';
+import {
+  LayoutComponent,
+  NavigationService,
+} from '@rxap/layout';
+import { StatusCheckGuard } from '@rxap/ngx-status-check';
+import { APP_NAVIGATION_PROVIDER } from './app.navigation';
+
+const ROUTES: Route[] = [
+  {
+    path: '',
+    component: LayoutComponent,
+    canActivateChild: [ StatusCheckGuard ],
+    children: [
+      {
+        path: '**',
+        redirectTo: '',
+      },
+    ],
+    providers: [
+      APP_NAVIGATION_PROVIDER,
+      NavigationService,
+    ]
+  },
+  {
+    path: '**',
+    redirectTo: '',
+  },
+];
+
+export default ROUTES;