diff --git a/packages/webextension/app/scripts/InstalledApp/pages/EditPage.tsx b/packages/webextension/app/scripts/InstalledApp/pages/EditPage.tsx index a742f52..8496a2a 100644 --- a/packages/webextension/app/scripts/InstalledApp/pages/EditPage.tsx +++ b/packages/webextension/app/scripts/InstalledApp/pages/EditPage.tsx @@ -1,6 +1,6 @@ import React, { useCallback, useEffect, useMemo, useState } from "react"; import { TextlintrcEditor } from "../component/TextlintrcEditor"; -import { RouteComponentProps } from "@reach/router"; +import { RouteComponentProps } from "@gatsbyjs/reach-router"; import { usePort } from "../StateContext"; import "./EditPage.css"; import { ActionButton, Flex, Form, TextField, Text, Link } from "@adobe/react-spectrum"; diff --git a/packages/webextension/app/scripts/InstalledApp/pages/InstalledAppPage.tsx b/packages/webextension/app/scripts/InstalledApp/pages/InstalledAppPage.tsx index 5d42a3b..87ad84f 100644 --- a/packages/webextension/app/scripts/InstalledApp/pages/InstalledAppPage.tsx +++ b/packages/webextension/app/scripts/InstalledApp/pages/InstalledAppPage.tsx @@ -1,6 +1,6 @@ import React from "react"; import { InstalledTextlintList } from "../component/InstalledTextlintList"; -import { RouteComponentProps } from "@reach/router"; +import { RouteComponentProps } from "@gatsbyjs/reach-router"; export const InstalledAppPage = (_props: RouteComponentProps) => { return ( diff --git a/packages/webextension/app/scripts/edit-script.tsx b/packages/webextension/app/scripts/edit-script.tsx index 81d1cb2..3f416b5 100644 --- a/packages/webextension/app/scripts/edit-script.tsx +++ b/packages/webextension/app/scripts/edit-script.tsx @@ -2,7 +2,7 @@ import * as React from "react"; import * as ReactDOM from "react-dom"; import { AppStateProvider } from "./InstalledApp/StateContext"; import { Provider, defaultTheme } from "@adobe/react-spectrum"; -import { Router } from "@reach/router"; +import { Router } from "@gatsbyjs/reach-router"; import { EditPage } from "./InstalledApp/pages/EditPage"; const url = new URL(location.href); diff --git a/packages/webextension/app/scripts/popup.tsx b/packages/webextension/app/scripts/popup.tsx index 8c93362..f725f5c 100644 --- a/packages/webextension/app/scripts/popup.tsx +++ b/packages/webextension/app/scripts/popup.tsx @@ -1,6 +1,6 @@ import * as React from "react"; import * as ReactDOM from "react-dom"; -import { Router } from "@reach/router"; +import { Router } from "@gatsbyjs/reach-router"; import { AppStateProvider } from "./InstalledApp/StateContext"; import { Provider, defaultTheme } from "@adobe/react-spectrum"; import { InstalledAppPage } from "./InstalledApp/pages/InstalledAppPage"; diff --git a/packages/webextension/package.json b/packages/webextension/package.json index f84002d..8397bfc 100644 --- a/packages/webextension/package.json +++ b/packages/webextension/package.json @@ -10,6 +10,7 @@ }, "devDependencies": { "@types/codemirror": "^0.0.106", + "@types/gatsbyjs__reach-router": "^1.3.0", "@types/minimatch": "^3.0.3", "@types/reach__router": "^1.3.6", "@types/react": "^17.0.0", @@ -19,15 +20,16 @@ "path-browserify": "^1.0.1", "style-loader": "^1.2.1", "ts-loader": "^9.5.1", + "typescript": "^5.2.2", "@webextension-toolbox/webextension-toolbox": "^7.1.1", "webpack": "^5.90.0", - "webpack-sources": "^2.3.0", + "webpack-sources": "^3.2.3", "webpack-watched-glob-entries-plugin": "^3.0.0" }, "dependencies": { "@adobe/react-spectrum": "3.4.0", "@kvs/env": "^1.1.0", - "@reach/router": "^1.3.4", + "@gatsbyjs/reach-router": "^1.3.9", "@react-stately/data": "^3.1.2", "@spectrum-icons/workflow": "^3.2.0", "@textlint/config-loader": "^14.0.4", @@ -40,7 +42,7 @@ "idb": "^5.0.4", "minimatch": "^3.0.4", "react": "^17.0.2", - "react-codemirror2": "^7.2.1", + "react-codemirror2": "^8.0.0", "react-dom": "^17.0.2", "textchecker-element": "^0.17.0", "webextension-polyfill-ts": "^0.25.0" diff --git a/yarn.lock b/yarn.lock index 88fe8e6..ca3490f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1155,6 +1155,15 @@ resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== +"@gatsbyjs/reach-router@^1.3.9": + version "1.3.9" + resolved "https://registry.yarnpkg.com/@gatsbyjs/reach-router/-/reach-router-1.3.9.tgz#305c3c4c5041f27e53fc33e344a08ee2c4b985af" + integrity sha512-/354IaUSM54xb7K/TxpLBJB94iEAJ3P82JD38T8bLnIDWF+uw8+W/82DKnQ7y24FJcKxtVmG43aiDLG88KSuYQ== + dependencies: + invariant "^2.2.3" + prop-types "^15.6.1" + react-lifecycles-compat "^3.0.4" + "@hutson/parse-repository-url@^3.0.0": version "3.0.2" resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340" @@ -2321,16 +2330,6 @@ resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== -"@reach/router@^1.3.4": - version "1.3.4" - resolved "https://registry.yarnpkg.com/@reach/router/-/router-1.3.4.tgz#d2574b19370a70c80480ed91f3da840136d10f8c" - integrity sha512-+mtn9wjlB9NN2CNnnC/BRYtwdKBfSyyasPYraNAyvaV1occr/5NnB4CVzjEZipNHwYebQwcndGUmpFzxAUoqSA== - dependencies: - create-react-context "0.3.0" - invariant "^2.2.3" - prop-types "^15.6.1" - react-lifecycles-compat "^3.0.4" - "@react-aria/actiongroup@^3.1.1": version "3.1.2" resolved "https://registry.yarnpkg.com/@react-aria/actiongroup/-/actiongroup-3.1.2.tgz#391805780957573c2d1f1c401a2b08f24b34df7a" @@ -4095,6 +4094,13 @@ resolved "https://registry.yarnpkg.com/@types/firefox-webext-browser/-/firefox-webext-browser-120.0.4.tgz#27eead781051b2e681a344dd2983735faadd4343" integrity sha512-lBrpf08xhiZBigrtdQfUaqX1UauwZ+skbFiL8u2Tdra/rklkKadYmIzTwkNZSWtuZ7OKpFqbE2HHfDoFqvZf6w== +"@types/gatsbyjs__reach-router@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@types/gatsbyjs__reach-router/-/gatsbyjs__reach-router-1.3.0.tgz#6c831f6c369391b0ecc1726f9959ecd8e14a9eb0" + integrity sha512-7dfI9peaJk7TuIIaW8r6r8UaobvR+zqyc/x8pQpqwOFHCiLXl49TUxMoapFv1BQFAbT9UKrvlsijJk7X5r18lQ== + dependencies: + "@types/reach__router" "*" + "@types/glob@*": version "7.1.3" resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" @@ -4204,6 +4210,13 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb" integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ== +"@types/reach__router@*": + version "1.3.15" + resolved "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.15.tgz#be4e23ee57786a9a16db9af3cff4c085de9e0db0" + integrity sha512-5WEHKGglRjq/Ae3F8UQxg+GYUIhTUEiyBT9GKPoOLU/vPTn8iZrRbdzxqvarOaGludIejJykHLMdOCdhgWqaxA== + dependencies: + "@types/react" "*" + "@types/reach__router@^1.3.6": version "1.3.7" resolved "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.7.tgz#de8ab374259ae7f7499fc1373b9697a5f3cd6428" @@ -5930,14 +5943,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: safe-buffer "^5.0.1" sha.js "^2.4.8" -create-react-context@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.3.0.tgz#546dede9dc422def0d3fc2fe03afe0bc0f4f7d8c" - integrity sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw== - dependencies: - gud "^1.0.0" - warning "^4.0.3" - create-require@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" @@ -7203,11 +7208,6 @@ gray-matter@^2.1.0: js-yaml "^3.8.1" toml "^2.3.2" -gud@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0" - integrity sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw== - gulp-header@^1.7.1: version "1.8.12" resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84" @@ -10276,10 +10276,10 @@ rc-config-loader@^4.1.3: json5 "^2.2.2" require-from-string "^2.0.2" -react-codemirror2@^7.2.1: - version "7.2.1" - resolved "https://registry.yarnpkg.com/react-codemirror2/-/react-codemirror2-7.2.1.tgz#38dab492fcbe5fb8ebf5630e5bb7922db8d3a10c" - integrity sha512-t7YFmz1AXdlImgHXA9Ja0T6AWuopilub24jRaQdPVbzUJVNKIYuy3uCFZYa7CE5S3UW6SrSa5nAqVQvtzRF9gw== +react-codemirror2@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/react-codemirror2/-/react-codemirror2-8.0.0.tgz#0ce624d024ba4ac7bab8979c2fd6596500d6bf51" + integrity sha512-JIbhXoghvX0BrasIoCQvRxBPIU78plfjF1Buz0gaMFvZXwEDjkCYBkQhucoOtudQ7ikbB1jJUnmCsutElti7yA== react-dom@^17.0.2: version "17.0.2" @@ -11109,11 +11109,6 @@ sorted-joyo-kanji@^0.2.0: joyo-kanji "^0.2.1" sorted-array "^2.0.1" -source-list-map@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" - integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== - source-map-js@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" @@ -12240,6 +12235,11 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== +typescript@^5.2.2: + version "5.7.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6" + integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg== + uglify-js@^3.1.4: version "3.13.4" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.4.tgz#592588bb9f47ae03b24916e2471218d914955574" @@ -12569,13 +12569,6 @@ walk-up-path@^1.0.0: resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-1.0.0.tgz#d4745e893dd5fd0dbb58dd0a4c6a33d9c9fec53e" integrity sha512-hwj/qMDUEjCU5h0xr90KGCf0tg0/LgJbmOWgrWKYlcJZM7XvquvUJZ0G/HMGr7F7OQMOUuPHWP9JpriinkAlkg== -warning@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3" - integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w== - dependencies: - loose-envify "^1.0.0" - watchpack@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.1.tgz#29308f2cac150fa8e4c92f90e0ec954a9fed7fff" @@ -12684,14 +12677,6 @@ webpack-dev-server@^4.15.1: webpack-dev-middleware "^5.3.4" ws "^8.13.0" -webpack-sources@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.1.tgz#570de0af163949fe272233c2cefe1b56f74511fd" - integrity sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA== - dependencies: - source-list-map "^2.0.1" - source-map "^0.6.1" - webpack-sources@^3.2.3: version "3.2.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"