Skip to content

Commit

Permalink
Merge branch 'develop' into 'master' for 3.2.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
shauke committed Dec 22, 2022
2 parents dbcce68 + ed84bd3 commit d23feae
Show file tree
Hide file tree
Showing 221 changed files with 7,048 additions and 3,533 deletions.
2 changes: 1 addition & 1 deletion .cz-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,5 @@ module.exports = {

breaklineChar: '|', // It is supported for fields body and footer.
footerPrefix: 'Closes ',
breakingPrefix: 'BREAKING CHANGES: ',
breakingPrefix: 'BREAKING CHANGE: ',
};
9 changes: 8 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,14 @@
"dot-notation": "off", // disabled in favor of @typescript-eslint/dot-notation
"eqeqeq": ["error", "always"],
"etc/no-commented-out-code": "warn",
"etc/no-deprecated": "warn",
"etc/no-deprecated": [
"warn",
{
"ignored": {
"templateOptions|to|FormlyTemplateOptions|expressionProperties": "name" // deprecated formly methods are temporarily ignored
}
}
],
"id-blacklist": [
"error",
"any",
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/automated-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@ jobs:
continue-on-error: true

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
if: github.ref != 'refs/heads/develop'
with:
ref: ${{ github.event.pull_request.head.sha }}

- uses: actions/checkout@v2
- uses: actions/checkout@v3
if: github.ref == 'refs/heads/develop'
with:
ref: develop

- name: Use Node.js 16
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dead-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Use Node.js 16
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/demo-server-up.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Publish SSR image to Registry
id: ssr
uses: elgohr/Publish-Docker-Github-Action@v4
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use Node.js 16
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
Expand Down Expand Up @@ -79,9 +79,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use Node.js 16
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
Expand All @@ -106,12 +106,12 @@ jobs:
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master' && github.ref != 'refs/heads/develop'"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Use Node.js 16
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
Expand All @@ -137,9 +137,9 @@ jobs:
test: ['normal', 'customization']

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use Node.js 16
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
Expand All @@ -157,7 +157,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Production Build PWA Image
run: docker-compose build pwa
Expand All @@ -167,7 +167,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Build Nginx Image
run: docker-compose build nginx
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Use Node.js 16
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ jobs:
TESTING: true

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use Node.js 16
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
Expand All @@ -52,7 +52,7 @@ jobs:
run: npm run build:multi

- name: Upload Build Output
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: dist
path: dist
Expand All @@ -66,15 +66,15 @@ jobs:
test: ['b2c', 'b2b']

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use Node.js 16
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm

- name: Download Build Output
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: dist
path: dist
Expand Down Expand Up @@ -109,13 +109,13 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Install e2e dependencies
run: cd e2e && npm i

- name: Download Build Output
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: dist
path: dist
Expand All @@ -141,7 +141,7 @@ jobs:
node dist/$THEME/run-standalone &
- name: Cypress
uses: cypress-io/github-action@v2
uses: cypress-io/github-action@v4
with:
install: false
wait-on: 'http://localhost:4200'
Expand All @@ -150,14 +150,14 @@ jobs:
command: npx ts-node cypress-ci-e2e **/*${{ matrix.test }}*.e2e-spec.ts

- name: Upload Screenshots
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: failure()
with:
name: screenshots
path: e2e/cypress/screenshots

- name: Upload Videos
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: failure()
with:
name: videos
Expand All @@ -169,7 +169,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Execute shellspec tests
run: |
docker run --rm -v "${{ github.workspace }}/nginx/docker-entrypoint.d:/src" shellspec/shellspec
2 changes: 1 addition & 1 deletion .github/workflows/reports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
url: https://pwa-gh-review-reports.azurewebsites.net
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Reset .dockerignore
run: echo node_modules > .dockerignore
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/updates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
continue-on-error: true

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use Node.js 16
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use Node.js 16
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
Expand All @@ -61,9 +61,9 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use Node.js 16
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
Expand Down Expand Up @@ -91,9 +91,9 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use Node.js 16
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
Expand All @@ -107,9 +107,9 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use Node.js 16
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
Expand Down
2 changes: 1 addition & 1 deletion .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx --no-install commitlint --edit "$1"
npx --no -- commitlint --edit $1
1 change: 1 addition & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"font-family-name-quotes": "always-unless-keyword",
"function-url-no-scheme-relative": true,
"function-url-quotes": "always",
"import-notation": "string",
"media-feature-name-no-vendor-prefix": true,
"media-feature-name-no-unknown": true,
"no-descending-specificity": null,
Expand Down
Loading

0 comments on commit d23feae

Please sign in to comment.