Skip to content

Commit 3aad172

Browse files
freiksenetblainekasten
freiksenet
and
blainekasten
authored
chore(gatsby): Monorepo cleanup (gatsbyjs#24114)
* Monorepo cleanup - Remove unused package - Make TypeScript part of babel-preset-gatsby - Remove unneeded peer dependency of `packages/gatsby` dependencies - Add missing dev and normal dependencies (mostly babel stuff) * Fix yarn.lock * Fix review commentS * Readd gatsby Co-authored-by: Blaine Kasten <[email protected]>
1 parent 49133e2 commit 3aad172

File tree

28 files changed

+328
-1187
lines changed

28 files changed

+328
-1187
lines changed

‎.babelrc.js

-6
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,5 @@ if (process.env.NODE_ENV !== `test`) {
99
module.exports = {
1010
sourceMaps: true,
1111
presets: ["babel-preset-gatsby-package"],
12-
overrides: [
13-
{
14-
test: "**/*.ts",
15-
plugins: [["@babel/plugin-transform-typescript", { isTSX: true }]],
16-
},
17-
],
1812
ignore,
1913
}

‎packages/babel-plugin-remove-graphql-queries/package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@
1414
"babel-preset-gatsby-package": "^0.4.1",
1515
"cross-env": "^5.2.1"
1616
},
17-
"license": "MIT",
18-
"main": "index.js",
1917
"peerDependencies": {
20-
"gatsby": "^2.0.0",
21-
"graphql": "^14.1.1"
18+
"gatsby": "^2.0.0"
2219
},
20+
"license": "MIT",
21+
"main": "index.js",
2322
"scripts": {
2423
"build": "babel src --out-dir . --ignore \"**/__tests__\" --extensions \".ts,.js\"",
2524
"prepare": "cross-env NODE_ENV=production npm run build",

‎packages/babel-preset-gatsby-package/index.js

+6
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ function preset(context, options = {}) {
4646
r(`@babel/plugin-syntax-dynamic-import`),
4747
IS_TEST && r(`babel-plugin-dynamic-import-node`)
4848
].filter(Boolean),
49+
overrides: [
50+
{
51+
test: [`**/*.ts`, `**/*.tsx`],
52+
plugins: [[`@babel/plugin-transform-typescript`, { isTSX: true }]],
53+
},
54+
],
4955
}
5056
}
5157

‎packages/babel-preset-gatsby-package/package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,22 @@
88
"directory": "packages/babel-preset-gatsby-package"
99
},
1010
"homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/babel-preset-gatsby-package#readme",
11-
"peerDependencies": {
12-
"@babel/core": "^7.0.0"
13-
},
1411
"dependencies": {
1512
"@babel/plugin-proposal-class-properties": "^7.8.3",
1613
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
1714
"@babel/plugin-proposal-optional-chaining": "^7.9.0",
1815
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
1916
"@babel/plugin-transform-runtime": "^7.9.6",
17+
"@babel/plugin-transform-typescript": "^7.9.6",
2018
"@babel/preset-env": "^7.9.6",
2119
"@babel/preset-flow": "^7.9.0",
2220
"@babel/preset-react": "^7.9.4",
2321
"babel-plugin-dynamic-import-node": "^2.3.3",
2422
"core-js": "^2.6.11"
2523
},
24+
"peerDependencies": {
25+
"@babel/core": "^7.0.0"
26+
},
2627
"license": "MIT",
2728
"main": "index.js",
2829
"engines": {

‎packages/babel-preset-gatsby/.babelrc

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
{
2-
"presets": [["babel-preset-gatsby-package"]],
3-
"overrides": [
4-
{
5-
"test": ["**/*.ts", "**/*.tsx"],
6-
"plugins": [["@babel/plugin-transform-typescript", { "isTSX": true }]]
7-
}
8-
]
2+
"presets": [["babel-preset-gatsby-package"]]
93
}

‎packages/gatsby-cli/.babelrc

+1-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
11
{
2-
"presets": [
3-
[
4-
"babel-preset-gatsby-package",
5-
{
6-
"nodeVersion": "6.0"
7-
}
8-
]
9-
],
10-
"overrides": [
11-
{
12-
"test": ["**/*.ts", "**/*.tsx"],
13-
"plugins": [["@babel/plugin-transform-typescript", { "isTSX": true }]]
14-
}
15-
]
2+
"presets": [["babel-preset-gatsby-package"]]
163
}

‎packages/gatsby-core-utils/.babelrc

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
{
2-
"presets": [["babel-preset-gatsby-package"]],
3-
"overrides": [
4-
{
5-
"test": "**/*.ts",
6-
"plugins": [["@babel/plugin-transform-typescript", { "isTSX": true }]]
7-
}
8-
]
2+
"presets": [["babel-preset-gatsby-package"]]
93
}

‎packages/gatsby-design-tokens/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"devDependencies": {
3232
"agadoo": "^1.1.0",
3333
"cross-env": "^5.2.1",
34-
"microbundle": "gatsbyjs/microbundle#brotli-try-catch-plus-dist",
34+
"microbundle": "^0.12.0",
3535
"preval.macro": "^3.0.0"
3636
},
3737
"engines": {

‎packages/gatsby-dev-cli/src/__tests__/watch.js

-1
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@ const monoRepoPackages = [
284284
`gatsby-transformer-toml`,
285285
`gatsby-transformer-xml`,
286286
`gatsby-transformer-yaml`,
287-
`graphql-skip-limit`,
288287
]
289288

290289
const mockDepsChanges = packagesWithChangedDeps => ({ packageName }) =>

‎packages/gatsby-link/package.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,17 @@
1818
"babel-preset-gatsby-package": "^0.4.1",
1919
"cross-env": "^5.2.1"
2020
},
21+
"peerDependencies": {
22+
"@reach/router": "^1.3.3",
23+
"react": "^16.4.2",
24+
"react-dom": "^16.4.2"
25+
},
2126
"homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-link#readme",
2227
"keywords": [
2328
"gatsby"
2429
],
2530
"license": "MIT",
2631
"main": "index.js",
27-
"peerDependencies": {
28-
"@reach/router": "^1.1.1",
29-
"gatsby": "^2.0.0",
30-
"react": "^16.4.2",
31-
"react-dom": "^16.4.2"
32-
},
3332
"repository": {
3433
"type": "git",
3534
"url": "https://github.com/gatsbyjs/gatsby.git",

‎packages/gatsby-page-utils/package.json

-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@
3535
"babel-preset-gatsby-package": "^0.4.1",
3636
"cross-env": "^5.2.1"
3737
},
38-
"peerDependencies": {
39-
"gatsby": "^2.0.0"
40-
},
4138
"files": [
4239
"dist/*"
4340
],

‎packages/gatsby-plugin-benchmark-reporting/package.json

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
},
1515
"homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-plugin-benchmark-reporting#readme",
1616
"devDependencies": {
17+
"@babel/cli": "^7.8.4",
18+
"@babel/core": "^7.9.6",
1719
"babel-preset-gatsby-package": "^0.4.1"
1820
},
1921
"dependencies": {

‎packages/gatsby-plugin-emotion/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
"babel-preset-gatsby-package": "^0.4.1",
1717
"cross-env": "^5.2.1"
1818
},
19+
"peerDependencies": {
20+
"@babel/core": "^7.0.0",
21+
"@emotion/core": "^10.0.5",
22+
"gatsby": "^2.0.0"
23+
},
1924
"homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-plugin-emotion#readme",
2025
"keywords": [
2126
"gatsby",
@@ -25,11 +30,6 @@
2530
],
2631
"license": "MIT",
2732
"main": "index.js",
28-
"peerDependencies": {
29-
"@babel/core": "^7.0.0",
30-
"@emotion/core": "^10.0.5",
31-
"gatsby": "^2.0.0"
32-
},
3333
"repository": {
3434
"type": "git",
3535
"url": "https://github.com/gatsbyjs/gatsby.git",

‎packages/gatsby-plugin-typescript/package.json

-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
],
3333
"license": "MIT",
3434
"main": "index.js",
35-
"peerDependencies": {
36-
"gatsby": "^2.0.0"
37-
},
3835
"repository": {
3936
"type": "git",
4037
"url": "https://github.com/gatsbyjs/gatsby.git",

‎packages/gatsby-react-router-scroll/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"main": "index.js",
2727
"peerDependencies": {
2828
"@reach/router": "^1.0.0",
29-
"gatsby": "^2.0.0",
3029
"react": "^16.4.2",
3130
"react-dom": "^16.4.2"
3231
},

‎packages/gatsby-telemetry/.babelrc

+1-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
11
{
2-
"presets": [["babel-preset-gatsby-package"]],
3-
"overrides": [
4-
{
5-
"test": "**/*.ts",
6-
"plugins": [
7-
[
8-
"@babel/plugin-transform-typescript",
9-
{
10-
"isTSX": true
11-
}
12-
]
13-
]
14-
}
15-
]
2+
"presets": [["babel-preset-gatsby-package"]]
163
}

‎packages/graphql-skip-limit/.babelrc

-3
This file was deleted.

0 commit comments

Comments
 (0)