Skip to content

Commit

Permalink
Merge branch 'master' into issues/4486
Browse files Browse the repository at this point in the history
  • Loading branch information
satanTime authored Jul 14, 2024
2 parents afc30b4 + 6e85376 commit 1a80e08
Show file tree
Hide file tree
Showing 229 changed files with 87,051 additions and 59,106 deletions.
56 changes: 39 additions & 17 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.0
- image: satantime/puppeteer-node:20.15.1
resource_class: medium
a5:
docker:
Expand Down Expand Up @@ -59,11 +59,15 @@ executors:
resource_class: medium
a16:
docker:
- image: satantime/puppeteer-node:18.18.2
- image: satantime/puppeteer-node:18.20.3
resource_class: medium
a17:
docker:
- image: satantime/puppeteer-node:20.9.0
- image: satantime/puppeteer-node:20.15.1
resource_class: medium
a18:
docker:
- image: satantime/puppeteer-node:20.15.1
resource_class: medium

commands:
Expand All @@ -75,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
Expand All @@ -108,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 >>
Expand All @@ -131,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 >>
Expand All @@ -148,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
Expand Down Expand Up @@ -234,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
Expand All @@ -266,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
Expand All @@ -298,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
Expand Down Expand Up @@ -346,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:
Expand All @@ -355,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
Expand Down Expand Up @@ -602,6 +621,7 @@ workflows:
- a15
- a16
- a17
- a18

# testing a5 (exceptional)
- E2E Test:
Expand Down Expand Up @@ -680,6 +700,7 @@ workflows:
- a15
- a16
- a17
- a18

# testing lib build
- Lib Build:
Expand All @@ -705,6 +726,7 @@ workflows:
- a15
- a16
- a17
- a18

# testing lib build
- Lib Build:
Expand Down
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
CHANGELOG.md
renovate.json
.dockerignore
.eslintignore
.gitignore
.prettierignore
CHANGELOG.md
CODEOWNERS
renovate.json

dist/
docs/articles/**/*.md
docs/.docusaurus
docs/articles/**/*.md
docs/src/css
e2e/*/.angular
e2e/*/src/app
e2e/*/src/test
Expand Down
10 changes: 8 additions & 2 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -93,6 +95,7 @@ overrides:
- 150

'@angular-eslint/no-input-rename': off
'@angular-eslint/no-inputs-metadata-property': off
'@angular-eslint/no-output-rename': off
'@angular-eslint/no-outputs-metadata-property': off

Expand All @@ -104,12 +107,14 @@ overrides:
'@typescript-eslint/no-unused-vars': error

unicorn/expiring-todo-comments: off
unicorn/no-anonymous-default-export: off
unicorn/no-array-callback-reference: off
unicorn/no-array-method-this-argument: off
unicorn/no-for-loop: off
unicorn/no-null: off
unicorn/no-this-assignment: off
unicorn/no-typeof-undefined: off
unicorn/no-unnecessary-polyfills: off
unicorn/no-useless-undefined: off
unicorn/prefer-array-flat: off
unicorn/prefer-at: off
Expand All @@ -118,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
Expand Down Expand Up @@ -225,7 +231,7 @@ overrides:
- files:
- '*.json'
extends:
- 'plugin:json/recommended'
- 'plugin:json/recommended-legacy'
- 'plugin:prettier/recommended'

- files:
Expand All @@ -238,7 +244,7 @@ overrides:
- 'tsconfig.json'
- 'tsconfig.*.json'
extends:
- 'plugin:json/recommended-with-comments'
- 'plugin:json/recommended-with-comments-legacy'
- 'plugin:prettier/recommended'

- files:
Expand Down
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: Bug Report
about: Use this template for reporting bugs.
title: 'Bug: '
labels: bug
assignees: satanTime
---

### Description of the bug
Expand All @@ -16,7 +15,7 @@ assignees: satanTime
A zip file or github repo with the failure is the best,
but if it's a simple failure which requires just a spec file,
then please use one of the preconfigured templates:
- codesandbox: https://codesandbox.io/s/github/help-me-mom/ng-mocks-sandbox?file=/src/test.spec.ts
- codesandbox: https://codesandbox.io/p/sandbox/github/help-me-mom/ng-mocks-sandbox/tree/master/?file=/src/test.spec.ts
- stackblitz: https://stackblitz.com/github/help-me-mom/ng-mocks-sandbox?file=src/test.spec.ts
-->

Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
blank_issues_enabled: true
contact_links:
- name: Chat on gitter
about: A good place for quick questions
url: https://gitter.im/ng-mocks/community
- name: Ask help on Stackoverflow
about: In case if you have a well defined question or clear expectations with prepared code examples
url: https://stackoverflow.com/questions/ask?tags=ng-mocks%20angular%20testing%20mocking
- name: Ask a question
about: In case if you DO NOT have a well defined question
url: https://github.com/help-me-mom/ng-mocks/discussions/new
- name: Chat on gitter
about: A good place for quick questions
url: https://gitter.im/ng-mocks/community
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ jobs:
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
queries: +security-and-quality

- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: '/language:${{ matrix.language }}'
3 changes: 0 additions & 3 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx commitlint --edit $1
5 changes: 1 addition & 4 deletions .husky/post-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

git update-index --again
git update-index --again
3 changes: 0 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx lint-staged
npm run lint
npm run ts:check
5 changes: 1 addition & 4 deletions .husky/pre-push
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npm run test
npm run test
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.9.0
20.15.1
Loading

0 comments on commit 1a80e08

Please sign in to comment.