Skip to content

Commit 93f8dca

Browse files
authored
Merge pull request #18850 from mozilla/audit-yarn-resolutions
task: audit yarn resolutions – babel
2 parents b7a4236 + fe4fe3c commit 93f8dca

13 files changed

Lines changed: 188 additions & 374 deletions

File tree

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ workflows:
870870
- fail-fast
871871
- integration-test:
872872
name: Integration Test - Frontends (PR)
873-
resource_class: large
873+
resource_class: xlarge
874874
nx_run: affected --base=main --head=$CIRCLE_SHA1
875875
projects: --exclude '*,!tag:scope:frontend'
876876
test_suite: frontends-integration
@@ -1081,7 +1081,7 @@ workflows:
10811081
- Build
10821082
- integration-test:
10831083
name: Integration Test - Frontends
1084-
resource_class: large
1084+
resource_class: xlarge
10851085
projects: --exclude '*,!tag:scope:frontend'
10861086
test_suite: frontends-integration
10871087
workflow: test_and_deploy_tag
@@ -1204,7 +1204,7 @@ workflows:
12041204
- Build (nightly)
12051205
- integration-test:
12061206
name: Integration Test - Frontends (nightly)
1207-
resource_class: large
1207+
resource_class: xlarge
12081208
projects: --exclude '*,!tag:scope:frontend'
12091209
test_suite: frontends-integration
12101210
workflow: nightly

package.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,11 @@
161161
]
162162
},
163163
"devDependencies": {
164-
"@babel/core": "7.25.7",
165-
"@babel/preset-react": "7.25.7",
164+
"@babel/core": "^7.27.1",
165+
"@babel/plugin-transform-typescript": "^7.27.1",
166+
"@babel/preset-env": "^7.27.1",
167+
"@babel/preset-react": "^7.27.1",
168+
"@babel/preset-typescript": "^7.27.1",
166169
"@graphql-codegen/cli": "5.0.0",
167170
"@graphql-codegen/client-preset": "^4.3.2",
168171
"@graphql-codegen/typescript": "^4.0.1",
@@ -192,6 +195,7 @@
192195
"@swc/jest": "^0.2.36",
193196
"@testing-library/react": "15.0.6",
194197
"@types/babel__core": "^7",
198+
"@types/babel__preset-env": "^7",
195199
"@types/bn.js": "^5",
196200
"@types/jest": "29.5.1",
197201
"@types/jsdom": "^21",
@@ -257,12 +261,6 @@
257261
"packages/*"
258262
],
259263
"resolutions": {
260-
"@babel/core": "7.25.7",
261-
"@babel/helper-create-class-features-plugin": "7.25.7",
262-
"@babel/helper-module-imports": "7.25.7",
263-
"@babel/plugin-transform-function-name": "7.25.7",
264-
"@babel/traverse": "7.25.7",
265-
"@babel/types": "7.25.7",
266264
"@graphql-typed-document-node/core": "3.2.0",
267265
"@react-pdf/layout": "3.9.1",
268266
"@react-pdf/textkit": "4.3.0",

packages/fxa-admin-panel/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
"serve-static": "^1.16.0"
5454
},
5555
"devDependencies": {
56-
"@babel/core": "7.25.7",
5756
"@rescripts/cli": "0.0.16",
5857
"@testing-library/jest-dom": "^5.16.5",
5958
"@types/chance": "^1.1.2",

packages/fxa-auth-server/.babelrc.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
[
55
"@babel/preset-env",
66
{
7-
"targets": {
8-
"chrome": 100
9-
}
7+
"targets": "> 0.25%, last 2 versions, not dead"
108
}
119
],
1210
"@babel/preset-typescript",
1311
"@babel/preset-react"
1412
],
13+
"ignore": ["node_modules/**", "test/**"],
1514
"plugins": []
16-
}
15+
}

packages/fxa-auth-server/package.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,18 +123,12 @@
123123
"web-push": "3.4.4"
124124
},
125125
"devDependencies": {
126-
"@babel/core": "7.25.7",
127-
"@babel/preset-env": "7.25.7",
128-
"@babel/preset-react": "7.25.7",
129-
"@babel/preset-typescript": "7.25.7",
130126
"@storybook/addon-controls": "7.4.6",
131127
"@storybook/addon-docs": "7.6.12",
132128
"@storybook/addon-toolbars": "7.0.23",
133129
"@storybook/html": "7.6.17",
134130
"@storybook/html-webpack5": "7.6.13",
135131
"@types/async-retry": "^1",
136-
"@types/babel__core": "7.20.5",
137-
"@types/babel__preset-env": "^7",
138132
"@types/chai": "^4.3.17",
139133
"@types/chai-as-promised": "^7",
140134
"@types/dedent": "^0",

packages/fxa-content-server/package.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@
3737
"author": "Mozilla (https://mozilla.org/)",
3838
"license": "MPL-2.0",
3939
"dependencies": {
40-
"@babel/core": "7.25.7",
41-
"@babel/plugin-proposal-class-properties": "^7.18.6",
42-
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
43-
"@babel/preset-env": "7.25.7",
44-
"@babel/preset-react": "7.25.7",
45-
"@babel/preset-typescript": "7.25.7",
4640
"asmcrypto.js": "^0.22.0",
4741
"babel-loader": "^9.1.3",
4842
"backbone": "^1.6.0",
@@ -133,6 +127,8 @@
133127
},
134128
"devDependencies": {
135129
"@babel/cli": "7.23.0",
130+
"@babel/plugin-proposal-class-properties": "^7.18.6",
131+
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
136132
"@types/backbone": "^1.4.19",
137133
"@types/postcss-import": "^14",
138134
"@types/sinon-chai": "3.2.5",

packages/fxa-content-server/webpack.config.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,7 @@ const webpackConfig = {
167167
[
168168
'@babel/preset-env',
169169
{
170-
targets: {
171-
firefox: '60',
172-
edge: '16',
173-
},
170+
targets: '> 0.25%, last 2 versions, not dead',
174171
corejs: 3,
175172
include: [
176173
// these are all for edge - setting the target isn't enough
@@ -185,6 +182,7 @@ const webpackConfig = {
185182
['@babel/preset-react', {}],
186183
'@babel/preset-typescript',
187184
],
185+
ignore: ['node_modules/**', 'tests/**', 'scripts/**'],
188186
plugins: [
189187
'@babel/syntax-dynamic-import',
190188
'@babel/plugin-proposal-class-properties',

packages/fxa-payments-server/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@
5656
},
5757
"homepage": "https://github.com/mozilla/fxa/tree/main/packages/fxa-payments-server#README.md",
5858
"devDependencies": {
59-
"@babel/core": "7.25.7",
60-
"@babel/preset-env": "7.25.7",
61-
"@babel/preset-react": "7.25.7",
62-
"@babel/preset-typescript": "7.25.7",
6359
"@fluent/bundle": "^0.18.0",
6460
"@fluent/langneg": "^0.7.0",
6561
"@rescripts/cli": "~0.0.16",
@@ -72,7 +68,6 @@
7268
"@storybook/react-webpack5": "7.0.23",
7369
"@testing-library/jest-dom": "^5.16.5",
7470
"@types/accept-language-parser": "^1.5.1",
75-
"@types/babel__preset-env": "^7",
7671
"@types/classnames": "2.3.1",
7772
"@types/jest": "26.0.23",
7873
"@types/nock": "^11.1.0",

packages/fxa-react/package.json

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,6 @@
4747
"tailwindcss-dir": "^4.0.0"
4848
},
4949
"devDependencies": {
50-
"@babel/core": "7.25.7",
51-
"@babel/plugin-transform-typescript": "7.26.8",
52-
"@babel/preset-env": "7.25.7",
53-
"@babel/preset-react": "7.25.7",
54-
"@babel/preset-typescript": "7.25.7",
5550
"@storybook/addon-actions": "8.0.0",
5651
"@storybook/addon-links": "7.6.4",
5752
"@storybook/addon-styling": "1.3.0",
@@ -62,7 +57,6 @@
6257
"@testing-library/dom": "^10.4.0",
6358
"@testing-library/jest-dom": "^5.16.5",
6459
"@testing-library/user-event": "^14.6.0",
65-
"@types/babel__preset-env": "^7",
6660
"@types/camelcase": "5.2.0",
6761
"@types/classnames": "2.3.1",
6862
"@types/file-loader": "^5.0.0",
@@ -105,6 +99,16 @@
10599
"keywords": [
106100
"fxa"
107101
],
102+
"babel": {
103+
"presets": [
104+
[
105+
"@babel/preset-env",
106+
{
107+
"targets": "> 0.25%, last 2 versions, not dead"
108+
}
109+
]
110+
]
111+
},
108112
"author": "Mozilla (https://mozilla.org/)",
109113
"license": "MPL-2.0",
110114
"bugs": {

packages/fxa-settings/config/jest/babelTransform.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// This file was created by react-scripts' (create-react-app) eject script.
22

3-
'use strict';
4-
53
const babelJest = require('babel-jest').default;
64

75
const hasJsxRuntime = (() => {

0 commit comments

Comments
 (0)