fix(ci,cdk,deps): nx tools refactoring (#9391)

SAP · Feb 21, 2023 · a8fd419 · a8fd419
1 parent 31f3032
commit a8fd419
Show file tree

Hide file tree

Showing 266 changed files with 2,446 additions and 1,714 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -258,8 +258,16 @@
         {
             "files": ["*.html"],
             "rules": {}
+        },
+        {
+            "files": ["*.json"],
+            "extends": "plugin:json/recommended"
+        },
+        {
+            "files": ["*.md"],
+            "extends": "plugin:markdown/recommended"
         }
     ],
-    "plugins": ["@nrwl/nx"],
+    "plugins": ["@nrwl/nx", "json", "markdown"],
     "root": true
 }
diff --git a/.github/workflows/on-pull-request.yml b/.github/workflows/on-pull-request.yml
@@ -67,9 +67,9 @@ jobs:
               with:
                   parallel-commands: |
                       npx nx affected --target=build --base=origin/${{ github.event.pull_request.base.ref }} --head=HEAD --exclude=docs --parallel=3
-                      npx nx affected --target=test --base=origin/${{ github.event.pull_request.base.ref }} --head=HEAD --exclude=workspace-tools --parallel=3
+                      npx nx affected --target=test --base=origin/${{ github.event.pull_request.base.ref }} --head=HEAD --exclude=nx-plugin --parallel=3
                       npx nx affected --target=lint --base=origin/${{ github.event.pull_request.base.ref }} --head=HEAD --exclude=core,platform,fn,cx --parallel=3
-                      npx nx run workspace-tools:test --skip-nx-cache
+                      npx nx run nx-plugin:test --skip-nx-cache
             - name: Format Check
               run: npx nx format:check --base=origin/${{ github.event.pull_request.base.ref }} --head=HEAD
               env:

diff --git a/.github/workflows/on-schedule.yml b/.github/workflows/on-schedule.yml
@@ -3,8 +3,8 @@ name: scheduled-daily-build
 on:
     workflow_dispatch:
     # schedule:
-        # Cron time is UTC, set to run at 22:00UTC (01:00 EST)
-        # - cron: '0 22 * * *'
+    # Cron time is UTC, set to run at 22:00UTC (01:00 EST)
+    # - cron: '0 22 * * *'
 
 env:
     NX_CLOUD_DISTRIBUTED_EXECUTION: true
@@ -72,9 +72,9 @@ jobs:
               with:
                   parallel-commands: |
                       npx nx run-many --target=build --exclude=docs --parallel=3
-                      npx nx run-many --target=test --exclude=workspace-tools --parallel=3
+                      npx nx run-many --target=test --exclude=nx-plugin --parallel=3
                       npx nx run-many --target=lint --exclude=core,platform,fn --parallel=3
-                      npx nx run-many workspace-tools:test --skip-nx-cache
+                      npx nx run-many nx-plugin:test --skip-nx-cache
     e2e_test:
         needs: initialize_cloud
         runs-on: ubuntu-latest

diff --git a/angular.json b/angular.json
@@ -319,6 +319,7 @@
         "fn-utils": "libs/fn/src/lib/utils",
         "i18n": "libs/i18n",
         "moment-adapter": "libs/moment-adapter",
+        "nx-plugin": "libs/nx-plugin",
         "platform": "libs/platform/src/lib",
         "platform-action-bar": "libs/platform/src/lib/action-bar",
         "platform-action-button-group": "libs/platform/src/lib/action-button-group",
@@ -349,8 +350,6 @@
         "platform-upload-collection": "libs/platform/src/lib/upload-collection",
         "platform-value-help-dialog": "libs/platform/src/lib/value-help-dialog",
         "platform-variant-management": "libs/platform/src/lib/variant-management",
-        "platform-wizard-generator": "libs/platform/src/lib/wizard-generator",
-        "plugins-wdio": "libs/plugins/wdio",
-        "workspace-tools": "tools"
+        "platform-wizard-generator": "libs/platform/src/lib/wizard-generator"
     }
 }
diff --git a/apps/docs/project.json b/apps/docs/project.json
@@ -10,7 +10,7 @@
     },
     "targets": {
         "e2e-app": {
-            "executor": "@fundamental-ngx/wdio:e2e-test-app",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test-app",
             "configurations": {
                 "affected-local": {
                     "affected": true,

diff --git a/jest.config.ts b/jest.config.ts
@@ -0,0 +1,5 @@
+import { getJestProjects } from '@nrwl/jest';
+
+export default {
+    projects: getJestProjects()
+};
diff --git a/jest.preset.js b/jest.preset.js
@@ -0,0 +1,3 @@
+const nxPreset = require('@nrwl/jest/preset').default;
+
+module.exports = { ...nxPreset };
diff --git a/libs/cdk/src/lib/project.json b/libs/cdk/src/lib/project.json
@@ -6,13 +6,13 @@
     "buildTarget": "build-umbrella",
     "targets": {
         "prepare": {
-            "executor": "@fundamental-ngx/workspace-tools:prepare",
+            "executor": "@fundamental-ngx/nx-plugin:prepare-library",
             "options": {
                 "distPath": "dist/libs/cdk"
             }
         },
         "compile-typedoc": {
-            "executor": "@fundamental-ngx/workspace-tools:compile-typedoc",
+            "executor": "@fundamental-ngx/nx-plugin:compile-typedoc",
             "options": {
                 "outputPath": "libs/docs/typedoc/cdk"
             },

diff --git a/libs/core/src/lib/project.json b/libs/core/src/lib/project.json
@@ -6,7 +6,7 @@
     "buildTarget": "build-umbrella",
     "targets": {
         "prepare": {
-            "executor": "@fundamental-ngx/workspace-tools:prepare",
+            "executor": "@fundamental-ngx/nx-plugin:prepare-library",
             "options": {
                 "schematics": {
                     "collection": "../../schematics",
@@ -16,7 +16,7 @@
             }
         },
         "compile-typedoc": {
-            "executor": "@fundamental-ngx/workspace-tools:compile-typedoc",
+            "executor": "@fundamental-ngx/nx-plugin:compile-typedoc",
             "options": {
                 "outputPath": "libs/docs/typedoc/core"
             },

diff --git a/libs/cx/src/lib/project.json b/libs/cx/src/lib/project.json
@@ -6,13 +6,13 @@
     "buildTarget": "build-umbrella",
     "targets": {
         "prepare": {
-            "executor": "@fundamental-ngx/workspace-tools:prepare",
+            "executor": "@fundamental-ngx/nx-plugin:prepare-library",
             "options": {
                 "distPath": "dist/libs/cx"
             }
         },
         "compile-typedoc": {
-            "executor": "@fundamental-ngx/workspace-tools:compile-typedoc",
+            "executor": "@fundamental-ngx/nx-plugin:compile-typedoc",
             "options": {
                 "outputPath": "libs/docs/typedoc/cx"
             },

diff --git a/libs/datetime-adapter/project.json b/libs/datetime-adapter/project.json
@@ -5,13 +5,13 @@
     "prefix": "fundamental-ngx",
     "targets": {
         "prepare": {
-            "executor": "@fundamental-ngx/workspace-tools:prepare",
+            "executor": "@fundamental-ngx/nx-plugin:prepare-library",
             "options": {
                 "distPath": "dist/libs/datetime-adapter"
             }
         },
         "compile-typedoc": {
-            "executor": "@fundamental-ngx/workspace-tools:compile-typedoc",
+            "executor": "@fundamental-ngx/nx-plugin:compile-typedoc",
             "options": {
                 "outputPath": "libs/docs/typedoc/datetime-adapter"
             },

diff --git a/libs/docs/cdk/clicked/project.json b/libs/docs/cdk/clicked/project.json
@@ -5,7 +5,7 @@
     "prefix": "fdp-doc",
     "targets": {
         "e2e": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eFiles": ["libs/docs/cdk/clicked/e2e/**/*.e2e-spec.ts"],
                 "devServerTarget": "docs:serve:e2e"

diff --git a/libs/docs/cdk/data-source/project.json b/libs/docs/cdk/data-source/project.json
@@ -5,7 +5,7 @@
     "prefix": "fdp-doc",
     "targets": {
         "e2e": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eFiles": ["libs/docs/cdk/data-source/e2e/**/*.e2e-spec.ts"],
                 "devServerTarget": "docs:serve:e2e"

diff --git a/libs/docs/cdk/disabled/project.json b/libs/docs/cdk/disabled/project.json
@@ -5,7 +5,7 @@
     "prefix": "fdp-doc",
     "targets": {
         "e2e-noop": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eTsConfig": "libs/docs/cdk/disabled/e2e/tsconfig.json",
                 "baseUrl": "http://localhost:4200",

diff --git a/libs/docs/cdk/focusable-grid/project.json b/libs/docs/cdk/focusable-grid/project.json
@@ -5,7 +5,7 @@
     "prefix": "fdp-doc",
     "targets": {
         "e2e-noop": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eTsConfig": "libs/docs/fn/focusable-grid/e2e/tsconfig.json",
                 "baseUrl": "http://localhost:4200",

diff --git a/libs/docs/cdk/focusable-item/project.json b/libs/docs/cdk/focusable-item/project.json
@@ -1,10 +1,11 @@
 {
+    "name": "docs-cdk-focusable-item",
     "sourceRoot": "libs/docs/cdk/focusable-item",
     "projectType": "library",
     "prefix": "fdp-doc",
     "targets": {
         "e2e": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eFiles": ["libs/docs/cdk/focusable-item/e2e/**/*.e2e-spec.ts"],
                 "devServerTarget": "docs:serve:e2e"

diff --git a/libs/docs/cdk/focusable-list/project.json b/libs/docs/cdk/focusable-list/project.json
@@ -1,11 +1,11 @@
 {
-    "name": "docs-fn-focusable-list",
+    "name": "docs-cdk-focusable-list",
     "sourceRoot": "libs/docs/fn/focusable-list",
     "projectType": "library",
     "prefix": "fdp-doc",
     "targets": {
         "e2e-noop": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eTsConfig": "libs/docs/fn/focusable-list/e2e/tsconfig.json",
                 "baseUrl": "http://localhost:4200",

diff --git a/libs/docs/cdk/forms/project.json b/libs/docs/cdk/forms/project.json
@@ -5,7 +5,7 @@
     "prefix": "fdp-doc",
     "targets": {
         "e2e": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eFiles": ["libs/docs/cdk/forms/e2e/**/*.e2e-spec.ts"],
                 "devServerTarget": "docs:serve:e2e"

diff --git a/libs/docs/cdk/initial-focus/project.json b/libs/docs/cdk/initial-focus/project.json
@@ -5,7 +5,7 @@
     "prefix": "fdk-initial-focus",
     "targets": {
         "e2e": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eFiles": ["libs/docs/cdk/initial-focus/e2e/**/*.e2e-spec.ts"],
                 "devServerTarget": "docs:serve:e2e"

diff --git a/libs/docs/cdk/selectable-list/project.json b/libs/docs/cdk/selectable-list/project.json
@@ -1,11 +1,11 @@
 {
-    "name": "docs-fn-selectable-list",
+    "name": "docs-cdk-selectable-list",
     "sourceRoot": "libs/docs/fn/selectable-list",
     "projectType": "library",
     "prefix": "fdp-doc",
     "targets": {
         "e2e-noop": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eTsConfig": "libs/docs/fn/selectable-list/e2e/tsconfig.json",
                 "baseUrl": "http://localhost:4200",

diff --git a/libs/docs/cdk/tabbable/project.json b/libs/docs/cdk/tabbable/project.json
@@ -5,7 +5,7 @@
     "prefix": "fdp-doc",
     "targets": {
         "e2e": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eFiles": ["libs/docs/cdk/tabbable/e2e/**/*.e2e-spec.ts"],
                 "devServerTarget": "docs:serve:e2e"

diff --git a/libs/docs/core/action-bar/project.json b/libs/docs/core/action-bar/project.json
@@ -5,7 +5,7 @@
     "prefix": "fundamental-ngx",
     "targets": {
         "e2e": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eFiles": ["libs/docs/core/action-bar/e2e/**/*.e2e-spec.ts"],
                 "devServerTarget": "docs:serve:e2e"

diff --git a/libs/docs/core/action-sheet/project.json b/libs/docs/core/action-sheet/project.json
@@ -5,7 +5,7 @@
     "prefix": "fundamental-ngx",
     "targets": {
         "e2e": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eFiles": ["libs/docs/core/action-sheet/e2e/**/*.e2e-spec.ts"],
                 "devServerTarget": "docs:serve:e2e"

diff --git a/libs/docs/core/alert/project.json b/libs/docs/core/alert/project.json
@@ -5,7 +5,7 @@
     "prefix": "fundamental-ngx",
     "targets": {
         "e2e": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eFiles": ["libs/docs/core/alert/e2e/**/*.e2e-spec.ts"],
                 "devServerTarget": "docs:serve:e2e"

diff --git a/libs/docs/core/avatar-group/project.json b/libs/docs/core/avatar-group/project.json
@@ -5,7 +5,7 @@
     "prefix": "fundamental-ngx",
     "targets": {
         "e2e": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eFiles": ["libs/docs/core/avatar-group/e2e/**/*.e2e-spec.ts"],
                 "devServerTarget": "docs:serve:e2e"

diff --git a/libs/docs/core/avatar/project.json b/libs/docs/core/avatar/project.json
@@ -5,7 +5,7 @@
     "prefix": "fundamental-ngx",
     "targets": {
         "e2e": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eFiles": ["libs/docs/core/avatar/e2e/**/*.e2e-spec.ts"],
                 "devServerTarget": "docs:serve:e2e"

diff --git a/libs/docs/core/bar/project.json b/libs/docs/core/bar/project.json
@@ -5,7 +5,7 @@
     "prefix": "fundamental-ngx",
     "targets": {
         "e2e": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eFiles": ["libs/docs/core/bar/e2e/**/*.e2e-spec.ts"],
                 "devServerTarget": "docs:serve:e2e"

diff --git a/libs/docs/core/breadcrumb/project.json b/libs/docs/core/breadcrumb/project.json
@@ -5,7 +5,7 @@
     "prefix": "fundamental-ngx",
     "targets": {
         "e2e": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eFiles": ["libs/docs/core/breadcrumb/e2e/**/*.e2e-spec.ts"],
                 "devServerTarget": "docs:serve:e2e"

diff --git a/libs/docs/core/busy-indicator/project.json b/libs/docs/core/busy-indicator/project.json
@@ -5,7 +5,7 @@
     "prefix": "fundamental-ngx",
     "targets": {
         "e2e": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eFiles": ["libs/docs/core/busy-indicator/e2e/**/*.e2e-spec.ts"],
                 "devServerTarget": "docs:serve:e2e"

diff --git a/libs/docs/core/button/project.json b/libs/docs/core/button/project.json
@@ -5,7 +5,7 @@
     "prefix": "fundamental-ngx",
     "targets": {
         "e2e": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eFiles": ["libs/docs/core/button/e2e/**/*.e2e-spec.ts"],
                 "devServerTarget": "docs:serve:e2e"

diff --git a/libs/docs/core/calendar/project.json b/libs/docs/core/calendar/project.json
@@ -5,7 +5,7 @@
     "prefix": "fundamental-ngx",
     "targets": {
         "e2e": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eFiles": ["libs/docs/core/calendar/e2e/**/*.e2e-spec.ts"],
                 "devServerTarget": "docs:serve:e2e"

diff --git a/libs/docs/core/card/project.json b/libs/docs/core/card/project.json
@@ -5,7 +5,7 @@
     "prefix": "fundamental-ngx",
     "targets": {
         "e2e": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eFiles": ["libs/docs/core/card/e2e/**/*.e2e-spec.ts"],
                 "devServerTarget": "docs:serve:e2e"

diff --git a/libs/docs/core/carousel/project.json b/libs/docs/core/carousel/project.json
@@ -5,7 +5,7 @@
     "prefix": "fundamental-ngx",
     "targets": {
         "e2e": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eFiles": ["libs/docs/core/carousel/e2e/**/*.e2e-spec.ts"],
                 "devServerTarget": "docs:serve:e2e"

diff --git a/libs/docs/core/checkbox/project.json b/libs/docs/core/checkbox/project.json
@@ -5,7 +5,7 @@
     "prefix": "fundamental-ngx",
     "targets": {
         "e2e": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eFiles": ["libs/docs/core/checkbox/e2e/**/*.e2e-spec.ts"],
                 "devServerTarget": "docs:serve:e2e"

diff --git a/libs/docs/core/combobox/project.json b/libs/docs/core/combobox/project.json
@@ -5,7 +5,7 @@
     "prefix": "fundamental-ngx",
     "targets": {
         "e2e": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eFiles": ["libs/docs/core/combobox/e2e/**/*.e2e-spec.ts"],
                 "devServerTarget": "docs:serve:e2e"

diff --git a/libs/docs/core/content-density/project.json b/libs/docs/core/content-density/project.json
@@ -5,7 +5,7 @@
     "prefix": "fundamental-ngx",
     "targets": {
         "e2e": {
-            "executor": "@fundamental-ngx/wdio:e2e-test",
+            "executor": "@fundamental-ngx/nx-plugin:e2e-test",
             "options": {
                 "e2eFiles": ["libs/docs/core/content-density/e2e/**/*.e2e-spec.ts"],
                 "devServerTarget": "docs:serve:e2e"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		const nxPreset = require('@nrwl/jest/preset').default;

		module.exports = { ...nxPreset };