@rxap/plugin-angular 16.1.0-dev.50 → 16.1.0-dev.51

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [16.1.0-dev.51](https://gitlab.com/rxap/packages/compare/@rxap/plugin-angular@16.1.0-dev.50...@rxap/plugin-angular@16.1.0-dev.51) (2023-10-11)
+
+### Bug Fixes
+
+- move angular specific function to plugin project ([3b47f49](https://gitlab.com/rxap/packages/commit/3b47f4959e61f53f426fdf4f36664c399125c0c8))
+
 # 16.1.0-dev.50 (2023-10-11)
 
 ### Bug Fixes

package/README.md

@@ -19,7 +19,7 @@ yarn add @rxap/plugin-angular
 ```
 **Install peer dependencies:**
 ```bash
-yarn add @nx/devkit@^16.5.0 @rxap/generator-utilities@^1.1.0-dev.17 @rxap/plugin-localazy@^16.1.0-dev.12 @rxap/plugin-utilities@^16.1.0-dev.18 @rxap/ts-morph@^0.1.0-dev.14 @rxap/utilities@^16.0.0-dev.21 @rxap/workspace-ts-morph@^0.1.0-dev.9 @rxap/workspace-utilities@^0.1.0-dev.21 nx@^16.5.0 ts-morph@^18.0.0 tslib@2.6.2 
+yarn add @nx/angular@^16.5.0 @nx/devkit@^16.5.0 @rxap/generator-utilities@^1.1.0-dev.19 @rxap/plugin-localazy@^16.1.0-dev.14 @rxap/plugin-utilities@^16.1.0-dev.19 @rxap/ts-morph@^0.1.0-dev.15 @rxap/utilities@^16.0.0-dev.21 @rxap/workspace-ts-morph@^0.1.0-dev.10 @rxap/workspace-utilities@^0.1.0-dev.22 nx@^16.5.0 ts-morph@^18.0.0 tslib@2.6.2 
 ```
 **Execute the init generator:**
 ```bash

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "16.1.0-dev.50",
+  "version": "16.1.0-dev.51",
   "name": "@rxap/plugin-angular",
   "license": "GPL-3.0-or-later",
   "dependencies": {
@@ -10,18 +10,19 @@
     "yaml": "2.3.1"
   },
   "peerDependencies": {
+    "@nx/angular": "^16.5.0",
     "@nx/devkit": "^16.5.0",
-    "@rxap/generator-utilities": "^1.1.0-dev.17",
-    "@rxap/plugin-localazy": "^16.1.0-dev.12",
-    "@rxap/plugin-utilities": "^16.1.0-dev.18",
-    "@rxap/ts-morph": "^0.1.0-dev.14",
+    "@rxap/generator-utilities": "^1.1.0-dev.19",
+    "@rxap/plugin-localazy": "^16.1.0-dev.14",
+    "@rxap/plugin-utilities": "^16.1.0-dev.19",
+    "@rxap/ts-morph": "^0.1.0-dev.15",
     "@rxap/utilities": "^16.0.0-dev.21",
-    "@rxap/workspace-ts-morph": "^0.1.0-dev.9",
-    "@rxap/workspace-utilities": "^0.1.0-dev.21",
+    "@rxap/workspace-ts-morph": "^0.1.0-dev.10",
+    "@rxap/workspace-utilities": "^0.1.0-dev.22",
     "nx": "^16.5.0",
     "ts-morph": "^18.0.0",
     "tslib": "2.6.2",
-    "@rxap/node-utilities": "1.1.0-dev.14"
+    "@rxap/node-utilities": "1.1.0-dev.13"
   },
   "author": {
     "name": "Merzough Münker",
@@ -47,7 +48,7 @@
     "packageGroup": [
       {
         "package": "@rxap/generator-utilities",
-        "version": "1.1.0-dev.17"
+        "version": "1.1.0-dev.19"
       },
       {
         "package": "@rxap/node-utilities",
@@ -55,11 +56,11 @@
       },
       {
         "package": "@rxap/plugin-localazy",
-        "version": "16.1.0-dev.12"
+        "version": "16.1.0-dev.14"
       },
       {
         "package": "@rxap/plugin-utilities",
-        "version": "16.1.0-dev.18"
+        "version": "16.1.0-dev.19"
       },
       {
         "package": "@rxap/schematics-ts-morph",
@@ -67,7 +68,7 @@
       },
       {
         "package": "@rxap/ts-morph",
-        "version": "0.1.0-dev.14"
+        "version": "0.1.0-dev.15"
       },
       {
         "package": "@rxap/utilities",
@@ -75,11 +76,11 @@
       },
       {
         "package": "@rxap/workspace-ts-morph",
-        "version": "0.1.0-dev.9"
+        "version": "0.1.0-dev.10"
       },
       {
         "package": "@rxap/workspace-utilities",
-        "version": "0.1.0-dev.21"
+        "version": "0.1.0-dev.22"
       }
     ]
   },
@@ -94,7 +95,7 @@
   },
   "schematics": "./generators.json",
   "type": "commonjs",
-  "gitHead": "cc79abe8b76799cf9e91a91b92e8172b23a74b13",
+  "gitHead": "de409c002556a30f6da4e97023bf380a7d058f20",
   "main": "./src/index.js",
   "types": "./src/index.d.ts"
 }

package/src/generators/init/generator.js

@@ -5,6 +5,7 @@ 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");
@@ -33,7 +34,7 @@ function initGenerator(tree, options) {
                 // 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, generator_utilities_1.CoerceCypressComponentTesting)(tree, project, projectName);
+                    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,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,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,mDAA6B,EAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;iBACjE;aAEF;SAEF;IAEH,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,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/lib/coerce-cypress-component-testing.d.ts

@@ -0,0 +1,2 @@
+import { ProjectConfiguration, Tree } from '@nx/devkit';
+export declare function CoerceCypressComponentTesting(tree: Tree, project: ProjectConfiguration, projectName: string): Promise<void>;

package/src/lib/coerce-cypress-component-testing.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CoerceCypressComponentTesting = void 0;
+const tslib_1 = require("tslib");
+const generators_1 = require("@nx/angular/generators");
+const devkit_1 = require("@nx/devkit");
+const workspace_utilities_1 = require("@rxap/workspace-utilities");
+const path_1 = require("path");
+function determineCypressBuildTargetProject(tree, project, projectName) {
+    if ((0, workspace_utilities_1.IsApplicationProject)(project)) {
+        return projectName;
+    }
+    const projects = (0, devkit_1.getProjects)(tree);
+    const angularApplicationProjects = Array.from(projects.entries())
+        .filter(([, project]) => (0, workspace_utilities_1.IsApplicationProject)(project) && (0, workspace_utilities_1.IsAngularProject)(project));
+    const cypressProject = angularApplicationProjects.find(([projectName]) => projectName.endsWith('cypress'));
+    if (cypressProject) {
+        return cypressProject[0];
+    }
+    if (angularApplicationProjects.length) {
+        return angularApplicationProjects[0][0];
+    }
+    else {
+        throw new Error('No angular application project found. Can not determine the cypress build target project.');
+    }
+}
+function CoerceCypressComponentTesting(tree, project, projectName) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    var _h, _j;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        (_a = project.targets) !== null && _a !== void 0 ? _a : (project.targets = {});
+        if (!project.targets['component-test']) {
+            const buildTargetProjectName = determineCypressBuildTargetProject(tree, project, projectName);
+            yield (0, generators_1.cypressComponentConfiguration)(tree, {
+                project: projectName,
+                generateTests: true,
+                skipFormat: false,
+                buildTarget: `${buildTargetProjectName}:build:development`,
+            });
+            if (buildTargetProjectName !== projectName) {
+                const buildTargetProject = (0, devkit_1.readProjectConfiguration)(tree, buildTargetProjectName);
+                (_b = buildTargetProject.implicitDependencies) !== null && _b !== void 0 ? _b : (buildTargetProject.implicitDependencies = []);
+                if (!buildTargetProject.implicitDependencies.includes(projectName)) {
+                    buildTargetProject.implicitDependencies.push(projectName);
+                    (0, devkit_1.updateProjectConfiguration)(tree, buildTargetProjectName, buildTargetProject);
+                }
+            }
+            const _project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+            (_c = _project.targets) !== null && _c !== void 0 ? _c : (_project.targets = {});
+            (_d = (_h = _project.targets['component-test']).configurations) !== null && _d !== void 0 ? _d : (_h.configurations = {});
+            (_e = (_j = _project.targets['component-test'].configurations)['open']) !== null && _e !== void 0 ? _e : (_j['open'] = {});
+            _project.targets['component-test'].configurations['open'].watch = true;
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, _project);
+            if ((0, workspace_utilities_1.IsRxapRepository)(tree)) {
+                tree.write((0, path_1.join)(project.root, 'cypress.config.ts'), `import { componentTestingPreset } from 'workspace';
+import { defineConfig } from 'cypress';
+
+export default defineConfig({
+  component: componentTestingPreset(__filename),
+});`);
+            }
+        }
+        const _project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        (_f = _project.targets) !== null && _f !== void 0 ? _f : (_project.targets = {});
+        const cypressProjectName = _project.targets['component-test'].options.devServerTarget.split(':').shift();
+        if (cypressProjectName !== projectName) {
+            const cypressProject = (0, devkit_1.readProjectConfiguration)(tree, cypressProjectName);
+            (_g = cypressProject.implicitDependencies) !== null && _g !== void 0 ? _g : (cypressProject.implicitDependencies = []);
+            if (!cypressProject.implicitDependencies.includes(projectName)) {
+                cypressProject.implicitDependencies.push(projectName);
+                (0, devkit_1.updateProjectConfiguration)(tree, cypressProjectName, cypressProject);
+            }
+        }
+    });
+}
+exports.CoerceCypressComponentTesting = CoerceCypressComponentTesting;
+//# sourceMappingURL=coerce-cypress-component-testing.js.map

package/src/lib/coerce-cypress-component-testing.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"coerce-cypress-component-testing.js","sourceRoot":"","sources":["../../../../../../packages/plugin/angular/src/lib/coerce-cypress-component-testing.ts"],"names":[],"mappings":"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"}