From aaa99ae140dcf845ab70ff5ba4be20f8153eec8f Mon Sep 17 00:00:00 2001 From: Vova Kulikov Date: Wed, 21 Sep 2022 22:23:38 +0300 Subject: [PATCH] Remove reactstrap (#41868) * Remove reactstrap * Remove popper.js mock * Remove popper.js mock from the jest config --- .eslintrc.js | 10 ---- client/shared/dev/mockPopper.ts | 19 ------- jest.config.base.js | 1 - package.json | 2 - yarn.lock | 94 ++------------------------------- 5 files changed, 3 insertions(+), 123 deletions(-) delete mode 100644 client/shared/dev/mockPopper.ts diff --git a/.eslintrc.js b/.eslintrc.js index f04af4cf3eb..a91f65bd07a 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -54,22 +54,12 @@ const config = { importNames: ['Link'], message: 'Use the component from @sourcegraph/wildcard instead.', }, - { - name: 'reactstrap', - importNames: ['Form'], - message: 'Use the
component from @sourcegraph/branded package instead', - }, { name: 'zustand', importNames: ['default'], message: 'Our Zustand stores should be created in a single place. Create this store in client/web/src/stores', }, - { - name: 'reactstrap', - message: - 'Please use components from the Wildcard component library instead. We work on removing `reactstrap` dependency.', - }, { name: 'chromatic/isChromatic', message: 'Please use `isChromatic` from the `@sourcegraph/storybook` package.', diff --git a/client/shared/dev/mockPopper.ts b/client/shared/dev/mockPopper.ts deleted file mode 100644 index 35fea73a528..00000000000 --- a/client/shared/dev/mockPopper.ts +++ /dev/null @@ -1,19 +0,0 @@ -/* - https://github.com/react-bootstrap/react-bootstrap/issues/4997 - Popper causes "Warning: `NaN` is an invalid value for the `left` css style property." - This mock prevents that. -*/ -jest.mock('popper.js', () => { - const StockPopperJs = jest.requireActual('popper.js') - - return function PopperJs() { - const placements = StockPopperJs.placements - - return { - destroy: () => {}, - scheduleUpdate: () => {}, - update: () => {}, - placements, - } - } -}) diff --git a/jest.config.base.js b/jest.config.base.js index d3bd854d6c3..d7945768f9b 100644 --- a/jest.config.base.js +++ b/jest.config.base.js @@ -55,7 +55,6 @@ const config = { // Needed for reusing API functions that use fetch // Neither NodeJS nor JSDOM have fetch + AbortController yet require.resolve('abort-controller/polyfill'), - path.join(__dirname, 'client/shared/dev/mockPopper.ts'), path.join(__dirname, 'client/shared/dev/fetch'), path.join(__dirname, 'client/shared/dev/setLinkComponentForTest.ts'), path.join(__dirname, 'client/shared/dev/mockDomRect.ts'), diff --git a/package.json b/package.json index 51089e2a296..cc1216cc4bf 100644 --- a/package.json +++ b/package.json @@ -210,7 +210,6 @@ "@types/react-grid-layout": "1.3.0", "@types/react-router": "^5.1.18", "@types/react-router-dom": "^5.3.3", - "@types/reactstrap": "8.4.2", "@types/recharts": "1.8.23", "@types/resize-observer-browser": "0.1.4", "@types/rimraf": "^3.0.2", @@ -467,7 +466,6 @@ "react-spring": "^9.4.2", "react-sticky-box": "1.0.2", "react-visibility-sensor": "^5.1.1", - "reactstrap": "^8.9.0", "recharts": "^1.8.5", "regexpp": "^3.1.0", "rxjs": "^6.6.3", diff --git a/yarn.lock b/yarn.lock index 0ca91f2479b..d1211e8f4bf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8542,16 +8542,6 @@ __metadata: languageName: node linkType: hard -"@types/reactstrap@npm:8.4.2": - version: 8.4.2 - resolution: "@types/reactstrap@npm:8.4.2" - dependencies: - "@types/react": "*" - popper.js: ^1.14.1 - checksum: 264e35e0f16d2ceddfb010d834f6432728660d2a04e7c6f7c91b31567a53c317e0d6f69fdd5028b65c21495f59f06e9d8dba4b0265258460853c0c2b8042c4a7 - languageName: node - linkType: hard - "@types/recharts@npm:1.8.23": version: 1.8.23 resolution: "@types/recharts@npm:1.8.23" @@ -12421,7 +12411,7 @@ __metadata: languageName: node linkType: hard -"classnames@npm:2.3.1, classnames@npm:^2.2.3, classnames@npm:^2.2.5, classnames@npm:^2.2.6, classnames@npm:^2.3.1": +"classnames@npm:2.3.1, classnames@npm:^2.2.5, classnames@npm:^2.2.6, classnames@npm:^2.3.1": version: 2.3.1 resolution: "classnames@npm:2.3.1" checksum: 14db8889d56c267a591f08b0834989fe542d47fac659af5a539e110cc4266694e8de86e4e3bbd271157dbd831361310a8293e0167141e80b0f03a0f175c80960 @@ -13326,19 +13316,6 @@ __metadata: languageName: node linkType: hard -"create-react-context@npm:^0.3.0": - version: 0.3.0 - resolution: "create-react-context@npm:0.3.0" - dependencies: - gud: ^1.0.0 - warning: ^4.0.3 - peerDependencies: - prop-types: ^15.0.0 - react: ^0.14.0 || ^15.0.0 || ^16.0.0 - checksum: e59b7a65671e59f5b11e06f67faadf0733ab6c33247d5631331aeb05450d180b8ae44d73817b9c02f1527654ba490ea3d3dd7320f8d6debb36776f10b0ae6a47 - languageName: node - linkType: hard - "create-require@npm:^1.1.0": version: 1.1.1 resolution: "create-require@npm:1.1.1" @@ -14785,7 +14762,7 @@ __metadata: languageName: node linkType: hard -"deep-equal@npm:^1.0.1, deep-equal@npm:^1.1.1": +"deep-equal@npm:^1.0.1": version: 1.1.1 resolution: "deep-equal@npm:1.1.1" dependencies: @@ -18861,13 +18838,6 @@ __metadata: languageName: node linkType: hard -"gud@npm:^1.0.0": - version: 1.0.0 - resolution: "gud@npm:1.0.0" - checksum: 3e2eb37cf794364077c18f036d6aa259c821c7fd188f2b7935cb00d589d82a41e0ebb1be809e1a93679417f62f1ad0513e745c3cf5329596e489aef8c5e5feae - languageName: node - linkType: hard - "gulp-cli@npm:^2.2.0": version: 2.2.0 resolution: "gulp-cli@npm:2.2.0" @@ -26014,13 +25984,6 @@ __metadata: languageName: node linkType: hard -"popper.js@npm:^1.14.1, popper.js@npm:^1.14.4": - version: 1.15.0 - resolution: "popper.js@npm:1.15.0" - checksum: 49375758d98154563c841fb050450f263e70c7108989a5bfefd6b556f883e081492004efa48ea1efd3728f657e896a8cc86153bc5f86fe26246d7334c6ee1c2f - languageName: node - linkType: hard - "portfinder@npm:^1.0.28": version: 1.0.28 resolution: "portfinder@npm:1.0.28" @@ -27479,23 +27442,6 @@ pvutils@latest: languageName: node linkType: hard -"react-popper@npm:^1.3.6": - version: 1.3.7 - resolution: "react-popper@npm:1.3.7" - dependencies: - "@babel/runtime": ^7.1.2 - create-react-context: ^0.3.0 - deep-equal: ^1.1.1 - popper.js: ^1.14.4 - prop-types: ^15.6.1 - typed-styles: ^0.0.7 - warning: ^4.0.2 - peerDependencies: - react: 0.14.x || ^15.0.0 || ^16.0.0 - checksum: 9ba10e852d6a6d8d8b0a8e5482307b656254addec66c37969ff14516067f564281e6a54ca4a18a7c790cbafbf405d0d152f288729e61cb28274371838923da59 - languageName: node - linkType: hard - "react-refresh@npm:^0.10.0": version: 0.10.0 resolution: "react-refresh@npm:0.10.0" @@ -27771,7 +27717,7 @@ pvutils@latest: languageName: node linkType: hard -"react-transition-group@npm:^2.3.1, react-transition-group@npm:^2.5.0": +"react-transition-group@npm:^2.5.0": version: 2.9.0 resolution: "react-transition-group@npm:2.9.0" dependencies: @@ -27834,22 +27780,6 @@ pvutils@latest: languageName: node linkType: hard -"reactstrap@npm:^8.9.0": - version: 8.9.0 - resolution: "reactstrap@npm:8.9.0" - dependencies: - "@babel/runtime": ^7.12.5 - classnames: ^2.2.3 - prop-types: ^15.5.8 - react-popper: ^1.3.6 - react-transition-group: ^2.3.1 - peerDependencies: - react: ">=16.3.0" - react-dom: ">=16.3.0" - checksum: 5dfd29583c5bff0aaa5443bc73031951b3073604042599e8283302494cbbca11769149fa49f71482cde9deec1ad38068274216d7545a93c51b8c04a5d1933009 - languageName: node - linkType: hard - "read-installed@npm:~4.0.3": version: 4.0.3 resolution: "read-installed@npm:4.0.3" @@ -28984,7 +28914,6 @@ pvutils@latest: "@types/react-resizable": ^3.0.2 "@types/react-router": ^5.1.18 "@types/react-router-dom": ^5.3.3 - "@types/reactstrap": 8.4.2 "@types/recharts": 1.8.23 "@types/resize-observer-browser": 0.1.4 "@types/rimraf": ^3.0.2 @@ -29169,7 +29098,6 @@ pvutils@latest: react-spring: ^9.4.2 react-sticky-box: 1.0.2 react-visibility-sensor: ^5.1.1 - reactstrap: ^8.9.0 recharts: ^1.8.5 regexpp: ^3.1.0 rimraf: ^3.0.2 @@ -32189,13 +32117,6 @@ pvutils@latest: languageName: node linkType: hard -"typed-styles@npm:^0.0.7": - version: 0.0.7 - resolution: "typed-styles@npm:0.0.7" - checksum: 36a6ad6bee008c15ddb8c2425eaf9aee37d2841985b4c44406ea4cf57080a9c30b6f9f3feb842ac952354733ac53299ee44f68d83f734486e8344d413f8c8c0d - languageName: node - linkType: hard - "typedarray-to-buffer@npm:^3.1.5": version: 3.1.5 resolution: "typedarray-to-buffer@npm:3.1.5" @@ -33366,15 +33287,6 @@ pvutils@latest: languageName: node linkType: hard -"warning@npm:^4.0.2, warning@npm:^4.0.3": - version: 4.0.3 - resolution: "warning@npm:4.0.3" - dependencies: - loose-envify: ^1.0.0 - checksum: 4f2cb6a9575e4faf71ddad9ad1ae7a00d0a75d24521c193fa464f30e6b04027bd97aa5d9546b0e13d3a150ab402eda216d59c1d0f2d6ca60124d96cd40dfa35c - languageName: node - linkType: hard - "watchpack@npm:^2.2.0, watchpack@npm:^2.4.0": version: 2.4.0 resolution: "watchpack@npm:2.4.0"