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.

Sign up for GitHub

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

Jump to bottom

Bump babel-related dependencies #1175

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Bump babel-related dependencies #1175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ffc18e
Bump babel-related dependencies
joshuarrrr Dec 12, 2023
b056c53
Merge branch 'main' into security/bump-babel-deps
joshuarrrr Dec 12, 2023
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
2 changes: 0 additions & 2 deletions .babelrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ module.exports = {
"./scripts/babel/proptypes-from-ts-props",
"./scripts/babel/variables-from-scss",
"add-module-exports",
// stage 3
"@babel/transform-object-rest-spread",
// stage 2
"@babel/transform-class-properties",
[
"inline-react-svg",
Expand Down
2 changes: 1 addition & 1 deletion .eslintplugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
exports.rules = {
i18n: require('./scripts/eslint-plugin/i18n'),
'href-with-rel': require('./scripts/eslint-plugin/rel'),
'require-license-header': require('./scripts/eslint-plugin/require_license_header'),
// 'require-license-header': require('./scripts/eslint-plugin/require_license_header'),
'forward-ref': require('./scripts/eslint-plugin/forward_ref_display_name'),
};
12 changes: 6 additions & 6 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,12 @@ module.exports = {
'local/i18n': 'error',
'local/href-with-rel': 'error',
'local/forward-ref': 'error',
'local/require-license-header': [
'error',
{
licenses: [OSD_NEW_HEADER, OSD_HEADER],
},
],
// 'local/require-license-header': [
// 'error',
// {
// licenses: [OSD_NEW_HEADER, OSD_HEADER],
// },
// ],
'no-use-before-define': 'off',
quotes: ['warn', 'single', 'avoid-escape'],
camelcase: 'off',
Expand Down
35 changes: 19 additions & 16 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"@babel/cli/**/minimist": "^1.2.6",
"@babel/cli/chokidar/glob-parent": "^6.0.1",
"@elastic/charts/**/d3-color": "^3.1.0",
"@svgr/**/@babel/traverse": "^7.23.2",
"@types/jest/**/ansi-regex": "^5.0.1",
"babel-plugin-add-module-exports/chokidar/glob-parent": "^6.0.1",
"babel-plugin-inline-react-svg/**/ansi-regex": "^5.0.1",
Expand All @@ -63,8 +64,10 @@
"enzyme/cheerio/cheerio-select-tmp/css-select/css-what": "^6.1.0",
"enzyme/cheerio/cheerio-select-tmp/css-what": "^6.1.0",
"html-webpack-plugin/**/ansi-regex": "^5.0.1",
"jest-cli/**/@babel/traverse": "^7.23.2",
"jest-cli/**/ansi-regex": "^5.0.1",
"jest-cli/**/tough-cookie": "^4.1.3",
"jest/**/@babel/traverse": "^7.23.2",
"jest/**/node-notifier": "^10.0.1",
"jest/**/tough-cookie": "^4.1.3",
"postcss-cli/chokidar/glob-parent": "^6.0.1",
Expand Down Expand Up @@ -134,24 +137,25 @@
},
"devDependencies": {
"@axe-core/puppeteer": "4.6.1",
"@babel/cli": "^7.10.5",
"@babel/core": "^7.11.4",
"@babel/cli": "^7.23.4",
"@babel/core": "^7.23.6",
"@babel/eslint-parser": "^7.23.3",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-transform-async-to-generator": "^7.10.4",
"@babel/plugin-transform-async-to-generator": "^7.23.3",
"@babel/plugin-transform-class-properties": "^7.23.3",
"@babel/plugin-transform-object-rest-spread": "^7.23.3",
"@babel/plugin-transform-runtime": "^7.11.0",
"@babel/preset-env": "^7.11.0",
"@babel/preset-react": "^7.10.4",
"@babel/preset-typescript": "^7.12.1",
"@babel/template": "^7.10.4",
"@babel/plugin-transform-runtime": "^7.23.6",
"@babel/preset-env": "^7.23.6",
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@babel/template": "^7.22.15",
"@elastic/charts": "^30.2.0",
"@elastic/eslint-config-kibana": "^0.15.0",
"@faker-js/faker": "^8.0.1",
"@opensearch/datemath": "file:./packages/opensearch-datemath",
"@svgr/core": "^8.0.0",
"@svgr/plugin-jsx": "^8.0.1",
"@svgr/plugin-svgo": "^8.0.1",
"@svgr/core": "^8.1.0",
"@svgr/plugin-jsx": "^8.1.0",
"@svgr/plugin-svgo": "^8.1.0",
"@types/cheerio": "^0.22.31",
"@types/enzyme": "3.10.12",
"@types/jest": "^24.0.6",
Expand All @@ -165,12 +169,11 @@
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"autoprefixer": "^9.8.6",
"babel-eslint": "^10.1.0",
"babel-jest": "^24.1.0",
"babel-jest": "^29.7.0",
"babel-loader": "^8.1.0",
"babel-plugin-add-module-exports": "^1.0.2",
"babel-plugin-add-module-exports": "^1.0.4",
"babel-plugin-dynamic-import-node": "^2.3.3",
"babel-plugin-inline-react-svg": "^1.1.1",
"babel-plugin-inline-react-svg": "^1.1.2",
"babel-plugin-pegjs-inline-precompile": "^0.1.1",
"cache-loader": "^4.1.0",
"chalk": "^4.1.2",
Expand Down Expand Up @@ -229,7 +232,7 @@
"react-router": "^5.3.4",
"react-router-dom": "^5.3.4",
"react-router-redux": "^4.0.8",
"react-view": "^2.3.2",
"react-view": "^2.3.7",
"redux": "^4.2.1",
"redux-thunk": "^2.4.2",
"resolve": "^1.22.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-datepicker/.eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
},

"parser": "babel-eslint",
"parser": "@babel/eslint-parser",

"rules": {
"react/display-name": 2,
Expand Down
2 changes: 1 addition & 1 deletion scripts/eslint-plugin/forward_ref_display_name.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import rule from './forward_ref_display_name.js';
const RuleTester = require('eslint').RuleTester;

const ruleTester = new RuleTester({
parser: 'babel-eslint',
parser: '@babel/eslint-parser',
});

const valid = [
Expand Down
2 changes: 1 addition & 1 deletion scripts/eslint-plugin/i18n.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const rule = require('./i18n');
const RuleTester = require('eslint').RuleTester;

const ruleTester = new RuleTester({
parser: require.resolve('babel-eslint'),
parser: require.resolve('@babel/eslint-parser'),
});

const valid = [
Expand Down
2 changes: 1 addition & 1 deletion scripts/eslint-plugin/rel.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const rule = require('./rel');
const RuleTester = require('eslint').RuleTester;

const ruleTester = new RuleTester({
parser: 'babel-eslint',
parser: '@babel/eslint-parser',
});

const valid = [
Expand Down
2 changes: 1 addition & 1 deletion scripts/eslint-plugin/require_license_header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* under the License.
*/

const babelEslint = require('babel-eslint');
const babelEslint = require('@babel/eslint-parser');

function assert(truth, message) {
if (truth) {
Expand Down
2 changes: 1 addition & 1 deletion scripts/eslint-plugin/require_license_header.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const rule = require('./require_license_header');
const dedent = require('dedent');

const ruleTester = new RuleTester({
parser: require.resolve('babel-eslint'),
parser: require.resolve('@babel/eslint-parser'),
parserOptions: {
ecmaVersion: 2018,
},
Expand Down
7 changes: 6 additions & 1 deletion src-docs/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const webpackConfig = {
},

resolve: {
extensions: ['.ts', '.tsx', '.js', '.json'],
extensions: ['.ts', '.tsx', '.js', '.json', '.mjs'],
},

resolveLoader: {
Expand Down Expand Up @@ -111,6 +111,11 @@ const webpackConfig = {
name: 'images/[hash]-[name].[ext]',
},
},
{
test: /\.mjs$/,
include: /node_modules/,
type: 'javascript/auto',
},
],
},

Expand Down
Loading
Loading