Merge branch 'master' into fix-help-me-momGH-8634

c-harding · Jun 4, 2024 · 995a2ca · 995a2ca
2 parents f0f46f3 + 0c3837a
commit 995a2ca
Show file tree

Hide file tree

Showing 46 changed files with 23,575 additions and 19,433 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,15 +3,15 @@ version: 2.1
 parameters:
   lockindex:
     type: string
-    default: '0'
+    default: '1'
 
 orbs:
   windows: circleci/[email protected]
 
 executors:
   core:
     docker:
-      - image: satantime/puppeteer-node:20.12.2
+      - image: satantime/puppeteer-node:20.14.0
     resource_class: medium
   a5:
     docker:
@@ -59,15 +59,15 @@ executors:
     resource_class: medium
   a16:
     docker:
-      - image: satantime/puppeteer-node:18.20.2
+      - image: satantime/puppeteer-node:18.20.3
     resource_class: medium
   a17:
     docker:
-      - image: satantime/puppeteer-node:20.12.2
+      - image: satantime/puppeteer-node:20.14.0
     resource_class: medium
   a18:
     docker:
-      - image: satantime/puppeteer-node:20.12.2
+      - image: satantime/puppeteer-node:20.14.0
     resource_class: medium
 
 commands:
@@ -79,15 +79,18 @@ commands:
     steps:
       - checkout
       - restore_cache:
-          key: << parameters.dir >>-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/<< parameters.dir >>/package-lock.json" }}
+          key: << parameters.dir >>-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/<< parameters.dir >>/package.json" }}-{{ checksum "e2e/<< parameters.dir >>/package-lock.json" }}
       - run:
           name: NPM Install
           command: |
+            md5sum e2e/<< parameters.dir >>/package-lock.json > package.md5
             if [ ! -d "e2e/<< parameters.dir >>/node_modules/" ]; then
               npm run i:ci:<< parameters.dir >>
             fi
+            md5sum -c package.md5
+            rm package.md5
       - save_cache:
-          key: << parameters.dir >>-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/<< parameters.dir >>/package-lock.json" }}
+          key: << parameters.dir >>-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/<< parameters.dir >>/package.json" }}-{{ checksum "e2e/<< parameters.dir >>/package-lock.json" }}
           paths:
             - ./e2e/<< parameters.dir >>/node_modules
             - ~/.cache/puppeteer
@@ -112,7 +115,7 @@ commands:
       - attach_workspace:
           at: dist
       - restore_cache:
-          key: << parameters.dir >>-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/<< parameters.dir >>/package-lock.json" }}
+          key: << parameters.dir >>-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/<< parameters.dir >>/package.json" }}-{{ checksum "e2e/<< parameters.dir >>/package-lock.json" }}
       - run:
           name: Spreading Build
           command: npm run s:<< parameters.dir >>
@@ -135,7 +138,7 @@ commands:
       - attach_workspace:
           at: dist
       - restore_cache:
-          key: << parameters.dir >>-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/<< parameters.dir >>/package-lock.json" }}
+          key: << parameters.dir >>-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/<< parameters.dir >>/package.json" }}-{{ checksum "e2e/<< parameters.dir >>/package-lock.json" }}
       - run:
           name: Spreading Build
           command: npm run s:<< parameters.dir >>
@@ -152,15 +155,18 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: root-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "package-lock.json" }}
+          key: root-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
       - run:
           name: NPM Install
           command: |
+            md5sum package-lock.json > package.md5
             if [ ! -d "./node_modules/" ]; then
               npm ci
             fi
+            md5sum -c package.md5
+            rm package.md5
       - save_cache:
-          key: root-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "package-lock.json" }}
+          key: root-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
           paths:
             - ./node_modules
             - ~/.cache/puppeteer
@@ -238,15 +244,18 @@ jobs:
           steps:
             - checkout
             - restore_cache:
-                key: tests-e2e-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "tests-e2e/package-lock.json" }}
+                key: tests-e2e-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "tests-e2e/package.json" }}-{{ checksum "tests-e2e/package-lock.json" }}
             - run:
                 name: NPM Install
                 command: |
+                  md5sum tests-e2e/package-lock.json > package.md5
                   if [ ! -d "./tests-e2e/node_modules/" ]; then
                     npm run i:tests-e2e
                   fi
+                  md5sum -c package.md5
+                  rm package.md5
             - save_cache:
-                key: tests-e2e-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "tests-e2e/package-lock.json" }}
+                key: tests-e2e-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "tests-e2e/package.json" }}-{{ checksum "tests-e2e/package-lock.json" }}
                 paths:
                   - ./tests-e2e/node_modules
                   - ~/.cache/puppeteer
@@ -270,15 +279,18 @@ jobs:
           steps:
             - checkout
             - restore_cache:
-                key: docs-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "docs/package-lock.json" }}
+                key: docs-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "docs/package.json" }}-{{ checksum "docs/package-lock.json" }}
             - run:
                 name: NPM Install
                 command: |
+                  md5sum docs/package-lock.json > package.md5
                   if [ ! -d "./docs/node_modules/" ]; then
                     npm run i:docs
                   fi
+                  md5sum -c package.md5
+                  rm package.md5
             - save_cache:
-                key: docs-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "docs/package-lock.json" }}
+                key: docs-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "docs/package.json" }}-{{ checksum "docs/package-lock.json" }}
                 paths:
                   - ./docs/node_modules
                   - ~/.cache/puppeteer
@@ -302,7 +314,7 @@ jobs:
           steps:
             - checkout
             - restore_cache:
-                key: root-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "package-lock.json" }}
+                key: root-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
             - run:
                 name: Default
                 command: KARMA_SUITE=tests-performance/test.spec.ts npm run test
@@ -350,7 +362,7 @@ jobs:
             - attach_workspace:
                 at: dist
             - restore_cache:
-                key: a5es5-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a5es5/package-lock.json" }}
+                key: a5es5-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a5es5/package.json" }}-{{ checksum "e2e/a5es5/package-lock.json" }}
             - run: nvm install $(cat e2e/a5es5/.nvmrc)
             - run: nvm use $(cat e2e/a5es5/.nvmrc)
             - run:
@@ -359,11 +371,14 @@ jobs:
             - run:
                 name: NPM Install
                 command: |
+                  md5sum e2e/a5es5/package-lock.json > package.md5
                   if [ ! -d "e2e/a5es5/node_modules/" ]; then
                     npm run i:a5es5
                   fi
+                  md5sum -c package.md5
+                  rm package.md5
             - save_cache:
-                key: a5es5-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a5es5/package-lock.json" }}
+                key: a5es5-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a5es5/package.json" }}-{{ checksum "e2e/a5es5/package-lock.json" }}
                 paths:
                   - ./e2e/a5es5/node_modules
                   - ~/.cache/puppeteer

diff --git a/.eslintignore b/.eslintignore
@@ -1,9 +1,10 @@
-CHANGELOG.md
-renovate.json
 .dockerignore
 .eslintignore
 .gitignore
 .prettierignore
+CHANGELOG.md
+CODEOWNERS
+renovate.json
 
 dist/
 docs/.docusaurus

diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -123,6 +123,7 @@ overrides:
       unicorn/prefer-module: off
       unicorn/prefer-set-has: off
       unicorn/prefer-spread: off
+      unicorn/prefer-string-raw: off
       unicorn/prefer-string-replace-all: off
       unicorn/prefer-switch: off
       unicorn/prefer-top-level-await: off
@@ -230,7 +231,7 @@ overrides:
   - files:
       - '*.json'
     extends:
-      - 'plugin:json/recommended'
+      - 'plugin:json/recommended-legacy'
       - 'plugin:prettier/recommended'
 
   - files:
@@ -243,7 +244,7 @@ overrides:
       - 'tsconfig.json'
       - 'tsconfig.*.json'
     extends:
-      - 'plugin:json/recommended-with-comments'
+      - 'plugin:json/recommended-with-comments-legacy'
       - 'plugin:prettier/recommended'
 
   - files:

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -3,7 +3,6 @@ name: Bug Report
 about: Use this template for reporting bugs.
 title: 'Bug: '
 labels: bug
-assignees: satanTime
 ---
 
 ### Description of the bug

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -3,7 +3,6 @@ name: Feature Request
 about: Use this template for feature requests.
 title: 'Feature Request: '
 labels: enhancement
-assignees: satanTime
 ---
 
 ### Describe the feature or problem you'd like to solve

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-20.12.2
+20.14.0
diff --git a/.prettierignore b/.prettierignore
@@ -1,10 +1,11 @@
-CHANGELOG.md
-renovate.json
 .browserslistrc
 .dockerignore
 .eslintignore
 .gitignore
 .prettierignore
+CHANGELOG.md
+CODEOWNERS
+renovate.json
 
 .husky/
 dist/

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [14.13.0](https://github.com/help-me-mom/ng-mocks/compare/v14.12.2...v14.13.0) (2024-06-01)
+
+
+### Features
+
+* a18 support ([e2c1dff](https://github.com/help-me-mom/ng-mocks/commit/e2c1dffb189a451e933bb04aa052a55019ffb341))
+
 ## [14.12.2](https://github.com/help-me-mom/ng-mocks/compare/v14.12.1...v14.12.2) (2024-04-13)
 
 

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1,3 +1,3 @@
 # This is a comment.
 # Each line is a file pattern followed by one or more owners.
-*       @ike18t @getsaf @satanTime
+*       @satanTime
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -21,20 +21,20 @@ and click on the "Edit this page" link at the bottom of the page.
 ### Requirements on Mac
 
 - install `docker`: https://hub.docker.com
-- install `docker-compose`: https://docs.docker.com/compose/install/
+- install `compose`: https://docs.docker.com/compose/install/
 - install `nvm`: https://github.com/nvm-sh/nvm#installing-and-updating
 
 ### Requirements on Linux
 
 - install `docker`: https://hub.docker.com
-- install `docker-compose`: https://docs.docker.com/compose/install/
+- install `compose`: https://docs.docker.com/compose/install/
 - install `nvm`: https://github.com/nvm-sh/nvm#installing-and-updating
 
 ### Requirements on Windows
 
 - install `Git BASH`: https://gitforwindows.org
 - install `docker` for `WSL`: https://docs.docker.com/desktop/windows/wsl/
-- install `docker-compose`: https://docs.docker.com/compose/install/
+- install `compose`: https://docs.docker.com/compose/install/
 - install `nvm`: https://github.com/nvm-sh/nvm#installing-and-updating
 
 ## Development
@@ -48,7 +48,7 @@ To develop `ng-mocks` you need to use `bash` and `WSL` in case if you are on Win
 - execute
 
   ```shell
-  sh ./docker-compose.sh
+  sh ./compose.sh
   ```
 
 - it will take a while, but afterwards you have all dependencies installed
@@ -196,18 +196,18 @@ The next step is:
 ### Step #3 - update scripts
 
 - update `ng-mocks/package.json`, search for `a16` and extended scripts to support `a17`
-- update `ng-mocks/docker-compose.yml`, search for `a16` and copy blocks to support `a17` with the right node version
-- update `ng-mocks/docker-compose.sh`, search for `a16` and copy blocks to support `a17` with the right command to install `puppeteer`
+- update `ng-mocks/compose.yml`, search for `a16` and copy blocks to support `a17` with the right node version
+- update `ng-mocks/compose.sh`, search for `a16` and copy blocks to support `a17` with the right command to install `puppeteer`
 - update `ng-mocks/.dockerignore`, search for `a16` and copy blocks to support `a17`
 - 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 in `docker-compose.yml` in the command for the new version
+- execute `sh compose.sh a17` in `ng-mocks` to install dependencies for `a17`, it might require `--force` at this moment in `compose.yml` in the command for the new version
 
 ### Step #4 - update ng-mocks dependencies
 
 - update `ng-mocks/package.json` to point to the new angular version in dependencies
-- execute `sh docker-compose.sh root` in `ng-mocks` to install the dependencies
+- execute `sh compose.sh root` in `ng-mocks` to install the dependencies
 
 ### Step #5 - verify that`ng-mocks` does not fail with the new version