feat: add support to nx 17 (#555)

bikecoders · Nov 9, 2023 · 367362b · 367362b
1 parent c7b0c5d
commit 367362b
Show file tree

Hide file tree

Showing 19 changed files with 552 additions and 396 deletions.
diff --git a/.github/actions/migrate/action.yml b/.github/actions/migrate/action.yml
@@ -11,6 +11,6 @@ runs:
     - name: Migrate
       shell: bash
       run: |
-        npx nx migrate {nx-version}
+        npx nx migrate ${{ inputs.nx-version }}
         npm install --force --ignore-scripts
         npx nx migrate --run-migrations --if-exists
diff --git a/.github/workflows/backwards-compatibility-test.yml b/.github/workflows/backwards-compatibility-test.yml
@@ -0,0 +1,14 @@
+name: Backwards Compatibility Test
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * *' # daily at 00:00
+
+jobs:
+  integration-test:
+    strategy:
+      matrix:
+        nx-version: [latest, '16.10.0']
+    uses: ./.github/workflows/integration-test.yml
+    with:
+      nx-version: ${{matrix.nx-version}}
diff --git a/.github/workflows/basic-test.yml b/.github/workflows/basic-test.yml
@@ -14,8 +14,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
       - uses: ./.github/actions/setup
 
       - name: Lint
@@ -36,8 +34,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
       - uses: ./.github/actions/setup
 
       - run: npx nx build
@@ -55,8 +51,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
       - uses: ./.github/actions/setup
 
       - run: npx nx test --code-coverage

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,8 +13,8 @@ jobs:
   pr-e2e-test:
     uses: ./.github/workflows/e2e-test.yml
 
-  pr-integration-test:
-    uses: ./.github/workflows/integration-test.yml
+  pr-plugin-integration-test:
+    uses: ./.github/workflows/integration-test-plugins.yml
 
   check-commit-lint:
     name: Check commit message follows guidelines

diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -10,8 +10,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
       - uses: ./.github/actions/setup
 
       - run: npx nx e2e ngx-deploy-npm-e2e
diff --git a/.github/workflows/integration-test-plugins.yml b/.github/workflows/integration-test-plugins.yml
@@ -0,0 +1,13 @@
+name: Integration Test (Official Plugins)
+
+on: workflow_call
+
+jobs:
+  plugins-integration-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/setup
+
+      - name: Plugins Integration Test
+        run: npx nx integration ngx-deploy-npm-e2e
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -1,15 +1,19 @@
 name: Integration Test
 
-on: workflow_call
+on:
+  workflow_call:
+    inputs:
+      nx-version:
+        type: string
+        description: The Nx Workspace version to run the integration test
+        required: true
 
 jobs:
   integration-test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
       - uses: ./.github/actions/setup
 
       - name: Integration Test
-        run: npx nx integration ngx-deploy-npm-e2e
+        run: npx nx create-nx-workspace -- ${{ inputs.nx-version }}
diff --git a/.github/workflows/publishment.yml b/.github/workflows/publishment.yml
@@ -15,7 +15,7 @@ jobs:
 
   integration-test:
     if: ${{ !contains(github.event.head_commit.message, 'chore(release)') }}
-    uses: ./.github/workflows/integration-test.yml
+    uses: ./.github/workflows/integration-test-plugins.yml
 
   angular-e2e-test:
     needs: test

diff --git a/.gitignore b/.gitignore
@@ -39,6 +39,7 @@ testem.log
 Thumbs.db
 
 reports/*
+.nx/cache
 
 # Created by https://www.toptal.com/developers/gitignore/api/sonarqube
 # Edit at https://www.toptal.com/developers/gitignore?templates=sonarqube
@@ -56,4 +57,4 @@ reports/*
 # SonarLint working directories, configuration files (including credentials)
 .sonarlint/
 
-# End of https://www.toptal.com/developers/gitignore/api/sonarqube
+# End of https://www.toptal.com/developers/gitignore/api/sonarqube
diff --git a/README.md b/README.md
@@ -101,6 +101,7 @@
     - [`--otp`](#--otp)
     - [`--dry-run`](#--dry-run)
     - [`--dist-folder-path`](#--dist-folder-path)
+- [Compatibility overview with Nx](#compatibility-overview-with-nx)
 - [📁 Configuration File](#configuration-file)
 - [🧐 Essential considerations](#essential-considerations)
   - [Version Generation](#version-generation)
@@ -305,6 +306,13 @@ Indicate a custom dist folder path.
 The path must relative to project's root.
 Especially useful when ngx-deploy-npm can not detect your library dist folder path automatically. [Write us an issue](https://github.com/bikecoders/ngx-deploy-npm/issues/new) if you think we should support the library you are trying to publish
 
+## Compatibility overview with Nx
+
+| Version | Nx Workspace Version   |
+| ------- | ---------------------- |
+| v7.1.0  | `^16.0.0 \|\| ^17.0.0` |
+| v7.0.1  | `^16.0.0`              |
+
 ## 📁 Configuration File <a name="configuration-file"></a>
 
 To avoid all these command-line cmd options, you can write down your

diff --git a/e2e/ngx-deploy-npm-e2e/tests/build.spec.ts b/e2e/ngx-deploy-npm-e2e/tests/build.spec.ts
@@ -13,7 +13,7 @@ describe('build', () => {
   initNgxDeployNPMProject();
   installDependencies(nxPlugin);
 
-  generateLib(nxPlugin, publishableLib, `--dir="libs/${publishableLib}"`);
+  generateLib(nxPlugin, publishableLib, `--dir="libs"`);
 
   // Install the project
   installNgxDeployNPMProject();

diff --git a/e2e/ngx-deploy-npm-e2e/tests/install-ng-add.spec.ts b/e2e/ngx-deploy-npm-e2e/tests/install-ng-add.spec.ts
@@ -27,10 +27,10 @@ describe('install/ng-add', () => {
   installDependencies('@nx/node');
 
   // Init libs and projects
-  generateLib('@nx/node', publicLib, `--dir="libs/${publicLib}"`);
-  generateLib('@nx/node', publicLib2, `--dir="libs/${publicLib2}"`);
-  generateLib('@nx/node', restrictedLib, `--dir="libs/${restrictedLib}"`);
-  generateLib('@nx/node', libNOTset, `--dir="libs/${libNOTset}"`);
+  generateLib('@nx/node', publicLib, `--dir="libs"`);
+  generateLib('@nx/node', publicLib2, `--dir="libs"`);
+  generateLib('@nx/node', restrictedLib, `--dir="libs"`);
+  generateLib('@nx/node', libNOTset, `--dir="libs"`);
 
   installNgxDeployNPMProject(`--projects ${publicLib},${publicLib2}`);
 

diff --git a/nx.json b/nx.json
@@ -1,14 +1,11 @@
 {
-  "npmScope": "bikecoders",
   "affected": {
     "defaultBase": "main"
   },
   "tasksRunnerOptions": {
     "default": {
       "runner": "@nx/workspace/tasks-runners/default",
-      "options": {
-        "cacheableOperations": ["build", "lint", "test", "e2e"]
-      }
+      "options": {}
     }
   },
   "targetDependencies": {
@@ -23,9 +20,6 @@
     "appsDir": "e2e",
     "libsDir": "packages"
   },
-  "cli": {
-    "defaultCollection": "@nx/node"
-  },
   "defaultProject": "ngx-deploy-npm",
   "namedInputs": {
     "default": ["{projectRoot}/**/*", "sharedGlobals"],
@@ -41,13 +35,19 @@
   },
   "targetDefaults": {
     "build": {
-      "inputs": ["production", "^production"]
+      "inputs": ["production", "^production"],
+      "cache": true
     },
     "test": {
-      "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
+      "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
+      "cache": true
     },
     "lint": {
-      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
+      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
+      "cache": true
+    },
+    "e2e": {
+      "cache": true
     }
   }
 }