Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Babel and dependencies #15392

Merged
merged 2 commits into from
Aug 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 4 additions & 15 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,13 @@ module.exports = function (api) {
parserOpts: {
strictMode: true,
},
targets: {
browsers: ['chrome >= 66', 'firefox >= 68'],
},
Comment on lines +7 to +9
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Gudahtt pinging you on this, just wanted to alert you of this change as it will likely impact #12847. This was changed in babel to support making the targets available to all plugins and presets instead of just preset-env.

presets: [
'@babel/preset-typescript',
[
'@babel/preset-env',
{
targets: {
browsers: ['chrome >= 66', 'firefox >= 68'],
},
},
],
'@babel/preset-env',
'@babel/preset-react',
],
plugins: [
'@babel/plugin-transform-runtime',
'@babel/plugin-proposal-class-properties',
'@babel/plugin-proposal-object-rest-spread',
'@babel/plugin-proposal-optional-chaining',
'@babel/plugin-proposal-nullish-coalescing-operator',
],
};
};
5 changes: 0 additions & 5 deletions development/build/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ const { getBrowserVersionMap } = require('./utils');
// Required for LavaMoat policy generation
require('loose-envify');
require('globalthis');
require('@babel/plugin-proposal-object-rest-spread');
require('@babel/plugin-transform-runtime');
require('@babel/plugin-proposal-class-properties');
require('@babel/plugin-proposal-optional-chaining');
require('@babel/plugin-proposal-nullish-coalescing-operator');
require('@babel/preset-env');
require('@babel/preset-react');
require('@babel/preset-typescript');
Expand Down
7 changes: 3 additions & 4 deletions lavamoat/browserify/beta/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -2201,8 +2201,8 @@
}
},
"@babel/runtime": {
"packages": {
"@storybook/api>regenerator-runtime": true
"globals": {
"regeneratorRuntime": "write"
}
},
"@download/blockies": {
Expand Down Expand Up @@ -2318,8 +2318,7 @@
},
"@eth-optimism/contracts": {
"packages": {
"ethers": true,
"ethers>@ethersproject/abstract-provider": true
"ethers": true
}
},
"@ethereumjs/common": {
Expand Down
7 changes: 3 additions & 4 deletions lavamoat/browserify/flask/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -2201,8 +2201,8 @@
}
},
"@babel/runtime": {
"packages": {
"@storybook/api>regenerator-runtime": true
"globals": {
"regeneratorRuntime": "write"
}
},
"@download/blockies": {
Expand Down Expand Up @@ -2318,8 +2318,7 @@
},
"@eth-optimism/contracts": {
"packages": {
"ethers": true,
"ethers>@ethersproject/abstract-provider": true
"ethers": true
}
},
"@ethereumjs/common": {
Expand Down
7 changes: 3 additions & 4 deletions lavamoat/browserify/main/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -2201,8 +2201,8 @@
}
},
"@babel/runtime": {
"packages": {
"@storybook/api>regenerator-runtime": true
"globals": {
"regeneratorRuntime": "write"
}
},
"@download/blockies": {
Expand Down Expand Up @@ -2318,8 +2318,7 @@
},
"@eth-optimism/contracts": {
"packages": {
"ethers": true,
"ethers>@ethersproject/abstract-provider": true
"ethers": true
}
},
"@ethereumjs/common": {
Expand Down
16 changes: 16 additions & 0 deletions lavamoat/build-system/policy-override.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,22 @@
"@babel/preset-typescript": true
}
},
"@babel/eslint-parser": {
"builtin": {
"path": true
},
"packages": {
"@babel/core": true,
"@babel/eslint-parser>eslint-scope": true,
"@babel/eslint-parser>eslint-visitor-keys": true,
"@babel/eslint-parser>semver": true,
"depcheck>@babel/parser": true,
"eslint": true
},
"globals": {
"process.versions": true
}
},
"eslint>@eslint/eslintrc": {
"builtin": {
"assert": true,
Expand Down
Loading