Skip to content
This repository has been archived by the owner on Jul 12, 2023. It is now read-only.

Bump all deps #608

Closed
wants to merge 23 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6cb72db
Bump handlebars from 4.5.3 to 4.7.7
dependabot[bot] May 8, 2021
4fa0e0f
Bump hosted-git-info from 2.8.5 to 2.8.9
dependabot[bot] May 11, 2021
7336f64
Bump path-parse from 1.0.6 to 1.0.7
dependabot[bot] Aug 11, 2021
f492721
Bump shelljs from 0.8.4 to 0.8.5
dependabot[bot] Jan 15, 2022
4e690ba
Bump nanoid from 3.1.3 to 3.3.1
dependabot[bot] Mar 22, 2022
5f8872e
Bump ajv from 6.10.2 to 6.12.6
dependabot[bot] Mar 22, 2022
cb78b51
Bump node-fetch from 2.6.0 to 2.6.7
dependabot[bot] Mar 22, 2022
ef8e3ff
Bump lodash-es from 4.17.20 to 4.17.21
dependabot[bot] Mar 22, 2022
8730335
Bump eventsource from 1.0.7 to 1.1.1
dependabot[bot] Jun 1, 2022
011bcf0
chore(deps): bump moment from 2.24.0 to 2.29.4
dependabot[bot] Jul 8, 2022
68ad93c
Bump elliptic from 6.5.3 to 6.5.4
dependabot[bot] Sep 6, 2022
f83e902
Bump lodash from 4.17.20 to 4.17.21
dependabot[bot] Sep 6, 2022
ea4362e
Bump ejs from 3.1.5 to 3.1.8
dependabot[bot] Sep 6, 2022
351c9f6
chore(deps-dev): bump @emotion/babel-preset-css-prop
dependabot[bot] Sep 6, 2022
3b6473e
chore(deps-dev): bump @storybook/react from 6.1.18 to 6.5.9
dependabot[bot] Sep 6, 2022
418d6f9
Bump merge-deep from 3.0.2 to 3.0.3
dependabot[bot] Sep 8, 2022
049f1d1
chore(deps): bump ajv & ejs
mxdvl Oct 21, 2022
19f4055
chore(deps): merge dependabot branches
mxdvl Oct 21, 2022
954cce1
chore(deps): octopus merge
mxdvl Oct 21, 2022
a4af84c
fix(storybook): make it work
mxdvl Oct 21, 2022
727bf5e
feat(deps): add helper for dependabot branches
mxdvl Oct 21, 2022
2300b24
wip: try fixing storybook
mxdvl Oct 21, 2022
600d3d0
chore: merge main branch
mxdvl Oct 24, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 31 additions & 28 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -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"
]
}
2 changes: 1 addition & 1 deletion .storybook/preview.js → .storybook/preview.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export const parameters = {
const FocusManagerDecorator = storyFn => {
useEffect(() => {
FocusStyleManager.onlyShowFocusOnTabs()
})
}, [])

return <div>{storyFn()}</div>

Expand Down
6 changes: 5 additions & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
29 changes: 16 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -160,5 +160,8 @@
"collectCoverageFrom": [
"src/**/*.{ts,tsx}"
]
},
"dependencies": {
"@storybook/preset-create-react-app": "^4.1.2"
}
}
44 changes: 44 additions & 0 deletions scripts/dependabot.ts
Original file line number Diff line number Diff line change
@@ -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();
Loading