Chore: Update to yarn 4 (#77156)

* update to yarn 4

* update project to yarn 4

* update tetherdrop archive

* update sdks

* change puppeteer image to official node 20 one

* revert previous, use grafana/docker-puppeteer:pre-node-20 instead

* okay, try original docker image, but use npx instead of yarn for wait-on

* remove wait-on from deps as we use it via npx now

* yarn dedupe

* remove logs from drone

* empty commit testing yarn cache :)

* comment explaining why no -y
This commit is contained in:
Josh Hunt 2023-10-31 14:11:54 +00:00 committed by GitHub
parent 661e1e2fff
commit 75005a8482
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 9751 additions and 10365 deletions

View File

@ -685,7 +685,7 @@ steps:
include: include:
- packages/grafana-ui/** - packages/grafana-ui/**
- commands: - commands:
- yarn wait-on http://$HOST:$PORT - npx wait-on@7.0.1 http://$HOST:$PORT
- pa11y-ci --config .pa11yci-pr.conf.js - pa11y-ci --config .pa11yci-pr.conf.js
depends_on: depends_on:
- grafana-server - grafana-server
@ -1936,7 +1936,7 @@ steps:
include: include:
- packages/grafana-ui/** - packages/grafana-ui/**
- commands: - commands:
- yarn wait-on http://$HOST:$PORT - npx wait-on@7.0.1 http://$HOST:$PORT
- pa11y-ci --config .pa11yci.conf.js --json > pa11y-ci-results.json - pa11y-ci --config .pa11yci.conf.js --json > pa11y-ci-results.json
depends_on: depends_on:
- grafana-server - grafana-server
@ -4670,6 +4670,6 @@ kind: secret
name: gcr_credentials name: gcr_credentials
--- ---
kind: signature kind: signature
hmac: 64de498d74f13b64f233fe5d37751903a0efb03b3cab28e046797dc80d390965 hmac: 920b57d70a96a29872ce77dc83ca26e2d141ba37627eee58c9d3beebf9ec4055
... ...

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

893
.yarn/releases/yarn-4.0.0.cjs vendored Executable file

File diff suppressed because one or more lines are too long

View File

@ -2,5 +2,13 @@
"name": "eslint", "name": "eslint",
"version": "8.52.0-sdk", "version": "8.52.0-sdk",
"main": "./lib/api.js", "main": "./lib/api.js",
"type": "commonjs" "type": "commonjs",
"bin": {
"eslint": "./bin/eslint.js"
},
"exports": {
"./package.json": "./package.json",
".": "./lib/api.js",
"./use-at-your-own-risk": "./lib/unsupported-api.js"
}
} }

View File

@ -1,20 +0,0 @@
#!/usr/bin/env node
const {existsSync} = require(`fs`);
const {createRequire} = require(`module`);
const {resolve} = require(`path`);
const relPnpApiPath = "../../../.pnp.cjs";
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = createRequire(absPnpApiPath);
if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {
// Setup the environment to be able to require prettier
require(absPnpApiPath).setup();
}
}
// Defer to the real prettier your application uses
module.exports = absRequire(`prettier`);

View File

@ -1,6 +1,7 @@
{ {
"name": "prettier", "name": "prettier",
"version": "3.0.0-sdk", "version": "3.0.0-sdk",
"main": "./index.js", "main": "./index.cjs",
"type": "commonjs" "type": "commonjs",
"bin": "./bin/prettier.cjs"
} }

View File

@ -11,10 +11,10 @@ const absRequire = createRequire(absPnpApiPath);
if (existsSync(absPnpApiPath)) { if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) { if (!process.versions.pnp) {
// Setup the environment to be able to require typescript/lib/typescript.js // Setup the environment to be able to require typescript
require(absPnpApiPath).setup(); require(absPnpApiPath).setup();
} }
} }
// Defer to the real typescript/lib/typescript.js your application uses // Defer to the real typescript your application uses
module.exports = absRequire(`typescript/lib/typescript.js`); module.exports = absRequire(`typescript`);

View File

@ -2,5 +2,9 @@
"name": "typescript", "name": "typescript",
"version": "4.8.4-sdk", "version": "4.8.4-sdk",
"main": "./lib/typescript.js", "main": "./lib/typescript.js",
"type": "commonjs" "type": "commonjs",
"bin": {
"tsc": "./bin/tsc",
"tsserver": "./bin/tsserver"
}
} }

View File

@ -1,3 +1,7 @@
compressionLevel: mixed
enableGlobalCache: false
enableTelemetry: false enableTelemetry: false
nodeLinker: pnp nodeLinker: pnp
@ -28,14 +32,10 @@ packageExtensions:
react-dom: 17.0.1 react-dom: 17.0.1
plugins: plugins:
- path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
spec: '@yarnpkg/plugin-typescript'
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: '@yarnpkg/plugin-interactive-tools'
- path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
spec: 'https://mskelton.dev/yarn-outdated/v2' spec: 'https://mskelton.dev/yarn-outdated/v2'
yarnPath: .yarn/releases/yarn-3.6.4.cjs yarnPath: .yarn/releases/yarn-4.0.0.cjs
# Uncomment the following lines if you want to use Verdaccio local npm registry. Read more at packages/README.md # Uncomment the following lines if you want to use Verdaccio local npm registry. Read more at packages/README.md
# npmScopes: # npmScopes:
# grafana: # grafana:

View File

@ -228,7 +228,6 @@
"ts-jest": "29.1.1", "ts-jest": "29.1.1",
"ts-node": "10.9.1", "ts-node": "10.9.1",
"typescript": "4.8.4", "typescript": "4.8.4",
"wait-on": "7.0.1",
"webpack": "5.89.0", "webpack": "5.89.0",
"webpack-bundle-analyzer": "4.9.0", "webpack-bundle-analyzer": "4.9.0",
"webpack-cli": "5.1.4", "webpack-cli": "5.1.4",
@ -444,7 +443,7 @@
"engines": { "engines": {
"node": ">= 20" "node": ">= 20"
}, },
"packageManager": "yarn@3.6.4", "packageManager": "yarn@4.0.0",
"dependenciesMeta": { "dependenciesMeta": {
"prettier@3.0.0": { "prettier@3.0.0": {
"unplugged": true "unplugged": true

View File

@ -614,7 +614,8 @@ def test_a11y_frontend_step(ver_mode, port = 3001):
Drone step. Drone step.
""" """
commands = [ commands = [
"yarn wait-on http://$HOST:$PORT", # Note - this runs in a container running node 14, which does not support the -y option to npx
"npx wait-on@7.0.1 http://$HOST:$PORT",
] ]
failure = "ignore" failure = "ignore"
if ver_mode == "pr": if ver_mode == "pr":

17725
yarn.lock

File diff suppressed because it is too large Load Diff