Bump all deps

.storybook/main.js

@@ -1,36 +1,39 @@
-const nodeModulesExclude = [
-  {
-      test: /node_modules/,
-      exclude: [
-          /@guardian\//,
-      ],
-  },
-]
-
 module.exports = {
-  "stories": [
+  addons: [
+    "@storybook/addon-links",
+    "@storybook/addon-essentials",
+    "@storybook/preset-create-react-app",
+  ],
+  framework: '@storybook/react',
+  features: {
+    babelModeV7: true,
+  },
+  stories: [
     "../src/**/*.stories.mdx",
     "../src/**/*.stories.@(js|jsx|ts|tsx)"
   ],
   webpackFinal: async config => {
-      config.module.rules.push({
-          test: /\.(ts|tsx)$/,
-          exclude: nodeModulesExclude,
-          use: [
-              {
-                  loader: require.resolve('ts-loader'),
-              },
-          ],
-      });
-
-      // update storybook webpack config to transpile *all* JS
-      config.module.rules.find(rule => String(rule.test) === String(/\.(mjs|tsx?|jsx?)$/))
-      .exclude = nodeModulesExclude;
+    config.module.rules.push({
+      test: /@guardian\/.+\.js$/,
+      use: [
+          {
+            loader: 'babel-loader',
+            options: {
+              presets: [
+                [
+                  '@babel/preset-env',
+                  {
+                    targets: {
+                      node: 'current',
+                    },
+                  },
+                ],
+              ],
+            },
+          },
+      ]
+    })
 
-      return config;
+    return config;
   },
-  "addons": [
-    "@storybook/addon-links",
-    "@storybook/addon-essentials"
-  ]
 }

.storybook/preview.js → .storybook/preview.jsx

@@ -77,7 +77,7 @@ export const parameters = {
 const FocusManagerDecorator = storyFn => {
 	useEffect(() => {
 		FocusStyleManager.onlyShowFocusOnTabs()
-	})
+	}, [])
 
 	return <div>{storyFn()}</div>
 

babel.config.js

@@ -1,7 +1,11 @@
 module.exports = {
     plugins: ["const-enum", "@babel/transform-typescript"],
     presets: [
-        '@babel/preset-env',
+        ['@babel/preset-env', {
+            targets: {
+                node: 'current'
+            },
+        }],
         '@babel/preset-typescript',
         '@babel/preset-react',
         '@emotion/babel-preset-css-prop',

package.json

@@ -30,15 +30,15 @@
     "typescript": "^4.1.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.10",
+    "@babel/core": "^7.19.6",
     "@babel/helper-environment-visitor": "^7.18.9",
     "@babel/helper-string-parser": "^7.19.4",
-    "@babel/plugin-transform-runtime": "^7.9.0",
-    "@babel/preset-env": "^7.5.5",
-    "@babel/preset-react": "^7.0.0",
-    "@babel/preset-typescript": "^7.12.7",
+    "@babel/plugin-transform-runtime": "^7.19.6",
+    "@babel/preset-env": "^7.19.4",
+    "@babel/preset-react": "^7.18.6",
+    "@babel/preset-typescript": "^7.18.6",
     "@changesets/cli": "^2.24.1",
-    "@emotion/babel-preset-css-prop": "^10.0.14",
+    "@emotion/babel-preset-css-prop": "^11.10.0",
     "@emotion/react": "^11.1.5",
     "@guardian/libs": "^3.1.0",
     "@guardian/prettier": "^0.4.2",
@@ -50,20 +50,20 @@
     "@rollup/plugin-html": "^0.2.4",
     "@rollup/plugin-node-resolve": "^11.2.0",
     "@rollup/plugin-replace": "^4.0.0",
-    "@storybook/addon-actions": "^6.1.18",
-    "@storybook/addon-essentials": "^6.1.18",
-    "@storybook/addon-links": "^6.1.18",
-    "@storybook/react": "^6.1.18",
+    "@storybook/addon-actions": "^6.5.12",
+    "@storybook/addon-essentials": "^6.5.12",
+    "@storybook/addon-links": "^6.5.12",
+    "@storybook/react": "^6.5.12",
     "@testing-library/jest-dom": "^5.11.9",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^12.8.0",
     "@types/jest": "^26.0.0",
     "@types/node": "^14.10.2",
     "@types/react": "^17.0.2",
     "@types/react-dom": "^17.0.1",
-    "babel-loader": "^8.2.2",
-    "babel-plugin-const-enum": "^1.0.1",
-    "babel-plugin-emotion": "^10.0.33",
+    "babel-loader": "^8.2.5",
+    "babel-plugin-const-enum": "^1.2.0",
+    "babel-plugin-emotion": "^11.0.0",
     "customize-cra": "^1.0.0",
     "eslint-plugin-react-hooks": "^4.0.4",
     "fetch-mock": "^9.3.1",
@@ -160,5 +160,8 @@
     "collectCoverageFrom": [
       "src/**/*.{ts,tsx}"
     ]
+  },
+  "dependencies": {
+    "@storybook/preset-create-react-app": "^4.1.2"
   }
 }

scripts/dependabot.ts

@@ -0,0 +1,44 @@
+const count = parseInt(Deno.args[0], 10) || 8;
+
+const getBranches = async () => {
+  const process = Deno.run({
+    cmd: [
+      "git",
+      "branch",
+      "-r",
+      "--list",
+      "origin/dependabot/*",
+      "--no-merged",
+    ],
+    stdout: "piped",
+  });
+
+  return new TextDecoder()
+    .decode(await process.output())
+    .split("\n")
+    .map((line) => line.trim())
+    .filter(Boolean)
+    .slice(0, count);
+};
+
+const branches = await getBranches();
+
+console.warn("About to merge the following branches:", branches);
+
+const shouldProceed = confirm("Do you want to merge these branches?");
+if (!shouldProceed) {
+  console.info("Not merging anything");
+  Deno.exit();
+}
+
+const mergeBranches = async (branches: string[]) => {
+  const process = Deno.run({
+    cmd: ["git", "merge", ...branches, "--no-ff"],
+  });
+  const { code } = await process.status();
+  if (code !== 0) Deno.exit(code);
+};
+
+await mergeBranches(branches);
+
+Deno.exit();