feat: a18 support

.circleci/config.yml

@@ -65,6 +65,10 @@ executors:
     docker:
       - image: satantime/puppeteer-node:20.12.1
     resource_class: medium
+  a18:
+    docker:
+      - image: satantime/puppeteer-node:20.12.1
+    resource_class: medium
 
 commands:
   install:
@@ -602,6 +606,7 @@ workflows:
                 - a15
                 - a16
                 - a17
+                - a18
 
       # testing a5 (exceptional)
       - E2E Test:
@@ -680,6 +685,7 @@ workflows:
                 - a15
                 - a16
                 - a17
+                - a18
 
       # testing lib build
       - Lib Build:
@@ -705,6 +711,7 @@ workflows:
                 - a15
                 - a16
                 - a17
+                - a18
 
       # testing lib build
       - Lib Build:

.dockerignore

@@ -14,6 +14,7 @@
 /e2e/a15/node_modules
 /e2e/a16/node_modules
 /e2e/a17/node_modules
+/e2e/a18/node_modules
 /e2e/jasmine/node_modules
 /e2e/jest/node_modules
 /e2e/min/node_modules

.eslintrc.yml

@@ -28,6 +28,7 @@ settings:
         - ./e2e/a15/tsconfig.json
         - ./e2e/a16/tsconfig.json
         - ./e2e/a17/tsconfig.json
+        - ./e2e/a18/tsconfig.json
         - ./e2e/jasmine/tsconfig.json
         - ./e2e/jest/tsconfig.json
         - ./e2e/min/tsconfig.json
@@ -59,6 +60,7 @@ overrides:
         - ./e2e/a15/tsconfig.json
         - ./e2e/a16/tsconfig.json
         - ./e2e/a17/tsconfig.json
+        - ./e2e/a18/tsconfig.json
         - ./e2e/jasmine/tsconfig.json
         - ./e2e/jest/tsconfig.json
         - ./e2e/min/tsconfig.json

.github/dependabot.yml

@@ -137,6 +137,14 @@ updates:
     commit-message:
       prefix: 'chore(deps)'
 
+  - package-ecosystem: 'npm'
+    directory: /e2e/a18/
+    open-pull-requests-limit: 0
+    schedule:
+      interval: 'daily'
+    commit-message:
+      prefix: 'chore(deps)'
+
   - package-ecosystem: 'npm'
     directory: /e2e/jasmine/
     open-pull-requests-limit: 0

.husky/commit-msg

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npx commitlint --edit $1

.husky/post-commit

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-git update-index --again
+git update-index --again

.husky/pre-commit

@@ -1,6 +1,3 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npx lint-staged
 npm run lint
 npm run ts:check

.husky/pre-push

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npm run test
+npm run test

.prettierignore

@@ -6,6 +6,7 @@ renovate.json
 .gitignore
 .prettierignore
 
+.husky/
 dist/
 docs/**/*.md
 docs/.docusaurus
@@ -15,8 +16,8 @@ e2e/*/src/test
 e2e/nx/apps/*/src/app
 e2e/nx/apps/*/src/test
 node_modules/
-tests-e2e/.angular
 test-reports/
+tests-e2e/.angular
 tmp/
 
 **/*.sh

CONTRIBUTING.md

@@ -202,7 +202,7 @@ The next step is:
 - update `ng-mocks/.github/dependabot.yml`, search for `a16` and copy blocks to support `a17`
 - update `ng-mocks/.circleci/config.yml`, search for `a16` and copy blocks to support `a17`
 - update `ng-mocks/.eslintrc.yml`, search for `a16` and copy blocks to support `a17`
-- execute `sh docker-compose.sh a17` in `ng-mocks` to install dependencies for `a17`, it might require `--force` at this moment
+- execute `sh docker-compose.sh a17` in `ng-mocks` to install dependencies for `a17`, it might require `--force` at this moment in `docker-compose.yml` in the command for the new version
 
 ### Step #4 - update ng-mocks dependencies
 

README.md

@@ -15,6 +15,7 @@ The current version of the library **has been tested** and **can be used** with:
 
 | Angular | ng-mocks | Jasmine | Jest | Ivy |
 | ------: | :------: | :-----: | :--: | :-: |
+|      18 |  latest  |   yes   | yes  | yes |
 |      17 |  latest  |   yes   | yes  | yes |
 |      16 |  latest  |   yes   | yes  | yes |
 |      15 |  latest  |   yes   | yes  | yes |

docker-compose.sh

@@ -158,6 +158,15 @@ if [ "$1" = "" ] || [ "$1" = "a17" ]; then
     cd ../..
 fi
 
+if [ "$1" = "" ] || [ "$1" = "a18" ]; then
+  docker-compose up --build -- a18 && \
+    cd ./e2e/a18 && \
+    nvm install && \
+    nvm use && \
+    node ./node_modules/puppeteer/install.mjs && \
+    cd ../..
+fi
+
 if [ "$1" = "" ] || [ "$1" = "jasmine" ]; then
   docker-compose up --build -- jasmine && \
     cd ./e2e/jasmine && \

docker-compose.yml

@@ -215,6 +215,18 @@ services:
       - install
       - --no-audit
 
+  a18:
+    image: satantime/puppeteer-node:20.12.1
+    working_dir: /app
+    volumes:
+      - ./e2e/a18:/app
+      - gyp:/root/.node-gyp
+      - npm:/root/.npm
+    command:
+      - npm
+      - install
+      - --no-audit
+
   jasmine:
     image: satantime/puppeteer-node:20.12.1
     working_dir: /app

docs/articles/index.md

@@ -28,6 +28,7 @@ The current version of `ng-mocks` has been tested and **can be used** with:
 
 | Angular | ng-mocks | Jasmine | Jest | Ivy |
 |--------:|:--------:| :-----: | :--: | :-: |
+|      18 |  latest  |   yes   | yes  | yes |
 |      17 |  latest  |   yes   | yes  | yes |
 |      16 |  latest  |   yes   | yes  | yes |
 |      15 |  latest  |   yes   | yes  | yes |

docs/articles/migrations.md

@@ -10,6 +10,11 @@ Below you can find critical changes. They happen on major releases.
 
 If you are facing an issue, despite the instructions, please, feel free to [contact us](need-help.md).
 
+## From 17 to 18
+
+There are no special cases.
+The update should be straight forward.
+
 ## From 16 to 17
 
 There are no special cases.

e2e/a18/.gitignore

@@ -0,0 +1,4 @@
+/dist
+/node_modules
+/src/app
+/src/test

e2e/a18/.nvmrc

@@ -0,0 +1 @@
+20.12.2

e2e/a18/angular.json

@@ -0,0 +1,73 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "a18": {
+      "projectType": "application",
+      "schematics": {},
+      "root": "",
+      "sourceRoot": "src",
+      "prefix": "app",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:application",
+          "options": {
+            "outputPath": "dist/a18",
+            "index": "src/index.html",
+            "browser": "src/main.ts",
+            "polyfills": ["zone.js"],
+            "tsConfig": "tsconfig.json"
+          },
+          "configurations": {
+            "production": {
+              "outputHashing": "all"
+            },
+            "development": {
+              "optimization": false,
+              "extractLicenses": false,
+              "sourceMap": true
+            }
+          },
+          "defaultConfiguration": "production"
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "configurations": {
+            "production": {
+              "buildTarget": "a18:build:production"
+            },
+            "development": {
+              "buildTarget": "a18:build:development"
+            }
+          },
+          "defaultConfiguration": "development"
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "polyfills": ["zone.js", "zone.js/testing"],
+            "tsConfig": "tsconfig.json",
+            "karmaConfig": "karma.conf.js"
+          }
+        }
+      }
+    },
+    "lib": {
+      "projectType": "library",
+      "root": "",
+      "sourceRoot": "src",
+      "prefix": "app",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:ng-packagr",
+          "options": {
+            "project": "ng-package.json",
+            "tsConfig": "tsconfig.json"
+          }
+        }
+      }
+    }
+  }
+}

e2e/a18/jest.config.ts

@@ -0,0 +1,13 @@
+export default {
+  preset: 'jest-preset-angular',
+  workerIdleMemoryLimit: '1024MB',
+  maxWorkers: 1,
+  setupFilesAfterEnv: ['<rootDir>/src/setup-jest.ts'],
+  testEnvironmentOptions: {
+    url: 'http://localhost',
+  },
+  testPathIgnorePatterns: ['<rootDir>/src/test.ts'],
+  transform: {
+    '^.+\\.(ts|mjs|js|html)$': ['jest-preset-angular', { tsconfig: './tsconfig.json' }],
+  },
+};

e2e/a18/karma.conf.js

@@ -0,0 +1,36 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+process.env.CHROME_BIN = require('puppeteer').executablePath();
+
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('@angular-devkit/build-angular/plugins/karma'),
+    ],
+    client: {
+      clearContext: false, // leave Jasmine Spec Runner output visible in browser
+      jasmine: {
+        random: false,
+      },
+    },
+    customLaunchers: {
+      ChromeCi: {
+        base: 'ChromeHeadless',
+        flags: ['--headless', '--disable-gpu', '--no-sandbox', '--disable-dev-shm-usage'],
+      },
+    },
+    reporters: ['kjhtml'],
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: false,
+    browsers: ['ChromeCi'],
+    singleRun: true,
+  });
+};

e2e/a18/ng-package.json

@@ -0,0 +1,8 @@
+{
+  "$schema": "./node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "./dist/lib",
+  "lib": {
+    "entryFile": "src/app/app.module.ts"
+  },
+  "allowedNonPeerDependencies": ["@angular/", "rxjs", "zone.js"]
+}