Fix for lodash and core-js typings, #92, DefinitelyTyped/DefinitelyTy…

…ped#14324
monounity · Mar 29, 2017 · 7367bd9 · 7367bd9
1 parent 6c558df
commit 7367bd9
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 7 deletions.
diff --git a/examples/angular2/karma.conf.js b/examples/angular2/karma.conf.js
@@ -19,6 +19,9 @@ module.exports = function(config) {
                     require("karma-typescript-angular2-transform")
                 ]
             },
+            compilerOptions: {
+                lib: ["ES2015", "DOM"]
+            },
             coverageOptions: {
                 instrumentation: true
             }

diff --git a/examples/angular2/package.json b/examples/angular2/package.json
@@ -22,7 +22,7 @@
     "@angular/core": "2.2.3",
     "@angular/platform-browser": "2.2.3",
     "@angular/platform-browser-dynamic": "2.2.3",
-    "@types/core-js": "0.9.36",
+    "@types/core-js": "^0.9.39",
     "@types/jasmine": "^2.5.37",
     "@types/node": "^6.0.51",
     "core-js": "^2.4.1",

diff --git a/package.json b/package.json
@@ -105,7 +105,7 @@
     "@types/glob": "^5.0.30",
     "@types/istanbul": "^0.4.29",
     "@types/karma": "^0.13.33",
-    "@types/lodash": "^4.14.52",
+    "@types/lodash": "^4.14.59",
     "@types/minimatch": "^2.0.29",
     "@types/node": "^7.0.5",
     "@types/pad": "^1.0.0",

diff --git a/tests/integration-latest/karma.conf.angular2.js b/tests/integration-latest/karma.conf.angular2.js
@@ -26,7 +26,8 @@ module.exports = function(config) {
                 experimentalDecorators: true,
                 module: "commonjs",
                 sourceMap: true,
-                target: "ES5"
+                target: "ES5",
+                lib: ["DOM", "ES2015"]
             },
             include: ["src/frameworks/angular2/**/*.ts"],
             reports:

diff --git a/tests/integration-latest/karma.conf.core.js b/tests/integration-latest/karma.conf.core.js
@@ -17,7 +17,8 @@ module.exports = function(config) {
                 experimentalDecorators: true,
                 module: "commonjs",
                 sourceMap: true,
-                target: "ES5"
+                target: "ES5",
+                lib: ["DOM", "ES2015"]
             },
             include: ["src/node/core/*.ts"],
             reports:

diff --git a/tests/integration-latest/karma.conf.emptyfile.js b/tests/integration-latest/karma.conf.emptyfile.js
@@ -15,6 +15,9 @@ module.exports = function(config) {
             include: ["src/misc/emptyfile/*.ts"],
             bundlerOptions: {
                 nodeGlobals: false
+            },
+            compilerOptions: {
+                lib: ["DOM", "ES2015"]
             }
         },
 

diff --git a/tests/integration-latest/karma.conf.js b/tests/integration-latest/karma.conf.js
@@ -68,7 +68,7 @@ module.exports = function(config) {
                 moduleResolution: "node",
                 sourceMap: true,
                 target: "ES5",
-                lib: ["DOM", "ES5", "ScriptHost"]
+                lib: ["DOM", "ES2015"]
             },
             coverageOptions: {
                 instrumentation: true,

diff --git a/tests/integration-latest/karma.conf.react.js b/tests/integration-latest/karma.conf.react.js
@@ -19,7 +19,8 @@ module.exports = function(config) {
                 jsx: "react",
                 module: "commonjs",
                 sourceMap: true,
-                target: "ES5"
+                target: "ES5",
+                lib: ["DOM", "ES2015"]
             },
             include: ["src/frameworks/react/**/*.tsx"],
             reports:

diff --git a/tests/integration-latest/package.json b/tests/integration-latest/package.json
@@ -39,7 +39,7 @@
     "@types/chai": "^3.4.34",
     "@types/chai-enzyme": "^0.5.6",
     "@types/codemirror": "0.0.35",
-    "@types/core-js": "0.9.36",
+    "@types/core-js": "^0.9.39",
     "@types/enzyme": "^2.7.2",
     "@types/jasmine": "^2.5.37",
     "@types/lodash-es": "^4.14.4",