Skip to content

Commit 69577d9

Browse files
author
Ives van Hoorne
committed
Check types on package.json for dep typings
1 parent 8707a99 commit 69577d9

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/app/components/sandbox/CodeEditor/monaco/workers/fetch-dependency-typings.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,8 @@ function fetchFromTypings(dependency, version, fetchedPaths) {
169169
return doFetch(`${depUrl}/package.json`)
170170
.then(response => JSON.parse(response))
171171
.then(packageJSON => {
172-
if (packageJSON.typings) {
172+
const types = packageJSON.typings || packageJSON.types;
173+
if (types) {
173174
// Add package.json, since this defines where all types lie
174175
addLib(
175176
`node_modules/${dependency}/package.json`,
@@ -178,11 +179,11 @@ function fetchFromTypings(dependency, version, fetchedPaths) {
178179
);
179180

180181
// get all files in the specified directory
181-
getFileMetaData(depUrl, packageJSON.typings).then(fileData => {
182+
getFileMetaData(depUrl, types).then(fileData => {
182183
getFileTypes(
183184
depUrl,
184185
dependency,
185-
resolveAppropiateFile(fileData, packageJSON.typings),
186+
resolveAppropiateFile(fileData, types),
186187
fetchedPaths,
187188
fileData
188189
);
@@ -202,7 +203,9 @@ function fetchAndAddDependencies(dependencies) {
202203
dep,
203204
getVersion(dependencies[dep]),
204205
fetchedPaths
205-
).catch(() => {
206+
).catch(e => {
207+
console.log(dep);
208+
console.error(e);
206209
// Not available in package.json, try checking in @types/
207210
fetchFromDefinitelyTyped(
208211
dep,

0 commit comments

Comments
 (0)