From 60cdbbbf1a9f2631f0703f7c69f8d0cbbb9b6522 Mon Sep 17 00:00:00 2001 From: plouc Date: Wed, 15 Dec 2021 23:09:57 +0900 Subject: [PATCH] feat(build): fix build after upgrading a bunch of dependencies --- .codesandbox/ci.json | 2 +- babel.config.js | 6 +++++- conf/rollup.config.js | 6 ++++-- package.json | 9 +++------ packages/network/src/NetworkCanvas.js | 6 +++--- tsconfig.json | 9 +++++---- tslint.json | 23 ----------------------- 7 files changed, 21 insertions(+), 40 deletions(-) delete mode 100644 tslint.json diff --git a/.codesandbox/ci.json b/.codesandbox/ci.json index 98256e453a..02624636dd 100644 --- a/.codesandbox/ci.json +++ b/.codesandbox/ci.json @@ -3,5 +3,5 @@ "buildCommand": false, "packages": ["packages/*"], "sandboxes": ["/examples/codesandbox", "/website"], - "node": "14" + "node": "16" } diff --git a/babel.config.js b/babel.config.js index 9dcb7e43cf..0b3f1cb383 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,3 +1,7 @@ module.exports = { - presets: [['react-app', { runtime: 'automatic', typescript: true }]], + presets: [ + ["@babel/preset-env", { loose: true }], + "@babel/preset-react", + "@babel/preset-typescript", + ], } diff --git a/conf/rollup.config.js b/conf/rollup.config.js index 885fc3acba..9d46e3a863 100644 --- a/conf/rollup.config.js +++ b/conf/rollup.config.js @@ -6,6 +6,7 @@ import stripBanner from 'rollup-plugin-strip-banner' import cleanup from 'rollup-plugin-cleanup' import size from 'rollup-plugin-size' import visualizer from 'rollup-plugin-visualizer' +import { terser } from "rollup-plugin-terser" const pkg = process.env.PACKAGE const isWatching = process.env.ROLLUP_WATCH === 'TRUE' @@ -13,8 +14,8 @@ const isWatching = process.env.ROLLUP_WATCH === 'TRUE' const extensions = ['.js', '.jsx', '.es6', '.es', '.mjs', '.ts', '.tsx'] const babelConfig = { extensions, - exclude: 'node_modules/**', - babelHelpers: 'runtime', + exclude: /node_modules/, + babelHelpers: 'bundled', comments: false, plugins: ['lodash'], } @@ -63,6 +64,7 @@ const commonPlugins = [ modulesOnly: true, }), babel(babelConfig), + !isWatching && terser(), cleanup() ] diff --git a/package.json b/package.json index 526b90a62e..eb6be67108 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "url": "https://github.com/plouc" }, "keywords": [], - "devDependencies": { + "dependencies": { "@babel/core": "^7.16.5", "@ekino/config": "^0.3.0", "@nivo/generators": "*", @@ -43,7 +43,6 @@ "babel-jest": "^24.9.0", "babel-loader": "^8.2.3", "babel-plugin-lodash": "^3.3.4", - "babel-preset-react-app": "^10.0.1", "chalk": "^2.4.2", "core-js": "^3.19.3", "enzyme": "^3.11.0", @@ -61,6 +60,7 @@ "jsdom": "^16.2.2", "lerna": "^3.22.1", "lodash": "^4.17.21", + "npm-normalize-package-bin": "^1.0.1", "prettier": "^2.5.1", "prop-types": "^15.7.2", "puppeteer": "^0.13.0", @@ -73,6 +73,7 @@ "rollup-plugin-prettier": "^2.2.0", "rollup-plugin-size": "^0.2.2", "rollup-plugin-strip-banner": "^2.0.0", + "rollup-plugin-terser": "^7.0.2", "rollup-plugin-visualizer": "^5.5.2", "serve": "^13.0.2", "typescript": "^4.5.4" @@ -95,10 +96,6 @@ "api", "website" ], - "dependencies": { - "npm-normalize-package-bin": "^1.0.1", - "rollup-plugin-terser": "^7.0.2" - }, "engines": { "node": "16.x" } diff --git a/packages/network/src/NetworkCanvas.js b/packages/network/src/NetworkCanvas.js index 427663c390..648ce092ad 100644 --- a/packages/network/src/NetworkCanvas.js +++ b/packages/network/src/NetworkCanvas.js @@ -129,7 +129,7 @@ const NetworkCanvas = props => { ]) const getNodeFromMouseEvent = useCallback( - (event: MouseEvent) => { + (event) => { if (!canvasEl.current) return null const [x, y] = getRelativeCursor(canvasEl.current, event) @@ -150,7 +150,7 @@ const NetworkCanvas = props => { const { showTooltipFromEvent, hideTooltip } = useTooltip() const handleMouseHover = useCallback( - (event: React.MouseEvent) => { + (event) => { const node = getNodeFromMouseEvent(event) if (node) { showTooltipFromEvent(, event) @@ -166,7 +166,7 @@ const NetworkCanvas = props => { }, [hideTooltip]) const handleClick = useCallback( - (event: React.MouseEvent) => { + (event) => { if (!onClick) return const node = getNodeFromMouseEvent(event) diff --git a/tsconfig.json b/tsconfig.json index c85c3f3459..b63328b97c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,8 +3,10 @@ "esModuleInterop": true, "isolatedModules": true, "jsx": "react-jsx", - "lib": ["ESNext", "dom"], - "target": "es5", + "lib": ["ES2020", "DOM", "DOM.Iterable"], + "target": "ES2020", + "module": "ES2020", + "moduleResolution": "node", "noEmit": true, "noImplicitAny": true, "noImplicitReturns": false, @@ -15,8 +17,7 @@ "strict": true, "allowJs": true, "composite": true, - "declarationMap": true, - "moduleResolution": "node" + "declarationMap": true }, "include": ["./packages/*/index.d.ts"] } diff --git a/tslint.json b/tslint.json deleted file mode 100644 index 35d6d6acd9..0000000000 --- a/tslint.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "extends": ["tslint:latest"], - "rules": { - "semicolon": [true, "never"], - "quotemark": [true, "single", "jsx-double"], - "ordered-imports": false, - "max-classes-per-file": false, - "interface-name": false, - "no-empty-interface": false, - "trailing-comma": [ - true, - { - "multiline": { - "objects": "always", - "arrays": "always", - "functions": "ignore", - "typeLiterals": "ignore" - }, - "esSpecCompliant": true - } - ] - } -}