fix loading monaco 0.17 (#70)

* fix loading monaco 0.17 * fix toolkit version * fix circleci
grafana · Feb 20, 2020 · 30ca90e · 30ca90e
1 parent 1d4feb9
commit 30ca90e
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 20 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -139,8 +139,9 @@ jobs:
           cp ci/jobs/build_linux/* ci/jobs/build_plugin/dist
           cp ci/jobs/build_osx/* ci/jobs/build_plugin/dist
           cp ci/jobs/build_win64/* ci/jobs/build_plugin/dist
+          # skip - toolkit now does this
           # copy external libraries
-          cp -r src/lib ci/jobs/build_plugin/dist
+          # cp -r src/libs ci/jobs/build_plugin/dist
           ls -l ci/jobs/build_plugin/dist
           npx grafana-toolkit plugin:ci-package
     - persist_to_workspace:

diff --git a/Makefile b/Makefile
@@ -26,8 +26,11 @@ test-in-docker: build-container
 build:
 	go build -o ./dist/${DSNAME}_${OS}_${ARCH}${EXT} -a -tags netgo -ldflags '-w' ./pkg
 
+build-linux:
+	GOOS=linux go build -o ./dist/${DSNAME}_linux_${ARCH}${EXT} -a -tags netgo -ldflags '-w' ./pkg
+
 build-darwin:
-	go build -o ./dist/${DSNAME}_${OS}_${ARCH}${EXT} -a -tags netgo -ldflags '-w' ./pkg
+	GOOS=darwin go build -o ./dist/${DSNAME}_${OS}_${ARCH}${EXT} -a -tags netgo -ldflags '-w' ./pkg
 
 build-dev:
 	go build -o ./dist/${DSNAME}_${OS}_${ARCH}${EXT} ./pkg

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grafana-azure-data-explorer-datasource",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Grafana data source for Azure Data Explorer",
   "scripts": {
     "build": "grafana-toolkit plugin:build && find src | grep '\\.d\\.ts$' | xargs rm -fv",
@@ -11,9 +11,9 @@
   "author": "Grafana Labs",
   "license": "Apache",
   "devDependencies": {
-    "monaco-editor": "0.20.0",
-    "@grafana/toolkit": "latest",
-    "@types/angular": "1.6.57",
+    "monaco-editor": "0.17.0",
+    "@grafana/toolkit": "6.6.1",
+    "@types/angular": "1.6.49",
     "@types/grafana": "github:CorpGlory/types-grafana.git"
   },
   "jest": {

diff --git a/src/lib/bridge.js → src/libs/bridge.js b/src/lib/bridge.js → src/libs/bridge.js
diff --git a/src/lib/monaco.min.js → src/libs/monaco.min.js b/src/lib/monaco.min.js → src/libs/monaco.min.js
diff --git a/src/lib/monaco.min.js.map → src/libs/monaco.min.js.map b/src/lib/monaco.min.js.map → src/libs/monaco.min.js.map
diff --git a/src/monaco/kusto_monaco_editor.ts b/src/monaco/kusto_monaco_editor.ts
@@ -13,8 +13,8 @@ const editorTemplate = `<div id="content" tabindex="0" style="width: 100%; heigh
 function link(scope, elem, attrs) {
   const containerDiv = elem.find('#content')[0];
   if (!window.hasOwnProperty('monaco')) {
-    //(window as any).System.import(`/${scope.pluginBaseUrl}/lib/monaco.min.js`).then(() => {
-    (window as any).monaco = import(/* webpackChunkName: "/monaco.min" */ '../lib/monaco.min.js').then(() => {
+    //(window as any).monaco = import(/* webpackChunkName: "/monaco.min" */ '../lib/monaco.min.js').then(() => {
+    (window as any).System.import(`/${scope.pluginBaseUrl}/libs/monaco.min.js`).then(() => {
       setTimeout(() => {
         initMonaco(containerDiv, scope);
       }, 1);

diff --git a/yarn.lock b/yarn.lock
@@ -843,7 +843,7 @@
     tiny-invariant "^1.0.1"
     tiny-warning "^0.0.3"
 
-"@grafana/toolkit@next":
+"@grafana/toolkit@latest":
   version "6.6.1"
   resolved "https://registry.yarnpkg.com/@grafana/toolkit/-/toolkit-6.6.1.tgz#24b2f67bf316f8f526235cdffc517ae2b5f6c736"
   integrity sha512-kygqkhPkQDzCpeqNvkibgY0JuiLkXM2XYjP/49mWToFAk0zjk0qLeeWD6BR3xo7QQ57Y9wZ9xMHXxYG+yZ5AgQ==
@@ -1169,10 +1169,10 @@
     react-input-autosize "^2.2.1"
     react-transition-group "^2.2.1"
 
-"@types/[email protected].57":
-  version "1.6.57"
-  resolved "https://registry.yarnpkg.com/@types/angular/-/angular-1.6.57.tgz#d8beefa0ee1aeb1ef277fbaf63bf694321dd7f5d"
-  integrity sha512-Pbp8Clanwb/nurGuLUYhKp7eeaEjwyI3MHb3ggjPHYPxysypzEin6UFcrcDv5xhu433axlwQ5BYU9svmcICoAQ==
+"@types/[email protected].49":
+  version "1.6.49"
+  resolved "https://registry.yarnpkg.com/@types/angular/-/angular-1.6.49.tgz#8a5dd666100155d27cda9801f961360eb24b8d96"
+  integrity sha512-XR9i6dygixVFqMRIQCJAMdPNAJJXExSBapFiAdzyPfiGhmalDaqh/yo1VFOgFicuqlcKa6PEkNxEnUjsrxjqLQ==
 
 "@types/anymatch@*":
   version "1.3.1"
@@ -1517,9 +1517,9 @@
     "@types/react" "*"
 
 "@types/react@*":
-  version "16.9.20"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.20.tgz#e83285766340fb1a7fafe7e5c4708c53832e3641"
-  integrity sha512-jRrWBr25zzEVNa4QbESKLPluvrZ3W6Odfwrfe2F5vzbrDuNvlpnHa/xbZcXg8RH5D4CE181J5VxrRrLvzRH+5A==
+  version "16.9.21"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.21.tgz#99e274e2ecfab6bb93920e918341daa3198b348d"
+  integrity sha512-xpmenCMeBwJRct8vmIfczlgdOXWIWASoOM857kxKfHlVQvDltRh7IFRVfGws79iO2jkNPXOeWREyKoClzhBaQA==
   dependencies:
     "@types/prop-types" "*"
     csstype "^2.2.0"
@@ -6830,10 +6830,10 @@ [email protected], [email protected]:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
 
-monaco-editor@0.20.0:
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.20.0.tgz#5d5009343a550124426cb4d965a4d27a348b4dea"
-  integrity sha512-hkvf4EtPJRMQlPC3UbMoRs0vTAFAYdzFQ+gpMb8A+9znae1c43q8Mab9iVsgTcg/4PNiLGGn3SlDIa8uvK1FIQ==
+monaco-editor@0.17.0:
+  version "0.17.0"
+  resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.17.0.tgz#d1d035c6f512ab88503cbee8213cab34b85ab954"
+  integrity sha512-8BQQHCFxy3DF0GYFOy5BmcCWlwm/XaTMPbPbN4gwItFGctZErSfX82uQSBpojJSlPNyudB5Q5qnukoorD3/UuA==
 
 move-concurrently@^1.0.1:
   version "1.0.1"