From 0ac81e9e47edf5e1285e14886ef5324501587966 Mon Sep 17 00:00:00 2001 From: Giordano Ricci Date: Tue, 12 Oct 2021 12:39:54 +0100 Subject: [PATCH] Chore: remove volta references (#40275) --- contribute/developer-guide.md | 12 ++++-------- package.json | 4 ---- packages/grafana-data/package.json | 3 --- packages/grafana-e2e-selectors/package.json | 3 --- packages/grafana-e2e/package.json | 3 --- packages/grafana-runtime/package.json | 5 +---- packages/grafana-schema/package.json | 3 --- packages/grafana-toolkit/package.json | 3 --- packages/grafana-ui/package.json | 5 +---- packages/jaeger-ui-components/package.json | 3 --- .../internal/input-datasource/package.json | 3 --- 11 files changed, 6 insertions(+), 41 deletions(-) diff --git a/contribute/developer-guide.md b/contribute/developer-guide.md index 738db68143a..ee3a4e6096d 100644 --- a/contribute/developer-guide.md +++ b/contribute/developer-guide.md @@ -10,14 +10,8 @@ Make sure you have the following dependencies installed before setting up your d - [Git](https://git-scm.com/) - [Go](https://golang.org/dl/) (see [go.mod](../go.mod#L3) for minimum required version) - -Additionally you'll need: - -- [Node.js](https://nodejs.org) (see `volta.node` property in [package.json](../package.json) for the correct version). -- [Yarn](https://yarnpkg.com) (see `volta.yarn` property in [package.json](../package.json) for the correct version). - -We recommend using [Volta](https://github.com/volta-cli/volta) to manage your JS toolchain. -Refer to the [Volta Getting Started Guide](https://docs.volta.sh/guide/getting-started) for setup instructions for your operating system. +- [Node.js (Long Term Support)](https://nodejs.org) +- [Yarn](https://yarnpkg.com) ### macOS @@ -26,6 +20,8 @@ We recommend using [Homebrew](https://brew.sh/) for installing any missing depen ``` brew install git brew install go +brew install node@14 +npm install -g yarn ``` ### Windows diff --git a/package.json b/package.json index 28a076072bb..723e3824b50 100644 --- a/package.json +++ b/package.json @@ -359,9 +359,5 @@ "engines": { "node": ">= 14" }, - "volta": { - "node": "14.16.0", - "yarn": "3.1.0-rc.5" - }, "packageManager": "yarn@3.1.0-rc.5" } diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index 6102704fd99..8ba6096ca76 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -56,8 +56,5 @@ "tinycolor2": "1.4.1", "tslib": "2.3.1", "typescript": "4.4.3" - }, - "volta": { - "extends": "../../package.json" } } diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json index f00a4390349..1fe43c7602b 100644 --- a/packages/grafana-e2e-selectors/package.json +++ b/packages/grafana-e2e-selectors/package.json @@ -44,8 +44,5 @@ "execa": "5.1.1", "typescript": "4.4.3", "yaml": "^1.8.3" - }, - "volta": { - "extends": "../../package.json" } } diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json index ece5b32a683..008e66f188e 100644 --- a/packages/grafana-e2e/package.json +++ b/packages/grafana-e2e/package.json @@ -58,8 +58,5 @@ "tslib": "2.3.1", "typescript": "4.4.3", "yaml": "^1.8.3" - }, - "volta": { - "extends": "../../package.json" } } diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index 6096c3d6a9c..02e350743f8 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -47,8 +47,5 @@ "rollup-plugin-visualizer": "4.2.0", "typescript": "4.4.3" }, - "types": "src/index.ts", - "volta": { - "extends": "../../package.json" - } + "types": "src/index.ts" } diff --git a/packages/grafana-schema/package.json b/packages/grafana-schema/package.json index 6349f4a262d..a2a2e773d63 100644 --- a/packages/grafana-schema/package.json +++ b/packages/grafana-schema/package.json @@ -33,8 +33,5 @@ "rollup-plugin-typescript2": "0.29.0", "rollup-plugin-visualizer": "4.2.0", "typescript": "4.4.3" - }, - "volta": { - "extends": "../../package.json" } } diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json index 2631c70c78f..3315064b22c 100644 --- a/packages/grafana-toolkit/package.json +++ b/packages/grafana-toolkit/package.json @@ -98,8 +98,5 @@ "typescript": "4.4.3", "url-loader": "^2.0.1", "webpack": "4.41.5" - }, - "volta": { - "extends": "../../package.json" } } diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 427afd92c0b..f2f086f2f5f 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -130,8 +130,5 @@ "typescript": "4.4.3", "webpack-filter-warnings-plugin": "1.2.1" }, - "types": "src/index.ts", - "volta": { - "extends": "../../package.json" - } + "types": "src/index.ts" } diff --git a/packages/jaeger-ui-components/package.json b/packages/jaeger-ui-components/package.json index a06035e8596..ba163b0754f 100644 --- a/packages/jaeger-ui-components/package.json +++ b/packages/jaeger-ui-components/package.json @@ -44,8 +44,5 @@ "tinycolor2": "1.4.1", "tslib": "2.3.1", "tween-functions": "^1.2.0" - }, - "volta": { - "extends": "../../package.json" } } diff --git a/plugins-bundled/internal/input-datasource/package.json b/plugins-bundled/internal/input-datasource/package.json index 98028843f83..6877bd95117 100644 --- a/plugins-bundled/internal/input-datasource/package.json +++ b/plugins-bundled/internal/input-datasource/package.json @@ -18,8 +18,5 @@ "@grafana/data": "8.3.0-pre", "@grafana/toolkit": "8.3.0-pre", "@grafana/ui": "8.3.0-pre" - }, - "volta": { - "extends": "../../../package.json" } }