Skip to content

Commit

Permalink
Update web dependencies (kubernetes#7619)
Browse files Browse the repository at this point in the history
* Update web dependencies

* Update typescript

* Run ng update @angular/core@15 @angular/cli@15

* Update other web depdencies

* Update node version

* Fix tests
  • Loading branch information
maciaszczykm authored Feb 14, 2023
1 parent c583f9e commit 578974d
Show file tree
Hide file tree
Showing 9 changed files with 2,309 additions and 2,160 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cd-global.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
go-version: 1.19
- uses: actions/setup-node@v3
with:
node-version: 16.15.0
node-version: 18.14.0
- run: yarn
- run: node hack/version.mjs
- run: go mod download
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 16.15.0
node-version: 18.14.0
- run: yarn
- run: node hack/version.mjs
- run: go mod download
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-global.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
go-version: 1.19
- uses: actions/setup-node@v3
with:
node-version: 16.15.0
node-version: 18.14.0
- run: yarn
working-directory: modules/web
- run: node hack/version.mjs
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-node@v3
with:
node-version: 16.15.0
node-version: 18.14.0
- run: yarn
- run: node hack/version.mjs
- run: yarn check
Expand All @@ -59,7 +59,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-node@v3
with:
node-version: 16.15.0
node-version: 18.14.0
- run: yarn
- run: node hack/version.mjs
- run: yarn coverage
Expand Down
2 changes: 1 addition & 1 deletion docs/developer/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Make sure the following software is installed and added to the `$PATH` variable:
* Docker 23.0.1+ ([installation manual](https://docs.docker.com/engine/installation/linux/docker-ce/ubuntu/))
* Golang 1.19+ ([installation manual](https://golang.org/dl/))
* Dashboard uses `go mod` for go dependency management.
* Node.js 16.14.2+ and yarn ([installation with nvm](https://github.com/creationix/nvm#usage))
* Node.js 18.14.0+ and yarn ([installation with nvm](https://github.com/creationix/nvm#usage))

Clone the repository and install the dependencies:

Expand Down
2 changes: 1 addition & 1 deletion hack/develop/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ FROM golang:1.19.0-bullseye
# Install Node.js. Go is already installed.
# A small tweak, apt-get update is already run by the nodejs setup script,
# so there's no need to run it again.
RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - \
RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - \
&& apt-get install -y --no-install-recommends \
nodejs \
patch \
Expand Down
96 changes: 48 additions & 48 deletions modules/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"url": "https://github.com/kubernetes/dashboard.git"
},
"engines": {
"node": ">=16.15.0"
"node": ">=18.14.0"
},
"engineStrict": true,
"packageManager": "[email protected]",
Expand Down Expand Up @@ -45,49 +45,49 @@
"src/**/*.html": []
},
"dependencies": {
"@angular/animations": "14.2.3",
"@angular/cdk": "14.2.2",
"@angular/common": "14.2.3",
"@angular/compiler": "14.2.3",
"@angular/core": "14.2.3",
"@angular/flex-layout": "14.0.0-beta.40",
"@angular/forms": "14.2.3",
"@angular/localize": "14.2.3",
"@angular/animations": "15.1.4",
"@angular/cdk": "15.1.4",
"@angular/common": "15.1.4",
"@angular/compiler": "15.1.4",
"@angular/core": "15.1.4",
"@angular/flex-layout": "15.0.0-beta.42",
"@angular/forms": "15.1.4",
"@angular/localize": "15.1.4",
"@angular/material": "14.2.2",
"@angular/platform-browser": "14.2.3",
"@angular/platform-browser-dynamic": "14.2.3",
"@angular/router": "14.2.3",
"@angular/platform-browser": "15.1.4",
"@angular/platform-browser-dynamic": "15.1.4",
"@angular/router": "15.1.4",
"@swimlane/ngx-charts": "20.1.0",
"ace-builds": "1.11.1",
"core-js": "3.25.2",
"ace-builds": "1.15.0",
"core-js": "3.27.2",
"crop-url": "4.0.1",
"d3-shape": "3.1.0",
"d3-shape": "3.2.0",
"d3-time-format": "4.1.0",
"file-saver": "2.0.5",
"js-base64": "3.7.2",
"js-base64": "3.7.5",
"js-yaml": "4.1.0",
"jwt-decode": "3.1.2",
"material-design-icons": "3.0.1",
"ngx-cookie-service": "14.0.1",
"ngx-pipes": "3.1.0",
"ngx-pipes": "3.2.0",
"normalize.css": "8.0.1",
"roboto-fontface": "0.10.0",
"rxjs": "7.5.6",
"rxjs": "7.8.0",
"rxjs-compat": "6.6.7",
"sockjs-client": "1.6.1",
"strip-ansi": "6.0.1",
"systemjs": "6.12.6",
"tslib": "2.4.0",
"systemjs": "6.13.0",
"tslib": "2.5.0",
"web-animations-js": "2.3.2",
"xterm": "4.18.0",
"xterm-addon-fit": "0.6.0",
"zone.js": "0.11.8"
},
"devDependencies": {
"@angular-devkit/build-angular": "14.2.3",
"@angular/cli": "14.2.3",
"@angular/compiler-cli": "14.2.3",
"@angular/language-service": "14.2.3",
"@angular-devkit/build-angular": "15.1.5",
"@angular/cli": "15.1.5",
"@angular/compiler-cli": "15.1.4",
"@angular/language-service": "15.1.4",
"@babel/core": "7.19.1",
"@babel/preset-env": "7.19.1",
"@babel/register": "7.18.9",
Expand All @@ -100,52 +100,52 @@
"@types/jest": "29.0.3",
"@types/js-yaml": "4.0.5",
"@types/lodash-es": "4.17.6",
"@types/node": "18.7.18",
"@types/node": "18.13.0",
"@typescript-eslint/eslint-plugin": "5.38.0",
"@typescript-eslint/parser": "5.38.0",
"codelyzer": "6.0.2",
"concurrently": "7.4.0",
"concurrently": "7.6.0",
"cypress": "9.7.0",
"cypress-fail-fast": "5.0.1",
"del": "6.1.1",
"eslint": "8.23.1",
"eslint": "8.33.0",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-rxjs": "5.0.2",
"git-describe": "4.1.1",
"gts": "3.1.1",
"husky": "8.0.1",
"jasmine-core": "4.4.0",
"husky": "8.0.3",
"jasmine-core": "4.5.0",
"jasmine-spec-reporter": "7.0.0",
"jest": "28.1.0",
"jest-preset-angular": "12.2.2",
"js-beautify": "1.14.6",
"jest": "29.4.2",
"jest-preset-angular": "12.2.6",
"js-beautify": "1.14.7",
"license-check-and-add": "4.0.5",
"lint-staged": "13.0.3",
"lint-staged": "13.1.1",
"lodash-es": "4.17.21",
"minimatch": "5.1.0",
"minimist": "1.2.6",
"minimist": "1.2.8",
"ng-extract-i18n-merge": "1.4.0",
"node-gyp": "9.1.0",
"node-gyp": "9.3.1",
"q": "1.5.1",
"raw-loader": "4.0.2",
"run-node": "2.0.0",
"sass": "1.55.0",
"sass-loader": "13.0.2",
"semver": "7.3.7",
"source-map-explorer": "2.5.2",
"stylelint": "14.12.1",
"stylelint-config-standard-scss": "5.0.0",
"stylelint-no-unsupported-browser-features": "5.0.4",
"stylelint-order": "5.0.0",
"tar": "6.1.11",
"sass": "1.58.0",
"sass-loader": "13.2.0",
"semver": "7.3.8",
"source-map-explorer": "2.5.3",
"stylelint": "15.0.0",
"stylelint-config-standard-scss": "6.1.0",
"stylelint-no-unsupported-browser-features": "6.0.1",
"stylelint-order": "6.0.2",
"tar": "6.1.13",
"through2": "4.0.2",
"ts-jest": "29.0.1",
"ts-loader": "9.4.1",
"ts-jest": "29.0.5",
"ts-loader": "9.4.2",
"ts-node": "10.9.1",
"typescript": "4.8.3",
"typescript": "4.9.5",
"wait-on": "6.0.1",
"webpack-bundle-analyzer": "4.6.1",
"webpack-bundle-analyzer": "4.7.0",
"webpack-dev-server": "4.11.1"
},
"overrides": {
Expand Down
9 changes: 7 additions & 2 deletions modules/web/src/test.base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,10 @@ import './test.base.mocks';
import {jest} from '@jest/globals';

// Async operations timeout
// eslint-disable-next-line @typescript-eslint/no-magic-numbers
jest.setTimeout(15000);
const timeout = 15000;
jest.setTimeout(timeout);

// Polyfill text encoder and decoder ot fix tests
import {TextEncoder, TextDecoder} from 'util';
global.TextEncoder = TextEncoder;
global.TextDecoder = TextDecoder;
5 changes: 3 additions & 2 deletions modules/web/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"outDir": ".tmp/out-tsc",
"moduleResolution": "Node",
"target": "ES2020",
"target": "ES2022",
"module": "ES2020",
"sourceMap": true,
"emitDecoratorMetadata": true,
Expand All @@ -31,6 +31,7 @@
"lib": [
"ES2020",
"dom"
]
],
"useDefineForClassFields": false
}
}
Loading

0 comments on commit 578974d

Please sign in to comment.