diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 67a5bc3b19d..bd39d864153 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -327,7 +327,6 @@ tsconfig.json @grafana/frontend-ops /.yarnrc.yml @grafana/frontend-ops /yarn.lock @grafana/frontend-ops /.linguirc @grafana/user-essentials -/babel.config.json @grafana/frontend-ops lerna.json @grafana/frontend-ops /.prettierrc.js @grafana/frontend-ops /.eslintrc @grafana/frontend-ops diff --git a/.github/pr-commands.json b/.github/pr-commands.json index 81f055a99ce..7776cf4a17f 100644 --- a/.github/pr-commands.json +++ b/.github/pr-commands.json @@ -23,7 +23,6 @@ "package.json", "tsconfig.json", "lerna.json", - ".babelrc", ".prettierrc.js", ".eslintrc", "**/*.mdx" diff --git a/Dockerfile b/Dockerfile index 69d84fba5a1..a5b07242ae7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ COPY plugins-bundled plugins-bundled RUN yarn install -COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js babel.config.json .linguirc ./ +COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js .linguirc ./ COPY public public COPY scripts scripts COPY emails emails diff --git a/babel.config.json b/babel.config.json deleted file mode 100644 index 28e9f48eeed..00000000000 --- a/babel.config.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "babelrc": false, - // Note: order is bottom-to-top and/or right-to-left - "presets": [ - [ - "@babel/preset-env", - { - "bugfixes": true, - "browserslistEnv": "dev", - "useBuiltIns": "entry", - "corejs": "3.10" - } - ], - [ - "@babel/preset-typescript", - { - "allowNamespaces": true, - "allowDeclareFields": true - } - ], - [ - "@babel/preset-react", - { - "runtime": "automatic" - } - ] - ], - "plugins": [ - [ - "@babel/plugin-transform-typescript", - { - "allowNamespaces": true, - "allowDeclareFields": true - } - ], - // added to mitigate https://github.com/babel/babel/issues/14289 - // package (and following line) can be removed once the issue is fixed and released - "@babel/plugin-proposal-class-properties", - ["@babel/plugin-proposal-object-rest-spread", { "loose": true }], - "@babel/plugin-transform-react-constant-elements", - "@babel/plugin-proposal-nullish-coalescing-operator", - "@babel/plugin-proposal-optional-chaining", - "@babel/plugin-syntax-dynamic-import", // needed for `() => import()` in routes.ts - "angularjs-annotate", - "macros" - ], - "env": { - "production": { - "presets": [ - [ - "@babel/preset-env", - { - "browserslistEnv": "production" - } - ] - ] - }, - "hot": { - "plugins": ["react-refresh/babel"] - } - } -} diff --git a/package.json b/package.json index f02aeb91db7..e3d51369a3e 100644 --- a/package.json +++ b/package.json @@ -84,18 +84,6 @@ ] }, "devDependencies": { - "@babel/core": "7.20.5", - "@babel/plugin-proposal-class-properties": "7.18.6", - "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6", - "@babel/plugin-proposal-object-rest-spread": "7.20.2", - "@babel/plugin-proposal-optional-chaining": "7.20.7", - "@babel/plugin-syntax-dynamic-import": "7.8.3", - "@babel/plugin-transform-react-constant-elements": "7.20.2", - "@babel/plugin-transform-runtime": "7.19.6", - "@babel/plugin-transform-typescript": "7.20.0", - "@babel/preset-env": "7.20.2", - "@babel/preset-react": "7.18.6", - "@babel/preset-typescript": "7.18.6", "@babel/runtime": "7.20.1", "@betterer/betterer": "5.4.0", "@betterer/cli": "5.4.0", @@ -172,10 +160,6 @@ "@typescript-eslint/eslint-plugin": "5.42.0", "@typescript-eslint/parser": "5.42.0", "autoprefixer": "10.4.13", - "babel-jest": "29.3.1", - "babel-loader": "9.1.0", - "babel-plugin-angularjs-annotate": "0.10.0", - "babel-plugin-macros": "3.1.0", "blob-polyfill": "7.0.20220408", "browserslist": "^4.21.4", "chance": "^1.0.10", @@ -242,7 +226,6 @@ "terser-webpack-plugin": "5.3.6", "testing-library-selector": "0.2.1", "ts-jest": "29.0.3", - "ts-loader": "9.3.1", "ts-node": "10.9.1", "typescript": "4.8.4", "wait-on": "6.0.1", diff --git a/yarn.lock b/yarn.lock index 88f3eef3845..cc899d1160e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1258,15 +1258,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-skip-transparent-expression-wrappers@npm:^7.20.0": - version: 7.20.0 - resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.20.0" - dependencies: - "@babel/types": ^7.20.0 - checksum: 34da8c832d1c8a546e45d5c1d59755459ffe43629436707079989599b91e8c19e50e73af7a4bd09c95402d389266731b0d9c5f69e372d8ebd3a709c05c80d7dd - languageName: node - linkType: hard - "@babel/helper-split-export-declaration@npm:^7.15.4": version: 7.15.4 resolution: "@babel/helper-split-export-declaration@npm:7.15.4" @@ -1807,21 +1798,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-object-rest-spread@npm:7.20.2, @babel/plugin-proposal-object-rest-spread@npm:^7.20.2": - version: 7.20.2 - resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.20.2" - dependencies: - "@babel/compat-data": ^7.20.1 - "@babel/helper-compilation-targets": ^7.20.0 - "@babel/helper-plugin-utils": ^7.20.2 - "@babel/plugin-syntax-object-rest-spread": ^7.8.3 - "@babel/plugin-transform-parameters": ^7.20.1 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 9764d1a4735fcd384fdb9b6c6ccb20d1bea2f88f648640d26ce5d9cd5880ce1e389d2f852d7bea7e86ff343726225dc16e1deb92c7b3dc5c5721ed905a602318 - languageName: node - linkType: hard - "@babel/plugin-proposal-object-rest-spread@npm:^7.12.1, @babel/plugin-proposal-object-rest-spread@npm:^7.19.4": version: 7.19.4 resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.19.4" @@ -1837,6 +1813,21 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-proposal-object-rest-spread@npm:^7.20.2": + version: 7.20.2 + resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.20.2" + dependencies: + "@babel/compat-data": ^7.20.1 + "@babel/helper-compilation-targets": ^7.20.0 + "@babel/helper-plugin-utils": ^7.20.2 + "@babel/plugin-syntax-object-rest-spread": ^7.8.3 + "@babel/plugin-transform-parameters": ^7.20.1 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 9764d1a4735fcd384fdb9b6c6ccb20d1bea2f88f648640d26ce5d9cd5880ce1e389d2f852d7bea7e86ff343726225dc16e1deb92c7b3dc5c5721ed905a602318 + languageName: node + linkType: hard + "@babel/plugin-proposal-optional-catch-binding@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-proposal-optional-catch-binding@npm:7.18.6" @@ -1862,19 +1853,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-optional-chaining@npm:7.20.7": - version: 7.20.7 - resolution: "@babel/plugin-proposal-optional-chaining@npm:7.20.7" - dependencies: - "@babel/helper-plugin-utils": ^7.20.2 - "@babel/helper-skip-transparent-expression-wrappers": ^7.20.0 - "@babel/plugin-syntax-optional-chaining": ^7.8.3 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 274b8932335bd064ca24cf1a4da2b2c20c92726d4bfa8b0cb5023857479b8481feef33505c16650c7b9239334e5c6959babc924816324c4cf223dd91c7ca79bc - languageName: node - linkType: hard - "@babel/plugin-proposal-private-methods@npm:^7.12.1, @babel/plugin-proposal-private-methods@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-proposal-private-methods@npm:7.18.6" @@ -2200,17 +2178,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-typescript@npm:^7.20.0": - version: 7.20.0 - resolution: "@babel/plugin-syntax-typescript@npm:7.20.0" - dependencies: - "@babel/helper-plugin-utils": ^7.19.0 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 6189c0b5c32ba3c9a80a42338bd50719d783b20ef29b853d4f03929e971913d3cefd80184e924ae98ad6db09080be8fe6f1ffde9a6db8972523234f0274d36f7 - languageName: node - linkType: hard - "@babel/plugin-syntax-typescript@npm:^7.7.2": version: 7.16.0 resolution: "@babel/plugin-syntax-typescript@npm:7.16.0" @@ -2694,17 +2661,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-react-constant-elements@npm:7.20.2": - version: 7.20.2 - resolution: "@babel/plugin-transform-react-constant-elements@npm:7.20.2" - dependencies: - "@babel/helper-plugin-utils": ^7.20.2 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 7b041b726e7c14b8c26a0dd240defac5f93a1f449371c6bdc5e6b46d581211300cc1a79da4140bdf20347f49e175dcb4f469812399206864024d1fdc81171193 - languageName: node - linkType: hard - "@babel/plugin-transform-react-display-name@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-transform-react-display-name@npm:7.18.6" @@ -2808,22 +2764,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-runtime@npm:7.19.6": - version: 7.19.6 - resolution: "@babel/plugin-transform-runtime@npm:7.19.6" - dependencies: - "@babel/helper-module-imports": ^7.18.6 - "@babel/helper-plugin-utils": ^7.19.0 - babel-plugin-polyfill-corejs2: ^0.3.3 - babel-plugin-polyfill-corejs3: ^0.6.0 - babel-plugin-polyfill-regenerator: ^0.4.1 - semver: ^6.3.0 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: ef93efbcbb00dcf4da6dcc55bda698a2a57fca3fb05a6a13e932ecfdb7c1c5d2f0b5b245c1c4faca0318853937caba0d82442f58b7653249f64275d08052fbd8 - languageName: node - linkType: hard - "@babel/plugin-transform-shorthand-properties@npm:^7.12.1, @babel/plugin-transform-shorthand-properties@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-transform-shorthand-properties@npm:7.18.6" @@ -2905,19 +2845,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-typescript@npm:7.20.0": - version: 7.20.0 - resolution: "@babel/plugin-transform-typescript@npm:7.20.0" - dependencies: - "@babel/helper-create-class-features-plugin": ^7.19.0 - "@babel/helper-plugin-utils": ^7.19.0 - "@babel/plugin-syntax-typescript": ^7.20.0 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 7cc335a95374d03e09ec48fe313dccde477ab4784f26f7b24fdc7a9db3c670759c3c8177a671a68365467c0885dad82b5dda3f57ba0b6bf7459f4ae55fae4ee4 - languageName: node - linkType: hard - "@babel/plugin-transform-typescript@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-transform-typescript@npm:7.18.6" @@ -3690,17 +3617,6 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:^7.20.0": - version: 7.20.7 - resolution: "@babel/types@npm:7.20.7" - dependencies: - "@babel/helper-string-parser": ^7.19.4 - "@babel/helper-validator-identifier": ^7.19.1 - to-fast-properties: ^2.0.0 - checksum: b39af241f0b72bba67fd6d0d23914f6faec8c0eba8015c181cbd5ea92e59fc91a52a1ab490d3520c7dbd19ddb9ebb76c476308f6388764f16d8201e37fae6811 - languageName: node - linkType: hard - "@babel/types@npm:^7.20.2, @babel/types@npm:^7.20.5": version: 7.20.5 resolution: "@babel/types@npm:7.20.5" @@ -14183,7 +14099,7 @@ __metadata: languageName: node linkType: hard -"babel-jest@npm:29.3.1, babel-jest@npm:^29.3.1": +"babel-jest@npm:^29.3.1": version: 29.3.1 resolution: "babel-jest@npm:29.3.1" dependencies: @@ -14331,17 +14247,6 @@ __metadata: languageName: node linkType: hard -"babel-plugin-macros@npm:3.1.0, babel-plugin-macros@npm:^3.0.1, babel-plugin-macros@npm:^3.1.0": - version: 3.1.0 - resolution: "babel-plugin-macros@npm:3.1.0" - dependencies: - "@babel/runtime": ^7.12.5 - cosmiconfig: ^7.0.0 - resolve: ^1.19.0 - checksum: 765de4abebd3e4688ebdfbff8571ddc8cd8061f839bb6c3e550b0344a4027b04c60491f843296ce3f3379fb356cc873d57a9ee6694262547eb822c14a25be9a6 - languageName: node - linkType: hard - "babel-plugin-macros@npm:^2.0.0, babel-plugin-macros@npm:^2.6.1": version: 2.8.0 resolution: "babel-plugin-macros@npm:2.8.0" @@ -14353,6 +14258,17 @@ __metadata: languageName: node linkType: hard +"babel-plugin-macros@npm:^3.0.1, babel-plugin-macros@npm:^3.1.0": + version: 3.1.0 + resolution: "babel-plugin-macros@npm:3.1.0" + dependencies: + "@babel/runtime": ^7.12.5 + cosmiconfig: ^7.0.0 + resolve: ^1.19.0 + checksum: 765de4abebd3e4688ebdfbff8571ddc8cd8061f839bb6c3e550b0344a4027b04c60491f843296ce3f3379fb356cc873d57a9ee6694262547eb822c14a25be9a6 + languageName: node + linkType: hard + "babel-plugin-named-exports-order@npm:^0.0.2": version: 0.0.2 resolution: "babel-plugin-named-exports-order@npm:0.0.2" @@ -21845,18 +21761,6 @@ __metadata: version: 0.0.0-use.local resolution: "grafana@workspace:." dependencies: - "@babel/core": 7.20.5 - "@babel/plugin-proposal-class-properties": 7.18.6 - "@babel/plugin-proposal-nullish-coalescing-operator": 7.18.6 - "@babel/plugin-proposal-object-rest-spread": 7.20.2 - "@babel/plugin-proposal-optional-chaining": 7.20.7 - "@babel/plugin-syntax-dynamic-import": 7.8.3 - "@babel/plugin-transform-react-constant-elements": 7.20.2 - "@babel/plugin-transform-runtime": 7.19.6 - "@babel/plugin-transform-typescript": 7.20.0 - "@babel/preset-env": 7.20.2 - "@babel/preset-react": 7.18.6 - "@babel/preset-typescript": 7.18.6 "@babel/runtime": 7.20.1 "@betterer/betterer": 5.4.0 "@betterer/cli": 5.4.0 @@ -21988,10 +21892,6 @@ __metadata: ansicolor: 1.1.100 app: "link:./public/app" autoprefixer: 10.4.13 - babel-jest: 29.3.1 - babel-loader: 9.1.0 - babel-plugin-angularjs-annotate: 0.10.0 - babel-plugin-macros: 3.1.0 baron: 3.0.3 blob-polyfill: 7.0.20220408 brace: 0.11.1 @@ -22160,7 +22060,6 @@ __metadata: tether-drop: "https://github.com/torkelo/drop" tinycolor2: 1.6.0 ts-jest: 29.0.3 - ts-loader: 9.3.1 ts-node: 10.9.1 tslib: 2.5.0 tween-functions: ^1.2.0 @@ -37271,7 +37170,7 @@ __metadata: languageName: node linkType: hard -"ts-loader@npm:9.3.1, ts-loader@npm:^9.3.1": +"ts-loader@npm:^9.3.1": version: 9.3.1 resolution: "ts-loader@npm:9.3.1" dependencies: