Merge pull request #19 from daiscog/ng-18

Ng 18

.eslintrc.json

@@ -24,12 +24,18 @@
     {
       "files": ["*.ts", "*.tsx"],
       "extends": ["plugin:@nx/typescript"],
-      "rules": {}
+      "rules": {
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
+      }
     },
     {
       "files": ["*.js", "*.jsx"],
       "extends": ["plugin:@nx/javascript"],
-      "rules": {}
+      "rules": {
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
+      }
     },
     {
       "files": ["*.spec.ts", "*.spec.tsx", "*.spec.js", "*.spec.jsx"],

.github/workflows/npm-publish.yml

@@ -11,15 +11,24 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
         with:
-          node-version: 18
-          registry-url: https://registry.npmjs.org/
-      - run: npm ci
-      - run: npm run build
-      - run: npm run test
-      - run: npm publish
+          fetch-depth: 0
+
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 9.4.0
+
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          cache: 'pnpm'
+
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm run build
+      - run: pnpm run test
+      - run: pnpm publish
         working-directory: ./dist/libs/ngx-http-request-state
         env:
           NODE_AUTH_TOKEN: ${{secrets.npm_token}}

.github/workflows/test.yml

@@ -10,17 +10,23 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-        if: ${{ github.base_ref == 'main' }}
+      - uses: actions/checkout@v4
         with:
-          ref: ${{ github.base_ref }}
-      - uses: actions/checkout@v2
-      - name: Use Node.js 18.x
-        uses: actions/setup-node@v2
+          fetch-depth: 0
+
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 9.4.0
+
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@v3
         with:
-          node-version: 18.x
-      - run: npm ci
-      - run: npm run build
-      - run: npm run test
-      - run: npm run format:check
-      - run: npm run lint
+          node-version: 20
+          cache: 'pnpm'
+
+      - run: pnpm install --frozen-lockfile
+      - uses: nrwl/nx-set-shas@v4
+      - run: pnpm run build
+      - run: pnpm run test
+      - run: pnpm run format:check
+      - run: pnpm run lint

.gitignore

@@ -40,4 +40,5 @@ Thumbs.db
 
 .angular
 
-.nx/cache
+.nx/cache
+.nx/workspace-data

.nvmrc

@@ -1 +1 @@
-18
+20

.prettierignore

@@ -4,4 +4,5 @@
 /coverage
 .angular
 
-/.nx/cache
+/.nx/cache
+/.nx/workspace-data

apps/examples-e2e/project.json

@@ -3,6 +3,8 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/examples-e2e/src",
   "projectType": "application",
+  "tags": [],
+  "implicitDependencies": ["examples"],
   "targets": {
     "e2e": {
       "executor": "@nx/cypress:cypress",
@@ -21,10 +23,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
+      "executor": "@nx/eslint:lint"
     }
-  },
-  "tags": [],
-  "implicitDependencies": ["examples"]
+  }
 }

apps/examples/project.json

@@ -65,8 +65,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
+      "executor": "@nx/eslint:lint"
     },
     "test": {
       "executor": "@nx/jest:jest",

apps/examples/src/app/basic-smart-dumb-example/basic-smart/basic-smart.component.spec.ts

@@ -19,12 +19,12 @@ describe('BasicSmartComponent', () => {
     }) as jest.Mocked<RandomBreweryService>;
 
     const injectSpy = jest.spyOn(angularCore, 'inject');
-    injectSpy.mockImplementation((providerToken: unknown) => {
+    injectSpy.mockImplementation(((providerToken: unknown) => {
       if (providerToken === RandomBreweryService) {
         return mockService;
       }
       throw new Error(`Unexpected inject token: ` + providerToken);
-    });
+    }) as typeof angularCore.inject);
 
     const component = new BasicSmartComponent();
     return {
@@ -48,17 +48,19 @@ describe('BasicSmartComponent', () => {
     responses: (Brewery | HttpErrorResponse)[],
     delay = '--'
   ) {
-    responses.forEach((next) => {
-      mockService.randomBrewery.mockImplementationOnce(() => {
+    responses
+      .map((next) => {
         if (next instanceof HttpErrorResponse) {
           return cold(`${delay}#`, undefined, next);
         }
         const response = new HttpResponse({
           body: next,
         });
         return cold(`${delay}(r|)`, { r: response });
+      })
+      .forEach((next) => {
+        mockService.randomBrewery.mockImplementationOnce(() => next);
       });
-    });
   }
 
   describe('#brewery$', () => {

apps/examples/src/app/multiple-data-sources/container/multiple-sources-container.component.spec.ts

@@ -1,3 +1,5 @@
+jest.mock('@angular/core');
+
 import * as angularCore from '@angular/core';
 import { MultipleSourcesContainerComponent } from './multiple-sources-container.component';
 import { PunkApiService } from '../service/punk-api.service';
@@ -12,8 +14,6 @@ import {
 } from 'ngx-http-request-state';
 import { HttpErrorResponse } from '@angular/common/http';
 
-jest.mock('@angular/core');
-
 describe('MultipleSourcesContainerComponent', () => {
   function setup(): {
     component: MultipleSourcesContainerComponent;
@@ -23,12 +23,12 @@ describe('MultipleSourcesContainerComponent', () => {
       brewedBefore: jest.fn(),
       brewedAfter: jest.fn(),
     } as unknown as jest.Mocked<PunkApiService>;
-    jest.spyOn(angularCore, 'inject').mockImplementation((token) => {
+    jest.spyOn(angularCore, 'inject').mockImplementation(((token: unknown) => {
       if (token === PunkApiService) {
         return service;
       }
       throw new Error('No provider for ' + token);
-    });
+    }) as typeof angularCore.inject);
     const component = new MultipleSourcesContainerComponent();
     return { component, service };
   }

libs/ngx-http-request-state/README.md

@@ -12,6 +12,7 @@ support its development:
 
 ## Versions
 
+Version `^3.2.0` supports Angular 14 - 18.
 Version `^3.1.0` supports Angular 14 - 17.
 Version `3.0.0` supports Angular 14, 15 & 16.
 Version `^2.1.0` supports Angular 14 & 15.

libs/ngx-http-request-state/package.json

@@ -9,10 +9,10 @@
     "loading",
     "error"
   ],
-  "version": "3.1.0",
+  "version": "3.2.0",
   "peerDependencies": {
     "rxjs": "^6.2.0 || ^7.4.0",
-    "@angular/common": "^14.2.10 || ^15.0.1 || ^16.0.0 || ^17.0.0"
+    "@angular/common": "^14.2.10 || ^15.0.1 || ^16.0.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
     "tslib": "^2.3.0"

libs/ngx-http-request-state/project.json

@@ -23,8 +23,7 @@
       "defaultConfiguration": "production"
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
+      "executor": "@nx/eslint:lint"
     },
     "test": {
       "executor": "@nx/jest:jest",

nx.json

@@ -1,8 +1,5 @@
 {
   "$schema": "./node_modules/nx/schemas/nx-schema.json",
-  "affected": {
-    "defaultBase": "origin/main"
-  },
   "generators": {
     "@nx/angular:application": {
       "style": "css",
@@ -24,14 +21,6 @@
       "inputs": ["default", "^production"],
       "cache": true
     },
-    "lint": {
-      "inputs": [
-        "default",
-        "{workspaceRoot}/.eslintrc.json",
-        "{workspaceRoot}/.eslintignore"
-      ],
-      "cache": true
-    },
     "build": {
       "dependsOn": ["^build"],
       "inputs": ["production", "^production"],
@@ -49,6 +38,14 @@
           "codeCoverage": true
         }
       }
+    },
+    "@nx/eslint:lint": {
+      "inputs": [
+        "default",
+        "{workspaceRoot}/.eslintrc.json",
+        "{workspaceRoot}/.eslintignore"
+      ],
+      "cache": true
     }
   },
   "namedInputs": {
@@ -62,5 +59,7 @@
       "!{projectRoot}/src/test-setup.[jt]s"
     ],
     "sharedGlobals": []
-  }
+  },
+  "useInferencePlugins": false,
+  "defaultBase": "origin/main"
 }