Skip to content
This repository was archived by the owner on Oct 11, 2024. It is now read-only.

Commit 649fe18

Browse files
committed
Update node version and patch material ui types
1 parent 0ba5014 commit 649fe18

File tree

5 files changed

+199
-11
lines changed

5 files changed

+199
-11
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v12
1+
v14

package.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@0x/website",
33
"version": "0.0.89",
44
"engines": {
5-
"node": ">=12 <13"
5+
"node": ">=14 <15"
66
},
77
"private": true,
88
"description": "Website and 0x portal dapp",
@@ -25,7 +25,8 @@
2525
"deploy_live": "npm run update:tools && yarn index_docs --environment production && DEPLOY_ROLLBAR_SOURCEMAPS=true npm run build:prod && aws s3 sync ./public/. s3://0x.org --profile $(npm config get awscli_profile) --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --exclude *.map.js && ./cdn-cache-clear.sh live",
2626
"index_docs": "TS_NODE_PROJECT=./tsconfig-indexing.json node --stack-size=16000 -r ts-node/register scripts/algolia_index.ts",
2727
"prettier": "prettier --write \"ts/**/*.{ts,tsx,js,json,css,yml,md}\"",
28-
"lint:prettier": "prettier --check \"ts/**/*.{ts,tsx,js,json,css,yml,md}\""
28+
"lint:prettier": "prettier --check \"ts/**/*.{ts,tsx,js,json,css,yml,md}\"",
29+
"postinstall": "patch-package"
2930
},
3031
"resolutions": {
3132
"node-hid": "2.1.1",
@@ -91,7 +92,9 @@
9192
"moment-timezone": "^0.5.33",
9293
"nice-color-palettes": "^3.0.0",
9394
"numeral": "^2.0.6",
95+
"patch-package": "^6.4.7",
9496
"polished": "^1.9.2",
97+
"postinstall-postinstall": "^2.1.0",
9598
"query-string": "^6.0.0",
9699
"rc-slider": "^8.6.3",
97100
"react": "^16.12.0",
@@ -204,10 +207,11 @@
204207
"terser-webpack-plugin": "^1.4.1",
205208
"to-vfile": "^6.0.0",
206209
"ts-jest": "^24.2.0",
210+
"ts-loader": "^8.2.0",
207211
"ts-node": "^8.3.0",
208212
"tslint": "5.11.0",
209213
"tslint-config-0xproject": "^0.0.2",
210-
"typescript": "^3.8.3",
214+
"typescript": "^4.0.0",
211215
"unist-util-find-after": "^2.0.4",
212216
"unist-util-modify-children": "^1.1.4",
213217
"unist-util-select": "^2.0.2",
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/node_modules/@types/material-ui/index.d.ts b/node_modules/@types/material-ui/index.d.ts
2+
index 2d8631e..de3e6f2 100644
3+
--- a/node_modules/@types/material-ui/index.d.ts
4+
+++ b/node_modules/@types/material-ui/index.d.ts
5+
@@ -1284,6 +1284,7 @@ declare namespace __MaterialUI {
6+
anchorOrigin?: propTypes.origin;
7+
animated?: boolean;
8+
animation?: React.ComponentClass<Popover.PopoverAnimationProps>;
9+
+ autoWidth?: boolean;
10+
className?: string;
11+
disabled?: boolean;
12+
iconButton?: React.ReactNode;

webpack.config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,8 @@ module.exports = (_env, argv) => {
5353
},
5454
{
5555
test: /\.tsx?$/,
56-
loader: 'awesome-typescript-loader',
56+
loader: 'ts-loader',
5757
options: {
58-
useCache: true,
5958
// Skip type checking for local dev, can be done in editor and pre-push
6059
transpileOnly: isDevEnvironment,
6160
},

0 commit comments

Comments
 (0)