From 3f3fb9bd5c574aa6092c4f423b88ff43c83a20c8 Mon Sep 17 00:00:00 2001 From: Dominik Prokop Date: Wed, 24 Jul 2019 02:17:41 +0200 Subject: [PATCH] Packages: update package.json files (#18173) --- package.json | 7 ++----- packages/grafana-data/package.json | 8 ++++++-- packages/grafana-runtime/package.json | 15 +++++++++++---- packages/grafana-toolkit/package.json | 13 ++++++++++--- packages/grafana-ui/package.json | 13 +++++++++---- 5 files changed, 38 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 04ab73c3dcf..80123808d3e 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,7 @@ { + "author": "Grafana Labs", + "license": "Apache-2.0", "private": true, - "author": { - "name": "Torkel Ödegaard", - "company": "Grafana Labs" - }, "name": "grafana", "version": "6.4.0-pre", "repository": { @@ -171,7 +169,6 @@ "singleQuote": true, "printWidth": 120 }, - "license": "Apache-2.0", "dependencies": { "@babel/polyfill": "7.2.5", "@torkelo/react-select": "2.4.1", diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index 0981296b990..b7da8071cec 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -1,10 +1,16 @@ { + "author": "Grafana Labs", + "license": "Apache-2.0", "name": "@grafana/data", "version": "6.4.0-alpha.22", "description": "Grafana Data Library", "keywords": [ "typescript" ], + "repository": { + "type": "git", + "url": "http://github.com/grafana/grafana.git" + }, "main": "src/index.ts", "scripts": { "tslint": "tslint -c tslint.json --project tsconfig.json", @@ -13,8 +19,6 @@ "bundle": "rollup -c rollup.config.ts", "build": "grafana-toolkit package:build --scope=data" }, - "author": "Grafana Labs", - "license": "Apache-2.0", "devDependencies": { "@types/jest": "23.3.14", "@types/jquery": "1.10.35", diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index 919e8766c44..bf2d75fcd58 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -1,10 +1,17 @@ { + "author": "Grafana Labs", + "license": "Apache-2.0", "name": "@grafana/runtime", "version": "6.4.0-alpha.22", "description": "Grafana Runtime Library", "keywords": [ - "grafana" + "grafana", + "typescript" ], + "repository": { + "type": "git", + "url": "http://github.com/grafana/grafana.git" + }, "main": "src/index.ts", "scripts": { "tslint": "tslint -c tslint.json --project tsconfig.json", @@ -13,11 +20,11 @@ "bundle": "rollup -c rollup.config.ts", "build": "grafana-toolkit package:build --scope=runtime" }, - "author": "Grafana Labs", - "license": "Apache-2.0", "dependencies": { "systemjs": "0.20.19", - "systemjs-plugin-css": "0.1.37" + "systemjs-plugin-css": "0.1.37", + "@grafana/data": "^6.4.0-alpha", + "@grafana/ui": "^6.4.0-alpha" }, "devDependencies": { "@types/systemjs": "^0.20.6", diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json index 86eab1fb85c..0e58282e6c5 100644 --- a/packages/grafana-toolkit/package.json +++ b/packages/grafana-toolkit/package.json @@ -1,12 +1,19 @@ { + "author": "Grafana Labs", + "license": "Apache-2.0", "name": "@grafana/toolkit", "version": "6.4.0-alpha.22", "description": "Grafana Toolkit", "keywords": [ "grafana", "cli", - "plugins" + "plugins", + "typescript" ], + "repository": { + "type": "git", + "url": "http://github.com/grafana/grafana.git" + }, "bin": { "grafana-toolkit": "./bin/grafana-toolkit.js" }, @@ -17,8 +24,6 @@ "clean": "rimraf ./dist ./compiled", "build": "grafana-toolkit toolkit:build" }, - "author": "Grafana Labs", - "license": "Apache-2.0", "main": "src/index.ts", "dependencies": { "@babel/core": "7.4.5", @@ -34,6 +39,8 @@ "@types/semver": "^6.0.0", "@types/tmp": "^0.1.0", "@types/webpack": "4.4.34", + "@grafana/data": "^6.4.0-alpha", + "@grafana/ui": "^6.4.0-alpha", "axios": "0.19.0", "babel-loader": "8.0.6", "babel-plugin-angularjs-annotate": "0.10.0", diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index f848de262a7..1446fddb718 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -1,12 +1,19 @@ { + "author": "Grafana Labs", + "license": "Apache-2.0", "name": "@grafana/ui", "version": "6.4.0-alpha.22", "description": "Grafana Components Library", "keywords": [ "grafana", "react", - "react-component" + "react-component", + "typescript" ], + "repository": { + "type": "git", + "url": "http://github.com/grafana/grafana.git" + }, "main": "src/index.ts", "scripts": { "tslint": "tslint -c tslint.json --project tsconfig.json", @@ -17,10 +24,8 @@ "bundle": "rollup -c rollup.config.ts", "build": "grafana-toolkit package:build --scope=ui" }, - "author": "Grafana Labs", - "license": "Apache-2.0", "dependencies": { - "@grafana/data": "^6.4.0-alpha.22", + "@grafana/data": "^6.4.0-alpha", "@torkelo/react-select": "2.1.1", "@types/react-color": "2.17.0", "classnames": "2.2.6",