Bump query-string and enable transpilation of it (#3071)

* Bump query-string and enable transpilation of it

query-string was previously frozen to v5 because it broke on Safari 9.
See #1053

We should just transpile it ourselves to support our browser matrix.

* Replace transpilation regex to path.join to follow Webpack best practices

* Further bump query-string 6.13.7 -> 6.13.8 and re-remove @types/query-string added in bad merge

* Fix type errors

Author: taneliang

renovate.json

@@ -65,14 +65,7 @@
       "groupName": "definitelyTyped"
     }
   ],
-  "ignoreDeps": [
-    "query-string",
-    "@types/query-string",
-    "@material/snackbar",
-    "@material/fab",
-    "puppeteer",
-    "searchkit"
-  ],
+  "ignoreDeps": ["@material/snackbar", "@material/fab", "puppeteer", "searchkit"],
   "pathRules": [
     {
       "paths": ["packages/**"],

website/package.json

@@ -48,7 +48,7 @@
     "@types/leaflet": "1.5.21",
     "@types/lodash": "4.14.167",
     "@types/mousetrap": "1.6.5",
-    "@types/query-string": "5.0.0",
+    "@types/no-scroll": "2.1.0",
     "@types/react": "17.0.0",
     "@types/react-beautiful-dnd": "13.0.0",
     "@types/react-dom": "17.0.0",
@@ -144,7 +144,7 @@
     "lodash": "4.17.20",
     "mousetrap": "1.6.5",
     "nusmoderator": "3.0.0",
-    "query-string": "5.0.0",
+    "query-string": "6.13.8",
     "react": "17.0.1",
     "react-beautiful-dnd": "13.0.0",
     "react-dom": "17.0.1",

website/src/utils/debug.ts

@@ -21,8 +21,9 @@ export function forceElasticsearchHost() {
 // Force the current date/time to some value for components that use the
 // global timer HOC
 export function forceTimer() {
-  const dateString = getParams().date;
+  let dateString = getParams().date;
   if (!dateString) return null;
+  if (Array.isArray(dateString)) [dateString] = dateString;
 
   const date = new Date(dateString);
   if (Number.isNaN(date.getTime())) return null;

website/src/utils/timetables.ts

@@ -444,7 +444,7 @@ export function serializeTimetable(timetable: SemTimetableConfig): string {
 }
 
 export function deserializeTimetable(serialized: string): SemTimetableConfig {
-  const params: Record<string, string> = qs.parse(serialized);
+  const params = qs.parse(serialized);
   return mapValues(params, parseModuleConfig);
 }
 

website/src/views/venues/VenuesContainer.tsx

@@ -72,13 +72,16 @@ export class VenuesContainerComponent extends Component<Props, State> {
     // Extract searchOptions from the query string if they are present
     const isAvailabilityEnabled = !!(params.time && params.day && params.duration);
     const searchOptions = isAvailabilityEnabled
-      ? (mapValues(pick(params, ['time', 'day', 'duration']), (i) =>
-          parseInt(i, 10),
-        ) as VenueSearchOptions)
+      ? (mapValues(pick(params, ['time', 'day', 'duration']), (i) => {
+          if (!i) return NaN;
+          if (Array.isArray(i)) return parseInt(i[0], 10);
+          return parseInt(i, 10);
+        }) as VenueSearchOptions)
       : defaultSearchOptions();
 
     this.history = new HistoryDebouncer(history);
-    const searchTerm = params.q || '';
+    let searchTerm = params.q || '';
+    if (Array.isArray(searchTerm)) [searchTerm] = searchTerm;
     this.state = {
       searchOptions,
       isAvailabilityEnabled,

website/webpack/webpack.config.common.js

@@ -63,6 +63,10 @@ const commonConfig = {
           // TODO: Remove after we drop support for iOS <= 11.2 and Microsoft Edge 18.
           path.join(parts.PATHS.root, parts.PATHS.node, 'react-leaflet'),
           path.join(parts.PATHS.root, parts.PATHS.node, '@react-leaflet'),
+          // query-string has had a history of dropping support for browsers, so
+          // we cannot assume that it supports our browser support matrix.
+          // See: https://github.com/nusmodifications/nusmods/pull/1053
+          path.join(parts.PATHS.root, parts.PATHS.node, 'query-string'),
         ],
         use: ['babel-loader'],
       },

website/yarn.lock

@@ -1794,6 +1794,11 @@
   resolved "https://registry.yarnpkg.com/@types/mousetrap/-/mousetrap-1.6.5.tgz#e95569aa6273dbe0ed1814f86287547cc06e93c9"
   integrity sha512-OwVhKFim9Y/MprzCe4I6a59p31pMy8+LrtP6qS7J0kaOxYmW6VVJPBw5NYm+g7nSbgPUz22FvqU1F1hC5YGTfg==
 
+"@types/[email protected]":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@types/no-scroll/-/no-scroll-2.1.0.tgz#d50280440fe1bc85c7481f40e35dc51be7b54bb8"
+  integrity sha512-67oe0I3SZeEsCIcf5MT4yKrcJOIZn5g+ytPEn+JQQnM4IprztFAWg9T3ngVGbxkceJlLYBsqIfvHl9xEGTuPyA==
+
 "@types/node@*":
   version "14.14.14"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.14.tgz#f7fd5f3cc8521301119f63910f0fb965c7d761ae"
@@ -1824,11 +1829,6 @@
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"
   integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==
 
-"@types/[email protected]":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@types/query-string/-/query-string-5.0.0.tgz#5dbebd24d0abeb555d0dd9704c33462d84a45e69"
-  integrity sha512-5wxncaH2wdueIw8mYrRF+G+1sxwxK9AQYWK6V+EJvZ52YesFh2PnG7yRQ4zeThd2Ewy6xCCTUCG6tfRyUzqyIA==
-
 "@types/[email protected]":
   version "13.0.0"
   resolved "https://registry.yarnpkg.com/@types/react-beautiful-dnd/-/react-beautiful-dnd-13.0.0.tgz#e60d3d965312fcf1516894af92dc3e9249587db4"
@@ -9682,14 +9682,14 @@ qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-query-string@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.0.0.tgz#fbdf7004b4d2aff792f9871981b7a2794f555947"
-  integrity sha1-+99wBLTSr/eS+YcZgbeieU9VWUc=
+query-string@6.13.8:
+  version "6.13.8"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.13.8.tgz#8cf231759c85484da3cf05a851810d8e825c1159"
+  integrity sha512-jxJzQI2edQPE/NPUOusNjO/ZOGqr1o2OBa/3M00fU76FsLXDVbJDv/p7ng5OdQyorKrkRz1oqfwmbe5MAMePQg==
   dependencies:
     decode-uri-component "^0.2.0"
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
+    split-on-first "^1.0.0"
+    strict-uri-encode "^2.0.0"
 
 querystring-es3@^0.2.0:
   version "0.2.1"
@@ -11090,6 +11090,11 @@ specificity@^0.4.1:
   resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.4.1.tgz#aab5e645012db08ba182e151165738d00887b019"
   integrity sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==
 
+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-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
@@ -11185,10 +11190,10 @@ stream-http@^2.7.2:
     to-arraybuffer "^1.0.0"
     xtend "^4.0.0"
 
-strict-uri-encode@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
+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 sha1-ucczDHBChi9rFC3CdLvMWGbONUY=
 
 string-convert@^0.2.0:
   version "0.2.1"