From 67e45a1d439cf9ed2944b613e54d72043d6b205e Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Tue, 7 Apr 2020 08:01:06 -0700
Subject: [PATCH] Plugins: do not publish bundled plugins to npm (#23401)

---
 .../grafana-toolkit/src/cli/tasks/plugin/bundle.managed.ts | 1 +
 plugins-bundled/internal/input-datasource/package.json     | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin/bundle.managed.ts b/packages/grafana-toolkit/src/cli/tasks/plugin/bundle.managed.ts
index f8698e21fb2..c4e011bcac3 100644
--- a/packages/grafana-toolkit/src/cli/tasks/plugin/bundle.managed.ts
+++ b/packages/grafana-toolkit/src/cli/tasks/plugin/bundle.managed.ts
@@ -20,6 +20,7 @@ const bundleManagedPluginsRunner: TaskRunner<BundeManagedOptions> = async () =>
           for (const plugin of plugins) {
             process.chdir(`${MANAGED_PLUGINS_PATH}/${scope}/${plugin}`);
             try {
+              console.log(`[${scope}]: ${plugin} building...`);
               await execa('yarn', ['dev']);
               console.log(`[${scope}]: ${plugin} bundled`);
             } catch (e) {
diff --git a/plugins-bundled/internal/input-datasource/package.json b/plugins-bundled/internal/input-datasource/package.json
index 7835a546ef0..3083b6003ee 100644
--- a/plugins-bundled/internal/input-datasource/package.json
+++ b/plugins-bundled/internal/input-datasource/package.json
@@ -2,6 +2,7 @@
   "name": "@grafana-plugins/input-datasource",
   "version": "6.6.0-pre",
   "description": "Input Datasource",
+  "private": true,
   "repository": {
     "type": "git",
     "url": "http://github.com/grafana/grafana.git"
@@ -15,8 +16,8 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@grafana/data": "^6.6.0-pre",
-    "@grafana/ui": "^6.6.0-pre",
-    "@grafana/toolkit": "^6.6.0-pre"
+    "@grafana/data": "^7.0.0-pre",
+    "@grafana/ui": "^7.0.0-pre",
+    "@grafana/toolkit": "^7.0.0-pre"
   }
 }