mirror of
https://github.com/grafana/grafana.git
synced 2024-11-22 00:47:38 -06:00
Update Yarn to v3.2.0 (#45714)
* Update Yarn to v3.2.0 * Update sdks as well * Update nodejs to latest * Updates * Update grabpl to 2.9.23 Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
This commit is contained in:
renovate[bot]
GitHub
parent
ec911be8ef
commit
9fc6ee2535
436
.drone.yml
436
.drone.yml
File diff suppressed because it is too large
Load Diff
768
.yarn/releases/yarn-3.1.1.cjs
vendored
768
.yarn/releases/yarn-3.1.1.cjs
vendored
File diff suppressed because one or more lines are too long
785
.yarn/releases/yarn-3.2.0.cjs
vendored
Executable file
785
.yarn/releases/yarn-3.2.0.cjs
vendored
Executable file
File diff suppressed because one or more lines are too long
2
.yarn/sdks/eslint/package.json
vendored
2
.yarn/sdks/eslint/package.json
vendored
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "eslint",
|
||||
"version": "8.8.0-sdk",
|
||||
"version": "8.10.0-sdk",
|
||||
"main": "./lib/api.js",
|
||||
"type": "commonjs"
|
||||
}
|
||||
|
||||
14
.yarn/sdks/typescript/lib/tsserver.js
vendored
14
.yarn/sdks/typescript/lib/tsserver.js
vendored
@ -18,6 +18,7 @@ const moduleWrapper = tsserver => {
|
||||
const pnpApi = require(`pnpapi`);
|
||||
|
||||
const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
|
||||
const isPortal = str => str.startsWith("portal:/");
|
||||
const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);
|
||||
|
||||
const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
|
||||
@ -44,7 +45,7 @@ const moduleWrapper = tsserver => {
|
||||
const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
|
||||
if (resolved) {
|
||||
const locator = pnpApi.findPackageLocator(resolved);
|
||||
if (locator && dependencyTreeRoots.has(`${locator.name}@${locator.reference}`)) {
|
||||
if (locator && (dependencyTreeRoots.has(`${locator.name}@${locator.reference}`) || isPortal(locator.reference))) {
|
||||
str = resolved;
|
||||
}
|
||||
}
|
||||
@ -85,7 +86,7 @@ const moduleWrapper = tsserver => {
|
||||
// everything else is up to neovim
|
||||
case `neovim`: {
|
||||
str = normalize(resolved).replace(/\.zip\//, `.zip::`);
|
||||
str = `zipfile:${str}`;
|
||||
str = `zipfile://${str}`;
|
||||
} break;
|
||||
|
||||
default: {
|
||||
@ -100,8 +101,7 @@ const moduleWrapper = tsserver => {
|
||||
|
||||
function fromEditorPath(str) {
|
||||
switch (hostInfo) {
|
||||
case `coc-nvim`:
|
||||
case `neovim`: {
|
||||
case `coc-nvim`: {
|
||||
str = str.replace(/\.zip::/, `.zip/`);
|
||||
// The path for coc-nvim is in format of /<pwd>/zipfile:/<pwd>/.yarn/...
|
||||
// So in order to convert it back, we use .* to match all the thing
|
||||
@ -111,6 +111,12 @@ const moduleWrapper = tsserver => {
|
||||
: str.replace(/^.*zipfile:/, ``);
|
||||
} break;
|
||||
|
||||
case `neovim`: {
|
||||
str = str.replace(/\.zip::/, `.zip/`);
|
||||
// The path for neovim is in format of zipfile:///<pwd>/.yarn/...
|
||||
return str.replace(/^zipfile:\/\//, ``);
|
||||
} break;
|
||||
|
||||
case `vscode`:
|
||||
default: {
|
||||
return process.platform === `win32`
|
||||
|
||||
14
.yarn/sdks/typescript/lib/tsserverlibrary.js
vendored
14
.yarn/sdks/typescript/lib/tsserverlibrary.js
vendored
@ -18,6 +18,7 @@ const moduleWrapper = tsserver => {
|
||||
const pnpApi = require(`pnpapi`);
|
||||
|
||||
const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
|
||||
const isPortal = str => str.startsWith("portal:/");
|
||||
const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);
|
||||
|
||||
const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
|
||||
@ -44,7 +45,7 @@ const moduleWrapper = tsserver => {
|
||||
const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
|
||||
if (resolved) {
|
||||
const locator = pnpApi.findPackageLocator(resolved);
|
||||
if (locator && dependencyTreeRoots.has(`${locator.name}@${locator.reference}`)) {
|
||||
if (locator && (dependencyTreeRoots.has(`${locator.name}@${locator.reference}`) || isPortal(locator.reference))) {
|
||||
str = resolved;
|
||||
}
|
||||
}
|
||||
@ -85,7 +86,7 @@ const moduleWrapper = tsserver => {
|
||||
// everything else is up to neovim
|
||||
case `neovim`: {
|
||||
str = normalize(resolved).replace(/\.zip\//, `.zip::`);
|
||||
str = `zipfile:${str}`;
|
||||
str = `zipfile://${str}`;
|
||||
} break;
|
||||
|
||||
default: {
|
||||
@ -100,8 +101,7 @@ const moduleWrapper = tsserver => {
|
||||
|
||||
function fromEditorPath(str) {
|
||||
switch (hostInfo) {
|
||||
case `coc-nvim`:
|
||||
case `neovim`: {
|
||||
case `coc-nvim`: {
|
||||
str = str.replace(/\.zip::/, `.zip/`);
|
||||
// The path for coc-nvim is in format of /<pwd>/zipfile:/<pwd>/.yarn/...
|
||||
// So in order to convert it back, we use .* to match all the thing
|
||||
@ -111,6 +111,12 @@ const moduleWrapper = tsserver => {
|
||||
: str.replace(/^.*zipfile:/, ``);
|
||||
} break;
|
||||
|
||||
case `neovim`: {
|
||||
str = str.replace(/\.zip::/, `.zip/`);
|
||||
// The path for neovim is in format of zipfile:///<pwd>/.yarn/...
|
||||
return str.replace(/^zipfile:\/\//, ``);
|
||||
} break;
|
||||
|
||||
case `vscode`:
|
||||
default: {
|
||||
return process.platform === `win32`
|
||||
|
||||
@ -78,4 +78,4 @@ plugins:
|
||||
- path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
|
||||
spec: "https://mskelton.dev/yarn-outdated/v2"
|
||||
|
||||
yarnPath: .yarn/releases/yarn-3.1.1.cjs
|
||||
yarnPath: .yarn/releases/yarn-3.2.0.cjs
|
||||
|
||||
@ -170,7 +170,7 @@
|
||||
"copy-webpack-plugin": "9.0.1",
|
||||
"css-loader": "6.7.0",
|
||||
"css-minimizer-webpack-plugin": "3.4.1",
|
||||
"cypress": "9.5.0",
|
||||
"cypress": "9.5.1",
|
||||
"enzyme": "3.11.0",
|
||||
"enzyme-to-json": "3.6.2",
|
||||
"eslint": "8.10.0",
|
||||
@ -395,5 +395,5 @@
|
||||
"engines": {
|
||||
"node": ">= 16"
|
||||
},
|
||||
"packageManager": "yarn@3.1.1"
|
||||
"packageManager": "yarn@3.2.0"
|
||||
}
|
||||
|
||||
@ -55,7 +55,7 @@
|
||||
"blink-diff": "1.0.13",
|
||||
"chrome-remote-interface": "0.31.2",
|
||||
"commander": "8.3.0",
|
||||
"cypress": "9.5.0",
|
||||
"cypress": "9.5.1",
|
||||
"cypress-file-upload": "5.0.8",
|
||||
"devtools-protocol": "0.0.967529",
|
||||
"execa": "5.1.1",
|
||||
|
||||
@ -113,7 +113,7 @@ FROM debian:stretch-20210208
|
||||
ENV GOVERSION=1.17.7 \
|
||||
PATH=/usr/local/go/bin:$PATH \
|
||||
GOPATH=/go \
|
||||
NODEVERSION=16.13.0-1nodesource1 \
|
||||
NODEVERSION=16.14.0-1nodesource1 \
|
||||
YARNVERSION=1.22.15-1
|
||||
|
||||
# Use ARG so as not to persist environment variable in image
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token', 'prerelease_bucket')
|
||||
|
||||
grabpl_version = 'v2.9.22'
|
||||
build_image = 'grafana/build-container:1.5.1'
|
||||
grabpl_version = 'v2.9.23'
|
||||
build_image = 'grafana/build-container:1.5.2'
|
||||
publish_image = 'grafana/grafana-ci-deploy:1.3.1'
|
||||
deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image'
|
||||
alpine_image = 'alpine:3.15'
|
||||
@ -728,7 +728,7 @@ def e2e_tests_step(suite, edition, port=3001, tries=None):
|
||||
cmd += ' --tries {}'.format(tries)
|
||||
return {
|
||||
'name': 'end-to-end-tests-{}'.format(suite) + enterprise2_suffix(edition),
|
||||
'image': 'cypress/included:9.5.0',
|
||||
'image': 'cypress/included:9.5.1-node16.14.0-slim-chrome99-ff97',
|
||||
'depends_on': [
|
||||
'grafana-server',
|
||||
],
|
||||
|
||||
61
yarn.lock
61
yarn.lock
@ -2,7 +2,7 @@
|
||||
# Manual changes might be lost - proceed with caution!
|
||||
|
||||
__metadata:
|
||||
version: 5
|
||||
version: 6
|
||||
cacheKey: 8
|
||||
|
||||
"@ampproject/remapping@npm:^2.0.0":
|
||||
@ -4099,7 +4099,7 @@ __metadata:
|
||||
blink-diff: 1.0.13
|
||||
chrome-remote-interface: 0.31.2
|
||||
commander: 8.3.0
|
||||
cypress: 9.5.0
|
||||
cypress: 9.5.1
|
||||
cypress-file-upload: 5.0.8
|
||||
devtools-protocol: 0.0.967529
|
||||
execa: 5.1.1
|
||||
@ -6156,7 +6156,7 @@ __metadata:
|
||||
"@lingui/conf": ^3.12.1
|
||||
ramda: ^0.27.1
|
||||
peerDependencies:
|
||||
babel-plugin-macros: 2 || 3
|
||||
babel-plugin-macros: 2 || 3
|
||||
checksum: 83384f2d796dbc7ecadb74a1c6159ccad82976c194f97b82c2ba72cc8113f95bf0193aa6a4e9596db25b713129a9037a873bf1282bc30e197c2a72855707162f
|
||||
languageName: node
|
||||
linkType: hard
|
||||
@ -12670,7 +12670,7 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"acorn@npm:^8.7.0":
|
||||
"acorn@npm:^8.5.0, acorn@npm:^8.7.0":
|
||||
version: 8.7.0
|
||||
resolution: "acorn@npm:8.7.0"
|
||||
bin:
|
||||
@ -16662,9 +16662,9 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"cypress@npm:9.5.0":
|
||||
version: 9.5.0
|
||||
resolution: "cypress@npm:9.5.0"
|
||||
"cypress@npm:9.5.1":
|
||||
version: 9.5.1
|
||||
resolution: "cypress@npm:9.5.1"
|
||||
dependencies:
|
||||
"@cypress/request": ^2.88.10
|
||||
"@cypress/xvfb": ^1.2.4
|
||||
@ -16710,7 +16710,7 @@ __metadata:
|
||||
yauzl: ^2.10.0
|
||||
bin:
|
||||
cypress: bin/cypress
|
||||
checksum: 0a4ef1413676e37c19526e86dba7bc82420b9afa840b2a68b94e749b878e6b394f4e64bb099bca12c44f4520e7a1cb07ab17d6c9ccf87746bc1bfc3c9555f334
|
||||
checksum: 96efebb8bfca52f214f793856a7eb40a6eb4a7bc06e5d7c17c7378cec8e3e3975d5777147066d04d95d88b99d4052bbf8749d96b4a25d3f79cc65e88e93f703d
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@ -19842,22 +19842,27 @@ __metadata:
|
||||
version: 6.5.0
|
||||
resolution: "fork-ts-checker-webpack-plugin@npm:6.5.0"
|
||||
dependencies:
|
||||
"@babel/code-frame": ^7.16.7
|
||||
chalk: ^4.1.2
|
||||
chokidar: ^3.5.3
|
||||
cosmiconfig: ^7.0.1
|
||||
"@babel/code-frame": ^7.8.3
|
||||
"@types/json-schema": ^7.0.5
|
||||
chalk: ^4.1.0
|
||||
chokidar: ^3.4.2
|
||||
cosmiconfig: ^6.0.0
|
||||
deepmerge: ^4.2.2
|
||||
fs-extra: ^10.0.0
|
||||
memfs: ^3.4.1
|
||||
fs-extra: ^9.0.0
|
||||
glob: ^7.1.6
|
||||
memfs: ^3.1.2
|
||||
minimatch: ^3.0.4
|
||||
schema-utils: 4.0.0
|
||||
semver: ^7.3.5
|
||||
tapable: ^2.2.1
|
||||
schema-utils: 2.7.0
|
||||
semver: ^7.3.2
|
||||
tapable: ^1.0.0
|
||||
peerDependencies:
|
||||
typescript: ">3.6.0"
|
||||
eslint: ">= 6"
|
||||
typescript: ">= 2.7"
|
||||
vue-template-compiler: "*"
|
||||
webpack: ^5.11.0
|
||||
webpack: ">= 4"
|
||||
peerDependenciesMeta:
|
||||
eslint:
|
||||
optional: true
|
||||
vue-template-compiler:
|
||||
optional: true
|
||||
checksum: 95d145ab7936445f3a9bfa4116ef73537f97196cfaa3f5b24473dff36d034e839d3b0e034a23beefc9619eceb7a9866816bfd55afd1968e955eb3b3f8cfc35ed
|
||||
@ -20847,7 +20852,7 @@ __metadata:
|
||||
core-js: 3.21.0
|
||||
css-loader: 6.7.0
|
||||
css-minimizer-webpack-plugin: 3.4.1
|
||||
cypress: 9.5.0
|
||||
cypress: 9.5.1
|
||||
d3: 5.15.0
|
||||
d3-force: ^2.1.1
|
||||
d3-scale-chromatic: 1.5.0
|
||||
@ -35754,41 +35759,41 @@ __metadata:
|
||||
|
||||
"typescript@patch:typescript@4.4.3#~builtin<compat/typescript>":
|
||||
version: 4.4.3
|
||||
resolution: "typescript@patch:typescript@npm%3A4.4.3#~builtin<compat/typescript>::version=4.4.3&hash=493e53"
|
||||
resolution: "typescript@patch:typescript@npm%3A4.4.3#~builtin<compat/typescript>::version=4.4.3&hash=bda367"
|
||||
bin:
|
||||
tsc: bin/tsc
|
||||
tsserver: bin/tsserver
|
||||
checksum: 79f5c13d21c9dea3eb44d2b7002ff25a0569fefc432e083d65a360e3aca990aca25fc733e14aa6883b5e9a68e3e2f0330a34123e048806f91d701732ece00e6f
|
||||
checksum: 33a916819907e819430802c50405f18c187448d678696a81545f494a7ec16207f8c15340c945df62109bd1d951091a9f15f3d2eb931a3c889f962c8509017697
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"typescript@patch:typescript@4.4.4#~builtin<compat/typescript>":
|
||||
version: 4.4.4
|
||||
resolution: "typescript@patch:typescript@npm%3A4.4.4#~builtin<compat/typescript>::version=4.4.4&hash=493e53"
|
||||
resolution: "typescript@patch:typescript@npm%3A4.4.4#~builtin<compat/typescript>::version=4.4.4&hash=bda367"
|
||||
bin:
|
||||
tsc: bin/tsc
|
||||
tsserver: bin/tsserver
|
||||
checksum: bd629ad0da4a15d79aaad56baf3ee7d96f6a181760d430ae77f8c5325df7bffd9edee57544a3970e3651e8b796fe03a5838a7eb39c6d46cc3866c0b23d36a0dd
|
||||
checksum: 3d1b04449662193544b81d055479d03b4c5dca95f1a82f8922596f089d894c9fefbe16639d1d9dfe26a7054419645530cef44001bc17aed1fe1eb3c237e9b3c7
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"typescript@patch:typescript@>=2.7#~builtin<compat/typescript>":
|
||||
version: 4.5.5
|
||||
resolution: "typescript@patch:typescript@npm%3A4.5.5#~builtin<compat/typescript>::version=4.5.5&hash=493e53"
|
||||
resolution: "typescript@patch:typescript@npm%3A4.5.5#~builtin<compat/typescript>::version=4.5.5&hash=bda367"
|
||||
bin:
|
||||
tsc: bin/tsc
|
||||
tsserver: bin/tsserver
|
||||
checksum: c05c318d79c690f101d7ffb34cd6c7d6bbd884d3af9cefe7749ad0cd6be43c7082f098280982ca945dcba23fde34a08fed9602bb26540936baf8c0520727d3ba
|
||||
checksum: 858c61fa63f7274ca4aaaffeced854d550bf416cff6e558c4884041b3311fb662f476f167cf5c9f8680c607239797e26a2ee0bcc6467fbc05bfcb218e1c6c671
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"typescript@patch:typescript@~4.5.2#~builtin<compat/typescript>":
|
||||
version: 4.5.4
|
||||
resolution: "typescript@patch:typescript@npm%3A4.5.4#~builtin<compat/typescript>::version=4.5.4&hash=493e53"
|
||||
resolution: "typescript@patch:typescript@npm%3A4.5.4#~builtin<compat/typescript>::version=4.5.4&hash=bda367"
|
||||
bin:
|
||||
tsc: bin/tsc
|
||||
tsserver: bin/tsserver
|
||||
checksum: 2e488dde7d2c4a2fa2e79cf2470600f8ce81bc0563c276b72df8ff412d74456ae532ba824650ae936ce207440c79720ddcfaa25e3cb4477572b8534fa4e34d49
|
||||
checksum: eda87927f9cfb94aca9b5e47842daf37347ad3073133e17f556fbb6c18f3493c5b551eedab0f4b26774235ddb7acbe0087250d5285f72ce6819a0891dd5a74ed
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user