From e3d37deef34fab44640d640c75f6e78fe42568e4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 05:16:27 +0000 Subject: [PATCH 1/4] Update dependency query-string to v8 --- package.json | 2 +- yarn.lock | 44 +++++++++++++++++++------------------------- 2 files changed, 20 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index 9ef4bee710..2f2336abcc 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "moment": "^2.29.4", "normalize.css": "^8.0.1", "phaser": "^3.55.2", - "query-string": "^7.1.1", + "query-string": "^8.0.0", "re-resizable": "^6.9.9", "react": "^18.2.0", "react-ace": "^10.1.0", diff --git a/yarn.lock b/yarn.lock index 2755a15075..0e29f2f089 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5276,10 +5276,10 @@ decode-named-character-reference@^1.0.0: dependencies: character-entities "^2.0.0" -decode-uri-component@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" - integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== +decode-uri-component@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.4.1.tgz#2ac4859663c704be22bf7db760a1494a49ab2cc5" + integrity sha512-+8VxcR21HhTy8nOt6jf20w0c9CADrw1O8d+VZ/YzzCt4bJ3uBjw+D1q2osAB8RnpwwaeYBxy0HyKQxD5JBMuuQ== decompress-response@^4.2.0: version "4.2.1" @@ -6404,10 +6404,10 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" -filter-obj@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b" - integrity sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ== +filter-obj@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-5.1.0.tgz#5bd89676000a713d7db2e197f660274428e524ed" + integrity sha512-qWeTREPoT7I0bifpPUXtxkZJ1XJzxWtfoWWkdVGqa+eCr3SHW/Ocp89o8vLvbUuQnadybJpjOKu4V+RwO6sGng== finalhandler@1.2.0: version "1.2.0" @@ -10647,15 +10647,14 @@ qs@~6.5.2: resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== -query-string@^7.1.1: - version "7.1.3" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.3.tgz#a1cf90e994abb113a325804a972d98276fe02328" - integrity sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg== +query-string@^8.0.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-8.2.0.tgz#f0b0ef6caa85f525dbdb745a67d3f8c08d71cc6b" + integrity sha512-tUZIw8J0CawM5wyGBiDOAp7ObdRQh4uBor/fUR9ZjmbZVvw95OD9If4w3MQxr99rg0DJZ/9CIORcpEqU5hQG7g== dependencies: - decode-uri-component "^0.2.2" - filter-obj "^1.1.0" - split-on-first "^1.0.0" - strict-uri-encode "^2.0.0" + decode-uri-component "^0.4.1" + filter-obj "^5.1.0" + split-on-first "^3.0.0" querystringify@^2.1.1: version "2.2.0" @@ -12007,10 +12006,10 @@ spdy@^4.0.2: select-hose "^2.0.0" spdy-transport "^3.0.0" -split-on-first@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f" - integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw== +split-on-first@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-3.0.0.tgz#f04959c9ea8101b9b0bbf35a61b9ebea784a23e7" + integrity sha512-qxQJTx2ryR0Dw0ITYyekNQWpz6f8dGd7vffGNflQQ3Iqj9NJ6qiZ7ELpZsJ/QBhIVAiDfXdag3+Gp8RvWa62AA== split2@^3.1.0: version "3.2.2" @@ -12103,11 +12102,6 @@ stream-shift@^1.0.0: resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== -strict-uri-encode@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546" - integrity sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ== - string-length@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a" From 1f1fbcd33cec2cf0470df1aedf75466418373c32 Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Mon, 12 Feb 2024 13:52:44 +0800 Subject: [PATCH 2/4] Fix breaking changes Done because the previous version of the dependency was imported as a namespace instead of default import. --- src/commons/sagas/PlaygroundSaga.ts | 2 +- src/commons/sagas/__tests__/PlaygroundSaga.ts | 2 +- src/commons/utils/QueryHelper.ts | 2 +- src/pages/githubCallback/GitHubCallback.tsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/commons/sagas/PlaygroundSaga.ts b/src/commons/sagas/PlaygroundSaga.ts index 1f21129a0c..bd36c3ac44 100644 --- a/src/commons/sagas/PlaygroundSaga.ts +++ b/src/commons/sagas/PlaygroundSaga.ts @@ -1,7 +1,7 @@ import { FSModule } from 'browserfs/dist/node/core/FS'; import { Chapter, Variant } from 'js-slang/dist/types'; import { compressToEncodedURIComponent } from 'lz-string'; -import * as qs from 'query-string'; +import qs from 'query-string'; import { SagaIterator } from 'redux-saga'; import { call, delay, put, race, select } from 'redux-saga/effects'; diff --git a/src/commons/sagas/__tests__/PlaygroundSaga.ts b/src/commons/sagas/__tests__/PlaygroundSaga.ts index bde0b82eac..9f0951ccb3 100644 --- a/src/commons/sagas/__tests__/PlaygroundSaga.ts +++ b/src/commons/sagas/__tests__/PlaygroundSaga.ts @@ -1,6 +1,6 @@ import { Chapter, Variant } from 'js-slang/dist/types'; import { compressToEncodedURIComponent } from 'lz-string'; -import * as qs from 'query-string'; +import qs from 'query-string'; import { call } from 'redux-saga/effects'; import { expectSaga } from 'redux-saga-test-plan'; diff --git a/src/commons/utils/QueryHelper.ts b/src/commons/utils/QueryHelper.ts index ddd1a83b14..4e8c60f7a8 100644 --- a/src/commons/utils/QueryHelper.ts +++ b/src/commons/utils/QueryHelper.ts @@ -1,4 +1,4 @@ -import * as qs from 'query-string'; +import qs from 'query-string'; import { isArray } from 'util'; export interface IParsedQuery { diff --git a/src/pages/githubCallback/GitHubCallback.tsx b/src/pages/githubCallback/GitHubCallback.tsx index 4c899e17f4..e5df056c4a 100644 --- a/src/pages/githubCallback/GitHubCallback.tsx +++ b/src/pages/githubCallback/GitHubCallback.tsx @@ -1,7 +1,7 @@ import { Classes, NonIdealState, Spinner, SpinnerSize } from '@blueprintjs/core'; import { IconNames } from '@blueprintjs/icons'; import classNames from 'classnames'; -import * as qs from 'query-string'; +import qs from 'query-string'; import { useEffect, useState } from 'react'; import { useLocation } from 'react-router'; From f72eadc0c694cbbd7f7cd686eee67398956f6fc4 Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Mon, 12 Feb 2024 13:55:07 +0800 Subject: [PATCH 3/4] Bump target to ES2020 --- tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index cc12a427ca..186f9134ca 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,7 +3,7 @@ "baseUrl": ".", "outDir": "build/dist", "module": "esnext", - "target": "es2016", + "target": "es2020", "lib": ["dom", "dom.iterable", "esnext", "es6", "es2015", "es2017"], "sourceMap": true, "allowJs": true, From a8674e1fcf62348ca1ef898be2bffa028b52c6e3 Mon Sep 17 00:00:00 2001 From: sayomaki Date: Wed, 14 Feb 2024 22:56:56 +0800 Subject: [PATCH 4/4] Fix test errors due to ESM dependencies not being ignored --- craco.config.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/craco.config.js b/craco.config.js index 10c0fcec6e..03e58fa3b1 100644 --- a/craco.config.js +++ b/craco.config.js @@ -127,7 +127,11 @@ const cracoConfig = (module.exports = { 'trim-lines', 'property-information', 'space-separated-tokens', - 'comma-separated-tokens' + 'comma-separated-tokens', + 'query-string', + 'decode-uri-component', + 'split-on-first', + 'filter-obj' ), '^.+\\.module\\.(css|sass|scss)$' ];