diff --git a/devenv/docker/loadtest-ts/package.json b/devenv/docker/loadtest-ts/package.json index d94ba530f56..969b2e547d9 100644 --- a/devenv/docker/loadtest-ts/package.json +++ b/devenv/docker/loadtest-ts/package.json @@ -6,13 +6,13 @@ "devDependencies": { "@babel/core": "7.19.0", "@babel/plugin-proposal-class-properties": "7.18.6", - "@babel/plugin-proposal-object-rest-spread": "7.18.9", + "@babel/plugin-proposal-object-rest-spread": "7.19.4", "@babel/preset-env": "7.19.0", "@babel/preset-typescript": "7.18.6", "@types/k6": "0.39.0", "@types/shortid": "0.0.29", "@types/webpack": "5.28.0", - "babel-loader": "8.2.5", + "babel-loader": "9.0.0", "shortid": "2.2.16", "ts-node": "10.9.1", "typescript": "4.8.2", diff --git a/devenv/docker/loadtest-ts/yarn.lock b/devenv/docker/loadtest-ts/yarn.lock index 95ac3e852d3..dce893e5650 100644 --- a/devenv/docker/loadtest-ts/yarn.lock +++ b/devenv/docker/loadtest-ts/yarn.lock @@ -24,7 +24,7 @@ __metadata: languageName: node linkType: hard -"@babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.18.8, @babel/compat-data@npm:^7.19.0, @babel/compat-data@npm:^7.19.3, @babel/compat-data@npm:^7.19.4": +"@babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.19.0, @babel/compat-data@npm:^7.19.3, @babel/compat-data@npm:^7.19.4": version: 7.19.4 resolution: "@babel/compat-data@npm:7.19.4" checksum: 757fdaeb6756c2d323ff56f60fb8e670292108cda6abf762a56c0d40910ecc4d2c7e283dbdfbcee6bc28c74ad659144352609e1cb49d31e101ab13ea5ce90072 @@ -481,22 +481,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-object-rest-spread@npm:7.18.9": - version: 7.18.9 - resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.18.9" - dependencies: - "@babel/compat-data": ^7.18.8 - "@babel/helper-compilation-targets": ^7.18.9 - "@babel/helper-plugin-utils": ^7.18.9 - "@babel/plugin-syntax-object-rest-spread": ^7.8.3 - "@babel/plugin-transform-parameters": ^7.18.8 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 66b9bae741d46edf1c96776d26dfe5d335981e57164ec2450583e3d20dfaa08a5137ffebb897e443913207789f9816bfec4ae845f38762c0196a60949eaffdba - languageName: node - linkType: hard - -"@babel/plugin-proposal-object-rest-spread@npm:^7.18.9": +"@babel/plugin-proposal-object-rest-spread@npm:7.19.4, @babel/plugin-proposal-object-rest-spread@npm:^7.18.9": version: 7.19.4 resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.19.4" dependencies: @@ -1325,13 +1310,13 @@ __metadata: dependencies: "@babel/core": 7.19.0 "@babel/plugin-proposal-class-properties": 7.18.6 - "@babel/plugin-proposal-object-rest-spread": 7.18.9 + "@babel/plugin-proposal-object-rest-spread": 7.19.4 "@babel/preset-env": 7.19.0 "@babel/preset-typescript": 7.18.6 "@types/k6": 0.39.0 "@types/shortid": 0.0.29 "@types/webpack": 5.28.0 - babel-loader: 8.2.5 + babel-loader: 9.0.0 shortid: 2.2.16 ts-node: 10.9.1 typescript: 4.8.2 @@ -1475,7 +1460,7 @@ __metadata: languageName: node linkType: hard -"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8": +"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": version: 7.0.11 resolution: "@types/json-schema@npm:7.0.11" checksum: 527bddfe62db9012fccd7627794bd4c71beb77601861055d87e3ee464f2217c85fca7a4b56ae677478367bbd248dbde13553312b7d4dbc702a2f2bbf60c4018d @@ -1737,6 +1722,20 @@ __metadata: languageName: node linkType: hard +"ajv-formats@npm:^2.1.1": + version: 2.1.1 + resolution: "ajv-formats@npm:2.1.1" + dependencies: + ajv: ^8.0.0 + peerDependencies: + ajv: ^8.0.0 + peerDependenciesMeta: + ajv: + optional: true + checksum: 4a287d937f1ebaad4683249a4c40c0fa3beed30d9ddc0adba04859026a622da0d317851316ea64b3680dc60f5c3c708105ddd5d5db8fe595d9d0207fd19f90b7 + languageName: node + linkType: hard + "ajv-keywords@npm:^3.5.2": version: 3.5.2 resolution: "ajv-keywords@npm:3.5.2" @@ -1746,7 +1745,18 @@ __metadata: languageName: node linkType: hard -"ajv@npm:^6.12.4, ajv@npm:^6.12.5": +"ajv-keywords@npm:^5.0.0": + version: 5.1.0 + resolution: "ajv-keywords@npm:5.1.0" + dependencies: + fast-deep-equal: ^3.1.3 + peerDependencies: + ajv: ^8.8.2 + checksum: c35193940b853119242c6757787f09ecf89a2c19bcd36d03ed1a615e710d19d450cb448bfda407b939aba54b002368c8bff30529cc50a0536a8e10bcce300421 + languageName: node + linkType: hard + +"ajv@npm:^6.12.5": version: 6.12.6 resolution: "ajv@npm:6.12.6" dependencies: @@ -1758,6 +1768,18 @@ __metadata: languageName: node linkType: hard +"ajv@npm:^8.0.0, ajv@npm:^8.8.0": + version: 8.11.0 + resolution: "ajv@npm:8.11.0" + dependencies: + fast-deep-equal: ^3.1.1 + json-schema-traverse: ^1.0.0 + require-from-string: ^2.0.2 + uri-js: ^4.2.2 + checksum: 5e0ff226806763be73e93dd7805b634f6f5921e3e90ca04acdf8db81eed9d8d3f0d4c5f1213047f45ebbf8047ffe0c840fa1ef2ec42c3a644899f69aa72b5bef + languageName: node + linkType: hard + "ansi-styles@npm:^3.2.1": version: 3.2.1 resolution: "ansi-styles@npm:3.2.1" @@ -1774,18 +1796,16 @@ __metadata: languageName: node linkType: hard -"babel-loader@npm:8.2.5": - version: 8.2.5 - resolution: "babel-loader@npm:8.2.5" +"babel-loader@npm:9.0.0": + version: 9.0.0 + resolution: "babel-loader@npm:9.0.0" dependencies: - find-cache-dir: ^3.3.1 - loader-utils: ^2.0.0 - make-dir: ^3.1.0 - schema-utils: ^2.6.5 + find-cache-dir: ^3.3.2 + schema-utils: ^4.0.0 peerDependencies: - "@babel/core": ^7.0.0 - webpack: ">=2" - checksum: a6605557885eabbc3250412405f2c63ca87287a95a439c643fdb47d5ea3d5326f72e43ab97be070316998cb685d5dfbc70927ce1abe8be7a6a4f5919287773fb + "@babel/core": ^7.12.0 + webpack: ">=5" + checksum: 6b146e33c81fd948ffdefa8a6319efa1bea6e17c946bfac4641375710e51831aeb7f4a20c88604eaa00f5ecd4b6591da5a65ade326feba792609f932df150645 languageName: node linkType: hard @@ -1832,13 +1852,6 @@ __metadata: languageName: node linkType: hard -"big.js@npm:^5.2.2": - version: 5.2.2 - resolution: "big.js@npm:5.2.2" - checksum: b89b6e8419b097a8fb4ed2399a1931a68c612bce3cfd5ca8c214b2d017531191070f990598de2fc6f3f993d91c0f08aa82697717f6b3b8732c9731866d233c9e - languageName: node - linkType: hard - "brace-expansion@npm:^1.1.7": version: 1.1.11 resolution: "brace-expansion@npm:1.1.11" @@ -2017,13 +2030,6 @@ __metadata: languageName: node linkType: hard -"emojis-list@npm:^3.0.0": - version: 3.0.0 - resolution: "emojis-list@npm:3.0.0" - checksum: ddaaa02542e1e9436c03970eeed445f4ed29a5337dfba0fe0c38dfdd2af5da2429c2a0821304e8a8d1cadf27fdd5b22ff793571fa803ae16852a6975c65e8e70 - languageName: node - linkType: hard - "enhanced-resolve@npm:^5.10.0": version: 5.10.0 resolution: "enhanced-resolve@npm:5.10.0" @@ -2111,7 +2117,7 @@ __metadata: languageName: node linkType: hard -"fast-deep-equal@npm:^3.1.1": +"fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3": version: 3.1.3 resolution: "fast-deep-equal@npm:3.1.3" checksum: e21a9d8d84f53493b6aa15efc9cfd53dd5b714a1f23f67fb5dc8f574af80df889b3bce25dc081887c6d25457cce704e636395333abad896ccdec03abaf1f3f9d @@ -2132,7 +2138,7 @@ __metadata: languageName: node linkType: hard -"find-cache-dir@npm:^3.3.1": +"find-cache-dir@npm:^3.3.2": version: 3.3.2 resolution: "find-cache-dir@npm:3.3.2" dependencies: @@ -2342,7 +2348,14 @@ __metadata: languageName: node linkType: hard -"json5@npm:^2.1.2, json5@npm:^2.2.1": +"json-schema-traverse@npm:^1.0.0": + version: 1.0.0 + resolution: "json-schema-traverse@npm:1.0.0" + checksum: 02f2f466cdb0362558b2f1fd5e15cce82ef55d60cd7f8fa828cf35ba74330f8d767fcae5c5c2adb7851fa811766c694b9405810879bc4e1ddd78a7c0e03658ad + languageName: node + linkType: hard + +"json5@npm:^2.2.1": version: 2.2.1 resolution: "json5@npm:2.2.1" bin: @@ -2365,17 +2378,6 @@ __metadata: languageName: node linkType: hard -"loader-utils@npm:^2.0.0": - version: 2.0.3 - resolution: "loader-utils@npm:2.0.3" - dependencies: - big.js: ^5.2.2 - emojis-list: ^3.0.0 - json5: ^2.1.2 - checksum: d055c61ce5927b64cb4af40218606603a7d3a39adb7b6eec116bb31d19203875950e478152dea056de404eced8e87e9bfd336ec636591ded040ea451f63c7d88 - languageName: node - linkType: hard - "locate-path@npm:^5.0.0": version: 5.0.0 resolution: "locate-path@npm:5.0.0" @@ -2392,7 +2394,7 @@ __metadata: languageName: node linkType: hard -"make-dir@npm:^3.0.2, make-dir@npm:^3.1.0": +"make-dir@npm:^3.0.2": version: 3.1.0 resolution: "make-dir@npm:3.1.0" dependencies: @@ -2635,6 +2637,13 @@ __metadata: languageName: node linkType: hard +"require-from-string@npm:^2.0.2": + version: 2.0.2 + resolution: "require-from-string@npm:2.0.2" + checksum: a03ef6895445f33a4015300c426699bc66b2b044ba7b670aa238610381b56d3f07c686251740d575e22f4c87531ba662d06937508f0f3c0f1ddc04db3130560b + languageName: node + linkType: hard + "resolve-cwd@npm:^3.0.0": version: 3.0.0 resolution: "resolve-cwd@npm:3.0.0" @@ -2684,17 +2693,6 @@ __metadata: languageName: node linkType: hard -"schema-utils@npm:^2.6.5": - version: 2.7.1 - resolution: "schema-utils@npm:2.7.1" - dependencies: - "@types/json-schema": ^7.0.5 - ajv: ^6.12.4 - ajv-keywords: ^3.5.2 - checksum: 32c62fc9e28edd101e1bd83453a4216eb9bd875cc4d3775e4452b541908fa8f61a7bbac8ffde57484f01d7096279d3ba0337078e85a918ecbeb72872fb09fb2b - languageName: node - linkType: hard - "schema-utils@npm:^3.1.0, schema-utils@npm:^3.1.1": version: 3.1.1 resolution: "schema-utils@npm:3.1.1" @@ -2706,6 +2704,18 @@ __metadata: languageName: node linkType: hard +"schema-utils@npm:^4.0.0": + version: 4.0.0 + resolution: "schema-utils@npm:4.0.0" + dependencies: + "@types/json-schema": ^7.0.9 + ajv: ^8.8.0 + ajv-formats: ^2.1.1 + ajv-keywords: ^5.0.0 + checksum: c843e92fdd1a5c145dbb6ffdae33e501867f9703afac67bdf35a685e49f85b1dcc10ea250033175a64bd9d31f0555bc6785b8359da0c90bcea30cf6dfbb55a8f + languageName: node + linkType: hard + "semver@npm:^6.0.0, semver@npm:^6.1.1, semver@npm:^6.1.2, semver@npm:^6.3.0": version: 6.3.0 resolution: "semver@npm:6.3.0" diff --git a/package.json b/package.json index 004b9e3eb20..c5daef86a3b 100644 --- a/package.json +++ b/package.json @@ -78,16 +78,16 @@ "@babel/core": "7.19.0", "@babel/plugin-proposal-class-properties": "7.18.6", "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6", - "@babel/plugin-proposal-object-rest-spread": "7.18.9", + "@babel/plugin-proposal-object-rest-spread": "7.19.4", "@babel/plugin-proposal-optional-chaining": "7.18.9", "@babel/plugin-syntax-dynamic-import": "7.8.3", "@babel/plugin-transform-react-constant-elements": "7.18.9", "@babel/plugin-transform-runtime": "7.19.1", - "@babel/plugin-transform-typescript": "7.19.0", + "@babel/plugin-transform-typescript": "7.20.0", "@babel/preset-env": "7.19.0", "@babel/preset-react": "7.18.6", "@babel/preset-typescript": "7.18.6", - "@babel/runtime": "7.19.0", + "@babel/runtime": "7.20.0", "@betterer/betterer": "5.4.0", "@betterer/cli": "5.4.0", "@betterer/eslint": "5.4.0", @@ -168,7 +168,7 @@ "autoprefixer": "10.4.7", "axios": "0.27.2", "babel-jest": "28.1.3", - "babel-loader": "8.2.5", + "babel-loader": "9.0.0", "babel-plugin-angularjs-annotate": "0.10.0", "babel-plugin-macros": "3.1.0", "blob-polyfill": "7.0.20220408", diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json index 945d094ceeb..9b2906c8f0b 100644 --- a/packages/grafana-e2e/package.json +++ b/packages/grafana-e2e/package.json @@ -64,7 +64,7 @@ "@grafana/e2e-selectors": "9.3.0-pre", "@grafana/tsconfig": "^1.2.0-rc1", "@mochajs/json-file-reporter": "^1.2.0", - "babel-loader": "8.2.5", + "babel-loader": "9.0.0", "blink-diff": "1.0.13", "chrome-remote-interface": "0.31.3", "commander": "8.3.0", diff --git a/yarn.lock b/yarn.lock index a6bd5fbad65..c99918bf21c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1718,7 +1718,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-object-rest-spread@npm:^7.12.1, @babel/plugin-proposal-object-rest-spread@npm:^7.19.4": +"@babel/plugin-proposal-object-rest-spread@npm:7.19.4, @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" dependencies: @@ -2072,6 +2072,17 @@ __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" @@ -2687,6 +2698,19 @@ __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" @@ -3081,12 +3105,12 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:7.19.0, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.18.9": - version: 7.19.0 - resolution: "@babel/runtime@npm:7.19.0" +"@babel/runtime@npm:7.20.0": + version: 7.20.0 + resolution: "@babel/runtime@npm:7.20.0" dependencies: - regenerator-runtime: ^0.13.4 - checksum: fa69c351bb05e1db3ceb9a02fdcf620c234180af68cdda02152d3561015f6d55277265d3109815992f96d910f3db709458cae4f8df1c3def66f32e0867d82294 + regenerator-runtime: ^0.13.10 + checksum: 637fca51db34f3a59d329b7e0d01163769fe94915fdb04e4ac4ba62de9f1ca637ce3a564fe3b0166ccdd7f02f14b6a5707ee3e550b3e01c72327c6620d8e6a8b languageName: node linkType: hard @@ -3099,6 +3123,15 @@ __metadata: languageName: node linkType: hard +"@babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.18.9": + version: 7.19.0 + resolution: "@babel/runtime@npm:7.19.0" + dependencies: + regenerator-runtime: ^0.13.4 + checksum: fa69c351bb05e1db3ceb9a02fdcf620c234180af68cdda02152d3561015f6d55277265d3109815992f96d910f3db709458cae4f8df1c3def66f32e0867d82294 + languageName: node + linkType: hard + "@babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.4.4": version: 7.18.3 resolution: "@babel/runtime@npm:7.18.3" @@ -4446,7 +4479,7 @@ __metadata: "@types/lodash": 4.14.182 "@types/node": 16.11.45 "@types/uuid": 8.3.4 - babel-loader: 8.2.5 + babel-loader: 9.0.0 blink-diff: 1.0.13 chrome-remote-interface: 0.31.3 commander: 8.3.0 @@ -13890,7 +13923,20 @@ __metadata: languageName: node linkType: hard -"babel-loader@npm:8.2.5, babel-loader@npm:^8.0.0, babel-loader@npm:^8.2.5": +"babel-loader@npm:9.0.0": + version: 9.0.0 + resolution: "babel-loader@npm:9.0.0" + dependencies: + find-cache-dir: ^3.3.2 + schema-utils: ^4.0.0 + peerDependencies: + "@babel/core": ^7.12.0 + webpack: ">=5" + checksum: 6b146e33c81fd948ffdefa8a6319efa1bea6e17c946bfac4641375710e51831aeb7f4a20c88604eaa00f5ecd4b6591da5a65ade326feba792609f932df150645 + languageName: node + linkType: hard + +"babel-loader@npm:^8.0.0, babel-loader@npm:^8.2.5": version: 8.2.5 resolution: "babel-loader@npm:8.2.5" dependencies: @@ -20484,7 +20530,7 @@ __metadata: languageName: node linkType: hard -"find-cache-dir@npm:^3.3.1": +"find-cache-dir@npm:^3.3.1, find-cache-dir@npm:^3.3.2": version: 3.3.2 resolution: "find-cache-dir@npm:3.3.2" dependencies: @@ -21607,16 +21653,16 @@ __metadata: "@babel/core": 7.19.0 "@babel/plugin-proposal-class-properties": 7.18.6 "@babel/plugin-proposal-nullish-coalescing-operator": 7.18.6 - "@babel/plugin-proposal-object-rest-spread": 7.18.9 + "@babel/plugin-proposal-object-rest-spread": 7.19.4 "@babel/plugin-proposal-optional-chaining": 7.18.9 "@babel/plugin-syntax-dynamic-import": 7.8.3 "@babel/plugin-transform-react-constant-elements": 7.18.9 "@babel/plugin-transform-runtime": 7.19.1 - "@babel/plugin-transform-typescript": 7.19.0 + "@babel/plugin-transform-typescript": 7.20.0 "@babel/preset-env": 7.19.0 "@babel/preset-react": 7.18.6 "@babel/preset-typescript": 7.18.6 - "@babel/runtime": 7.19.0 + "@babel/runtime": 7.20.0 "@betterer/betterer": 5.4.0 "@betterer/cli": 5.4.0 "@betterer/eslint": 5.4.0 @@ -21753,7 +21799,7 @@ __metadata: autoprefixer: 10.4.7 axios: 0.27.2 babel-jest: 28.1.3 - babel-loader: 8.2.5 + babel-loader: 9.0.0 babel-plugin-angularjs-annotate: 0.10.0 babel-plugin-macros: 3.1.0 baron: 3.0.3 @@ -33244,6 +33290,13 @@ __metadata: languageName: node linkType: hard +"regenerator-runtime@npm:^0.13.10": + version: 0.13.10 + resolution: "regenerator-runtime@npm:0.13.10" + checksum: 09893f5a9e82932642d9a999716b6c626dc53ef2a01307c952ebbf8e011802360163a37c304c18a6c358548be5a72b448e37209954a18696f21e438c81cbb4b9 + languageName: node + linkType: hard + "regenerator-transform@npm:^0.15.0": version: 0.15.0 resolution: "regenerator-transform@npm:0.15.0"