Skip to content

chore: dependencies & node 21 #819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Use Node.js 20
- name: Use Node.js 21
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 21
- name: install
run: |
corepack enable
Expand Down Expand Up @@ -56,10 +56,10 @@ jobs:
fail-fast: false
steps:
- uses: actions/checkout@v3
- name: Use Node.js 20
- name: Use Node.js 21
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 21
- name: browser versions
run: |
firefox --version
Expand Down Expand Up @@ -101,10 +101,10 @@ jobs:
- e2e
steps:
- uses: actions/checkout@v3
- name: Use Node.js 20
- name: Use Node.js 21
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 21
- name: finalize percy
run: |
corepack enable
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20
21
7 changes: 6 additions & 1 deletion cypress/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,10 @@
"@percy/cypress"
]
},
"include": ["**/*.ts", "support/index.ts"]
"include": [
"**/*.ts",
"support/index.ts",
".eslintrc.cjs",
"plugins/index.js"
]
}
48 changes: 24 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "",
"license": "MIT",
"engines": {
"node": "^20.0.0"
"node": "^21"
},
"private": true,
"engineStrict": true,
Expand Down Expand Up @@ -46,7 +46,7 @@
"build": "run-s build:clean build:server build:client",
"dev": "SWCRC=1 node -r @swc-node/register src/server/index.ts",
"lint": "run-p lint:eslint lint:prettier",
"lint:eslint": "eslint --ext .js,.jsx,.ts,.tsx scripts cypress src",
"lint:eslint": "eslint --ext .cjs,.mjs,.js,.jsx,.ts,.tsx scripts cypress src",
"lint:prettier": "prettier -c src scripts cypress",
"test": "run-p lint test:jest test:ts",
"test:jest": "jest",
Expand Down Expand Up @@ -98,52 +98,51 @@
"@types/cookie": "0.6.0",
"@types/core-js": "2.5.8",
"@types/debounce-promise": "3.1.9",
"@types/diff": "5.0.8",
"@types/diff": "5.0.9",
"@types/ejs": "3.1.5",
"@types/eslint": "8.44.8",
"@types/jest": "^29.5.10",
"@types/jest": "^29.5.11",
"@types/koa": "2.13.12",
"@types/koa-bodyparser": "4.3.12",
"@types/koa-static": "4.0.4",
"@types/koa__router": "12.0.4",
"@types/leaflet": "^1.9.8",
"@types/loadable__component": "5.13.7",
"@types/loadable__server": "5.12.9",
"@types/node": "^20.10.1",
"@types/loadable__component": "5.13.8",
"@types/loadable__server": "5.12.10",
"@types/node": "^20.10.4",
"@types/qs": "6.9.10",
"@types/react": "18.2.39",
"@types/react": "18.2.43",
"@types/react-dom": "18.2.17",
"@types/react-router": "5.1.20",
"@types/react-router-dom": "5.3.3",
"@types/uuid": "^9.0.7",
"@types/webpack": "^5.28.5",
"@types/webpack-bundle-analyzer": "4.6.3",
"@types/webpack-hot-middleware": "2.25.9",
"browserslist": "^4.22.1",
"browserslist": "^4.22.2",
"chokidar": "^3.5.3",
"compression-webpack-plugin": "^10.0.0",
"css-loader": "^6.8.1",
"cypress": "^13.6.0",
"eslint": "^8.54.0",
"eslint-config-marudor": "9.3.2",
"cypress": "^13.6.1",
"eslint": "^8.55.0",
"eslint-config-marudor": "9.4.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-import-resolver-webpack": "^0.13.8",
"eslint-plugin-cypress": "^2.15.1",
"eslint-plugin-import": "^2.29.0",
"jest": "^29.7.0",
"jest-watch-typeahead": "^2.2.2",
"json5": "^2.2.3",
"lint-staged": "^15.1.0",
"lint-staged": "^15.2.0",
"ncp": "^2.0.0",
"nock": "^13.4.0",
"npm-run-all": "^4.1.5",
"prettier": "^3.1.0",
"prettier": "^3.1.1",
"react-refresh": "^0.14.0",
"rimraf": "^5.0.5",
"style-loader": "^3.3.3",
"swc-loader": "^0.2.3",
"terser-webpack-plugin": "^5.3.9",
"typescript": "^5.3.2",
"typescript": "^5.3.3",
"url-loader": "^4.1.1",
"webpack": "^5.89.0",
"webpack-cli": "^5.1.4",
Expand All @@ -161,16 +160,16 @@
"@loadable/component": "^5.15.3",
"@loadable/server": "^5.16.1",
"@mui/icons-material": "^5.14.19",
"@mui/material": "^5.14.19",
"@mui/system": "^5.14.19",
"@mui/x-date-pickers": "6.18.2",
"@styled/typescript-styled-plugin": "^1.0.0",
"@mui/material": "^5.14.20",
"@mui/system": "^5.14.20",
"@mui/x-date-pickers": "6.18.4",
"@styled/typescript-styled-plugin": "^1.0.1",
"@swc/helpers": "^0.5.3",
"@tsoa/runtime": "6.0.0-rc.2",
"axios": "^1.6.2",
"constate": "^3.3.2",
"cookie": "^0.6.0",
"core-js": "^3.33.3",
"core-js": "^3.34.0",
"date-fns": "^2.30.0",
"date-fns-tz": "^2.0.0",
"debounce-promise": "^3.1.2",
Expand All @@ -195,8 +194,8 @@
"react-dom": "^18.2.0",
"react-head": "^3.4.2",
"react-leaflet": "^3.2.5",
"react-router": "^6.20.0",
"react-router-dom": "^6.20.0",
"react-router": "^6.20.1",
"react-router-dom": "^6.20.1",
"universal-cookie": "^6.1.1",
"uuid": "^9.0.1"
},
Expand All @@ -220,7 +219,8 @@
"axios": "^1.6.2"
},
"patchedDependencies": {
"cypress@13.6.0": "patches/cypress@13.6.0.patch"
"cypress@13.6.1": "patches/cypress@13.6.1.patch",
"@cypress/webpack-preprocessor@6.0.0": "patches/@cypress__webpack-preprocessor@6.0.0.patch"
}
}
}
33 changes: 33 additions & 0 deletions patches/@cypress__webpack-preprocessor@6.0.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
diff --git a/dist/index.d.ts b/dist/index.d.ts
index adf4216bd4fc0de14f12a95695778f233b71b4f8..4ca47ecef0fbe4c2c25c45f1dfaf167f379f58fe 100644
--- a/dist/index.d.ts
+++ b/dist/index.d.ts
@@ -1,5 +1,4 @@
/// <reference types="node" />
-import Bluebird from 'bluebird';
import * as events from 'events';
import webpack from 'webpack';
declare type FilePath = string;
@@ -21,7 +20,7 @@ interface FileEvent extends events.EventEmitter {
* Cypress asks file preprocessor to bundle the given file
* and return the full path to produced bundle.
*/
-declare type FilePreprocessor = (file: FileEvent) => Bluebird<FilePath>;
+declare type FilePreprocessor = (file: FileEvent) => Promise<FilePath>;
declare type WebpackPreprocessorFn = (options: PreprocessorOptions) => FilePreprocessor;
/**
* Cypress file preprocessor that can bundle specs
diff --git a/dist/lib/utils.d.ts b/dist/lib/utils.d.ts
index f3fcfcbaf51199c9af5ac6db84410427c0aa03d1..1511e71f9de1869cee66deb19636eb75ac37434e 100644
--- a/dist/lib/utils.d.ts
+++ b/dist/lib/utils.d.ts
@@ -1,8 +1,7 @@
-import Bluebird from 'bluebird';
declare function createDeferred<T>(): {
resolve: (thenableOrResult?: T | PromiseLike<T> | undefined) => void;
reject: any;
- promise: Bluebird<T>;
+ promise: Promise<T>;
};
declare const _default: {
createDeferred: typeof createDeferred;
File renamed without changes.
Loading