Skip to content

Commit

Permalink
build(deps): bump project dependencies (#321)
Browse files Browse the repository at this point in the history
* build(deps): bump project dependencies

- [X] update project dependencies to the latest versions;
- [X] update angular to v13, verify
project workability;
- [ ] update jest-preset-angular when it's released, unit tests executiron is
broken;

BREAKING CHANGE: reinstall project dependencies

* fix(polyfills): update client app polyfills

* build(deps): bump project dependencies

* build(deps): bump project dependencies

- [X] update project dependencies to the latest versions;

* build(deps): bump project dependencies

- [X] use jest-preset-angular rc, nrwl/linter beta;

* chore(deps): bump project dependencies

* build(deps): bump project dependencies

* build(deps): bump project dependencies

* build(deps): bump project dependencies

* build(deps): bump project dependencies

- [X] bump dependencies, update jest config

* test(unit): fix unit tests

* fix(marked): fix marked library ref

* ci(concur): improve workflows

- [X] add workflow concurrency configs;

* build(deps): bump project dependencies

* build(lock): regenerate yarn.lock

* fix(ci): fix workflows

* fix(ci): fix workflow step conditionals

* fix(ci): fix workflows

* fix(ci): enable caching (pr validation)

* build(deps): update deps

* fix(ncu): fix ncurc excludes

* build(deps): bump project dependencies

* build(deps): fix dependencies version
  • Loading branch information
rfprod authored Nov 19, 2021
1 parent cae65aa commit c0e55ec
Show file tree
Hide file tree
Showing 26 changed files with 7,269 additions and 2,666 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: docker
Expand All @@ -15,6 +14,10 @@ defaults:
run:
shell: bash

concurrency:
group: ${{ github.head_ref }}.${{ github.sha }}
cancel-in-progress: true

jobs:
docker-build:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -45,6 +48,9 @@ jobs:
- name: Configure kernel (increase watchers)
run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p

- name: Use yarn 1.22.17 (required for integrity check)
run: yarn set version 1.22.17 # this is mandatory, yarn v2 does not have integrity check which is needed for the pipeline

- name: Get variables (yarn cache directory path, commit hash)
id: get-variables
run: echo "::set-output name=yarncachedir::$(yarn cache dir)"; echo "::set-output name=commitsha::$(echo ${GITHUB_SHA})"
Expand All @@ -61,6 +67,7 @@ jobs:
**/node_modules
/tmp/nx
/tmp/jest_rs
./angular
key: ${{ runner.os }}-node-${{ matrix.node-version }}-yarn-${{ hashFiles('**/yarn.lock') }}-workspace-${{ steps.get-variables.outputs.commitsha }}
restore-keys: |
${{ runner.os }}-node-${{ matrix.node-version }}-yarn-${{ hashFiles('**/yarn.lock') }}-workspace-
Expand Down
30 changes: 4 additions & 26 deletions .github/workflows/nx-e2e.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# This workflow will do a clean install of node dependencies, and will run all Nx e2e apps using Cypress
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: nx-e2e
Expand All @@ -10,6 +9,10 @@ defaults:
run:
shell: bash

concurrency:
group: ${{ github.head_ref }}.${{ github.sha }}
cancel-in-progress: true

jobs:
e2e:
runs-on: ubuntu-latest
Expand All @@ -36,31 +39,6 @@ jobs:
- name: Configure kernel (increase watchers)
run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p

- name: Get variables (yarn cache directory path, commit hash)
id: get-variables
run: echo "::set-output name=yarncachedir::$(yarn cache dir)"; echo "::set-output name=commitsha::$(echo ${GITHUB_SHA})"

- name: Workspace cache (npm, yarn, nx, jest)
uses: actions/cache@v2
id: workspace-cache # use this to check for `cache-hit` (`steps.workspace-cache.outputs.cache-hit != 'true'`)
env:
cache-name: workspace-cache
with:
path: |
~/.npm
${{ steps.get-variables.outputs.yarncachedir }}
**/node_modules
/tmp/nx
/tmp/jest_rs
key: ${{ runner.os }}-node-${{ matrix.node-version }}-yarn-${{ hashFiles('**/yarn.lock') }}-workspace-${{ steps.get-variables.outputs.commitsha }}
restore-keys: |
${{ runner.os }}-node-${{ matrix.node-version }}-yarn-${{ hashFiles('**/yarn.lock') }}-workspace-
${{ runner.os }}-node-${{ matrix.node-version }}-yarn-
${{ runner.os }}-
- name: Workspace integrity check
run: yarn workspace:integrity-check

- name: Install project dependencies
run: yarn install --frozen-lockfile

Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/pr-validation.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: pr-validation
Expand All @@ -11,6 +10,10 @@ defaults:
run:
shell: bash

concurrency:
group: ${{ github.head_ref }}.${{ github.sha }}
cancel-in-progress: true

jobs:
premerge:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -85,8 +88,9 @@ jobs:
if: steps.changes.outputs.nx == 'true'
run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p

- name: Use yarn 1.22.1 (required for integrity check)
run: yarn set version 1.22.1 # this is mandatory, yarn v2 does not have integrity check which is needed for the pipeline
- name: Use yarn 1.22.17 (required for integrity check)
if: steps.changes.outputs.nx == 'true'
run: yarn set version 1.22.17 # this is mandatory, yarn v2 does not have integrity check which is needed for the pipeline

- name: Get variables (yarn cache directory, commit hash)
if: steps.changes.outputs.nx == 'true'
Expand All @@ -106,6 +110,7 @@ jobs:
**/node_modules
/tmp/nx
/tmp/jest_rs
./angular
key: ${{ runner.os }}-node-${{ matrix.node-version }}-yarn-${{ hashFiles('**/yarn.lock') }}-workspace-${{ steps.get-variables.outputs.commitsha }}
restore-keys: |
${{ runner.os }}-node-${{ matrix.node-version }}-yarn-${{ hashFiles('**/yarn.lock') }}-workspace-
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/trunk-on-push.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: trunk-on-push
Expand All @@ -11,6 +10,10 @@ defaults:
run:
shell: bash

concurrency:
group: ${{ github.head_ref }}.${{ github.sha }}
cancel-in-progress: true

jobs:
test-build-deploy:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -78,6 +81,10 @@ jobs:
if: steps.changes.outputs.nx == 'true'
run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p

- name: Use yarn 1.22.17 (required for integrity check)
if: steps.changes.outputs.nx == 'true'
run: yarn set version 1.22.17 # this is mandatory, yarn v2 does not have integrity check which is needed for the pipeline

- name: Get variables (yarn cache directory, commit hash)
if: steps.changes.outputs.nx == 'true'
id: get-variables
Expand All @@ -96,6 +103,7 @@ jobs:
**/node_modules
/tmp/nx
/tmp/jest_rs
./angular
key: ${{ runner.os }}-node-${{ matrix.node-version }}-yarn-${{ hashFiles('**/yarn.lock') }}-workspace-${{ steps.get-variables.outputs.commitsha }}
restore-keys: |
${{ runner.os }}-node-${{ matrix.node-version }}-yarn-${{ hashFiles('**/yarn.lock') }}-workspace-
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ functions/*
!.vscode/extensions.json

# misc
/.angular/cache
/coverage
/documentation
/changelog
Expand All @@ -72,4 +73,3 @@ Thumbs.db
# Local Files
*.keystore
/tools/shell/vars.sh

4 changes: 2 additions & 2 deletions .ncurc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"reject": [],
"timeout": 60000
"reject": ["eslint", "graphql", "typescript"],
"timeout": 90000
}
11 changes: 9 additions & 2 deletions angular.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"cli": {
"cache": {
"enabled": true,
"path": ".angular/cache",
"environment": "all"
}
},
"newProjectRoot": "",
"projects": {
"api": {
Expand Down Expand Up @@ -1158,7 +1165,7 @@
"outputPath": "dist/apps/documentation",
"polyfills": "apps/documentation/src/polyfills.ts",
"scripts": [
"node_modules/marked/lib/marked.js",
"node_modules/marked/lib/marked.umd.js",
"node_modules/prismjs/prism.js",
"node_modules/prismjs/components/prism-csharp.min.js",
"node_modules/prismjs/components/prism-css.min.js",
Expand Down Expand Up @@ -1566,7 +1573,7 @@
"options": {
"commands": [
{
"command": "rm -rf documentation/* dist/* coverage/* changelog/* /tmp/nx/nx-ng-starter",
"command": "rm -rf .angular/* documentation/* dist/* coverage/* changelog/* /tmp/nx/nx-ng-starter",
"forwardAllArgs": false
}
]
Expand Down
30 changes: 8 additions & 22 deletions apps/client/src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
*/

/**
* IE9, IE10 and IE11 requires all of the following polyfills.
* Googlebot bot renderer based on Chrome 41.
* https://developers.google.com/search/docs/guides/rendering
* Also support for IE9, IE10 and IE11 requires all of the following polyfills.
*/
import 'core-js/es/array';
import 'core-js/es/date';
Expand All @@ -30,33 +32,17 @@ import 'core-js/es/number';
import 'core-js/es/object';
import 'core-js/es/parse-float';
import 'core-js/es/parse-int';
import 'core-js/es/reflect'; // IE10 and IE11 requires the following for the Reflect API.
import 'core-js/es/regexp';
import 'core-js/es/set';
import 'core-js/es/string';
import 'core-js/es/symbol';
import 'core-js/es/weak-map';
import 'isomorphic-fetch';

import 'core-js/es/reflect';
/**
* If the application will be indexed by Google Search, the following is required.
* Googlebot uses a renderer based on Chrome 41.
* https://developers.google.com/search/docs/guides/rendering
*
* import 'core-js/es6/array';
*/

/**
* IE10 and IE11 requires the following for NgClass support on SVG elements
*/
// Import 'classlist.js'; // Run `npm install --save classlist.js`.

/**
* Web Animations `@angular/platform-browser/animations`
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
*/
// Run `npm install --save web-animations-js`, then import 'web-animations-js';
* Required to support Web Animations `@angular/platform-browser/animations`.
* Needed for: All but Chrome, Firefox and Opera. https://caniuse.com/web-animation
**/
import 'web-animations-js'; // Run `npm install --save web-animations-js`.

/**
* By default, zone.js will patch all possible macroTask and DomEvents
Expand Down
10 changes: 0 additions & 10 deletions apps/documentation/src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,6 @@
* BROWSER POLYFILLS
*/

/** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.

/**
* Web Animations `@angular/platform-browser/animations`
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
*/
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.

/**
* By default, zone.js will patch all possible macroTask and DomEvents
* user can disable parts of macroTask/DomEvents patch by setting following flags
Expand Down
2 changes: 2 additions & 0 deletions apps/elements-testing/src/app/app.element.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { AppElement } from './app.element';

jest.mock('./app.element.scss', jest.fn());

describe('AppElement', () => {
let app: AppElement;

Expand Down
30 changes: 8 additions & 22 deletions apps/elements/src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
*/

/**
* IE9, IE10 and IE11 requires all of the following polyfills.
* Googlebot bot renderer based on Chrome 41.
* https://developers.google.com/search/docs/guides/rendering
* Also support for IE9, IE10 and IE11 requires all of the following polyfills.
*/
import 'core-js/es/array';
import 'core-js/es/date';
Expand All @@ -30,33 +32,17 @@ import 'core-js/es/number';
import 'core-js/es/object';
import 'core-js/es/parse-float';
import 'core-js/es/parse-int';
import 'core-js/es/reflect'; // IE10 and IE11 requires the following for the Reflect API.
import 'core-js/es/regexp';
import 'core-js/es/set';
import 'core-js/es/string';
import 'core-js/es/symbol';
import 'core-js/es/weak-map';
import 'isomorphic-fetch';

import 'core-js/es/reflect';
/**
* If the application will be indexed by Google Search, the following is required.
* Googlebot uses a renderer based on Chrome 41.
* https://developers.google.com/search/docs/guides/rendering
*
* import 'core-js/es6/array';
*/

/**
* IE10 and IE11 requires the following for NgClass support on SVG elements
*/
// Import 'classlist.js'; // Run `npm install --save classlist.js`.

/**
* Web Animations `@angular/platform-browser/animations`
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
*/
// Run `npm install --save web-animations-js`, then import 'web-animations-js';
* Required to support Web Animations `@angular/platform-browser/animations`.
* Needed for: All but Chrome, Firefox and Opera. https://caniuse.com/web-animation
**/
import 'web-animations-js'; // Run `npm install --save web-animations-js`.

/**
* By default, zone.js will patch all possible macroTask and DomEvents
Expand Down
Loading

0 comments on commit c0e55ec

Please sign in to comment.