IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bug: Fix support for Node 18 in grafana/e2e package (#63446)

Browse Source 
* fix(e2e): replace resolve-as-bin for node 18 support

* chore(yarn): refresh lock file
This commit is contained in:
Jack Westbrook 2023-03-08 10:17:26 +01:00 committed by GitHub
parent 96956d8252
commit a317e48de8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/grafana-e2e/cli.js
View File

@ -1,7 +1,7 @@
const { program } = require('commander');
const execa = require('execa');
const { resolve, sep } = require('path');
const resolveBin = require('resolve-as-bin');
const resolveBin = require('resolve-bin');
const cypress = (commandName, { updateScreenshots, browser }) => {
// Support running an unpublished dev build
@ -25,7 +25,7 @@ const cypress = (commandName, { updateScreenshots, browser }) => {
stdio: 'inherit',
};
return execa(resolveBin('cypress'), cypressOptions, execaOptions)
return execa(resolveBin.sync('cypress'), cypressOptions, execaOptions)
.then(() => {}) // no return value
.catch((error) => {
console.error(error.message);

2
packages/grafana-e2e/package.json
View File

@ -76,7 +76,7 @@
"execa": "5.1.1",
"lodash": "4.17.21",
"mocha": "10.2.0",
"resolve-as-bin": "2.1.0",
"resolve-bin": "1.0.1",
"rimraf": "4.2.0",
"tracelib": "1.0.1",
"ts-loader": "8.4.0",

21
yarn.lock
View File

@ -4981,7 +4981,7 @@ __metadata:
execa: 5.1.1
lodash: 4.17.21
mocha: 10.2.0
resolve-as-bin: 2.1.0
resolve-bin: 1.0.1
rimraf: 4.2.0
rollup: 2.79.1
rollup-plugin-dts: ^5.0.0
@ -16866,7 +16866,7 @@ __metadata:
languageName: node
linkType: hard
"cross-spawn@npm:^6.0.0, cross-spawn@npm:^6.0.5":
"cross-spawn@npm:^6.0.0":
version: 6.0.5
resolution: "cross-spawn@npm:6.0.5"
dependencies:
@ -20904,6 +20904,13 @@ __metadata:
languageName: node
linkType: hard
"find-parent-dir@npm:~0.3.0":
version: 0.3.1
resolution: "find-parent-dir@npm:0.3.1"
checksum: 55e722584760cfbc6611901c7ced5081345cf629e2ecd6a4f6704b13b5a1876c8d9d9db5fd4965ba23e1ecbc24a8b62af40379cfef1ffa0231719b9d924eebdd
languageName: node
linkType: hard
"find-root@npm:^1.1.0":
version: 1.1.0
resolution: "find-root@npm:1.1.0"
@ -34231,12 +34238,12 @@ __metadata:
languageName: node
linkType: hard
"resolve-as-bin@npm:2.1.0":
version: 2.1.0
resolution: "resolve-as-bin@npm:2.1.0"
"resolve-bin@npm:1.0.1":
version: 1.0.1
resolution: "resolve-bin@npm:1.0.1"
dependencies:
cross-spawn: ^6.0.5
checksum: 38cbdc57d50162a6aabca34762932637e9926a5b28e313e2027aa54132fe9894d57a9df061596b4be684b0320ee7ba0aef4537bb3919ee6df753fdc4a8b38222
find-parent-dir: ~0.3.0
checksum: 439678433138cbea49b848be68ae24aa2afa1b3bb82c30fa763ebbc5615e8c340debfe635ee902cdbb4be72528e4139e2adb0503370ee755ad3702d03976af4c
languageName: node
linkType: hard