Ver Fonte

Chore: Upgrades typescript to version 3.5 (#18263)

* Chore: Upgrade typescript to version 3.5
kay delaney há 6 anos atrás
pai
commit
9d87923986

+ 2 - 2
package.json

@@ -110,13 +110,13 @@
     "style-loader": "0.23.1",
     "terser-webpack-plugin": "1.2.3",
     "ts-jest": "24.0.2",
-    "ts-loader": "5.3.3",
+    "ts-loader": "6.0.4",
     "ts-node": "8.1.0",
     "tslib": "1.9.3",
     "tslint": "5.14.0",
     "tslint-loader": "3.5.4",
     "tslint-react": "3.6.0",
-    "typescript": "3.4.1",
+    "typescript": "3.5.3",
     "webpack": "4.29.6",
     "webpack-bundle-analyzer": "3.3.2",
     "webpack-cleanup-plugin": "0.5.1",

+ 1 - 1
packages/grafana-data/package.json

@@ -39,6 +39,6 @@
     "rollup-plugin-typescript2": "0.19.3",
     "rollup-plugin-visualizer": "0.9.2",
     "sinon": "1.17.6",
-    "typescript": "3.4.1"
+    "typescript": "3.5.3"
   }
 }

+ 1 - 1
packages/grafana-runtime/package.json

@@ -38,6 +38,6 @@
     "rollup-plugin-terser": "4.0.4",
     "rollup-plugin-typescript2": "0.19.3",
     "rollup-plugin-visualizer": "0.9.2",
-    "typescript": "3.4.1"
+    "typescript": "3.5.3"
   }
 }

+ 1 - 1
packages/grafana-toolkit/package.json

@@ -83,7 +83,7 @@
     "tslib": "1.10.0",
     "tslint": "5.14.0",
     "tslint-config-prettier": "^1.18.0",
-    "typescript": "3.5.1",
+    "typescript": "3.5.3",
     "url-loader": "^2.0.1",
     "webpack": "4.35.0"
   },

+ 1 - 1
packages/grafana-ui/package.json

@@ -81,6 +81,6 @@
     "rollup-plugin-terser": "4.0.4",
     "rollup-plugin-typescript2": "0.19.3",
     "rollup-plugin-visualizer": "0.9.2",
-    "typescript": "3.4.1"
+    "typescript": "3.5.3"
   }
 }

+ 0 - 1
public/app/core/components/Animations/SlideDown.tsx

@@ -41,7 +41,6 @@ export const SlideDown: FC<Props> = ({ children, in: inProp, maxHeight = default
           style={{
             ...style,
             ...transitionStyles[state],
-            inProp,
           }}
         >
           {children}

+ 1 - 1
public/app/features/plugins/PluginPage.tsx

@@ -367,7 +367,7 @@ function getPluginTabsNav(
       }
 
       // Check for the dashboard pages
-      if (find(meta.includes, { type: 'dashboard' })) {
+      if (find(meta.includes, { type: PluginIncludeType.dashboard })) {
         pages.push({
           text: 'Dashboards',
           icon: 'gicon gicon-dashboard',

+ 20 - 20
yarn.lock

@@ -9157,7 +9157,7 @@ html-webpack-harddisk-plugin@1.0.1:
   dependencies:
     mkdirp "^0.5.1"
 
-html-webpack-plugin@3.2.0:
+html-webpack-plugin@3.2.0, html-webpack-plugin@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
   dependencies:
@@ -14247,6 +14247,20 @@ puppeteer-core@1.15.0:
     rimraf "^2.6.1"
     ws "^6.1.0"
 
+puppeteer-core@1.18.1:
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-1.18.1.tgz#37549e975273b7fa450e0f8a8023db6175ed049a"
+  integrity sha512-E/p4oIYnPZsCATQD5S6IKOBUnGG87h14OAXAmHjm+9SFIYLBUtY2AWg38Jfus9IjcAucnrYBv6A5372bte/S2g==
+  dependencies:
+    debug "^4.1.0"
+    extract-zip "^1.6.6"
+    https-proxy-agent "^2.2.1"
+    mime "^2.0.3"
+    progress "^2.0.1"
+    proxy-from-env "^1.0.0"
+    rimraf "^2.6.1"
+    ws "^6.1.0"
+
 q@^1.1.2, q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
@@ -15871,7 +15885,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
 
@@ -17296,16 +17310,6 @@ ts-jest@24.0.2:
     semver "^5.5"
     yargs-parser "10.x"
 
-ts-loader@5.3.3:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-5.3.3.tgz#8b4af042e773132d86b3c99ef0acf3b4d325f473"
-  dependencies:
-    chalk "^2.3.0"
-    enhanced-resolve "^4.0.0"
-    loader-utils "^1.0.2"
-    micromatch "^3.1.4"
-    semver "^5.0.1"
-
 ts-loader@6.0.4:
   version "6.0.4"
   resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-6.0.4.tgz#bc331ad91a887a60632d94c9f79448666f2c4b63"
@@ -17439,14 +17443,10 @@ typeface-oswald@0.0.54:
   version "0.0.54"
   resolved "https://registry.yarnpkg.com/typeface-oswald/-/typeface-oswald-0.0.54.tgz#1e253011622cdd50f580c04e7d625e7f449763d7"
 
-typescript@3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.1.tgz#b6691be11a881ffa9a05765a205cb7383f3b63c6"
-
-typescript@3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.1.tgz#ba72a6a600b2158139c5dd8850f700e231464202"
-  integrity sha512-64HkdiRv1yYZsSe4xC1WVgamNigVYjlssIoaH2HcZF0+ijsk5YK2g0G34w9wJkze8+5ow4STd22AynfO6ZYYLw==
+typescript@3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
+  integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
 
 ua-parser-js@^0.7.18:
   version "0.7.19"