From 25f20da200a4050b90fbf5b0517055ab8376e007 Mon Sep 17 00:00:00 2001 From: Armando Aguirre Date: Tue, 30 Jan 2018 17:03:54 -0800 Subject: [PATCH] Added Ace and PDFKit to typesMap --- src/harness/unittests/tsserverProjectSystem.ts | 16 ++-------------- src/server/typesMap.json | 6 ++++++ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts index 6834a598512..49f063ee604 100644 --- a/src/harness/unittests/tsserverProjectSystem.ts +++ b/src/harness/unittests/tsserverProjectSystem.ts @@ -1541,27 +1541,15 @@ namespace ts.projectSystem { path: "/scripts/Office/1/powerpoint.js", content: "unspecified" }; - const datatablesFile1 = { - path: "/js/jquery.datatables.js", - content: "unspecified" - }; - const datatablesFile2 = { - path: "/js/datatables.js", - content: "unspecified" - }; - const datatablesFile3 = { - path: "/js/datatables.all.min.js", - content: "unspecified" - }; - const files = [file1, minFile, kendoFile1, kendoFile2, kendoFile3, officeFile1, officeFile2, datatablesFile1, datatablesFile2, datatablesFile3]; + const files = [file1, minFile, kendoFile1, kendoFile2, kendoFile3, officeFile1, officeFile2]; const host = createServerHost(files); const projectService = createProjectService(host); try { projectService.openExternalProject({ projectFileName: "project", options: {}, rootFiles: toExternalFiles(files.map(f => f.path)) }); const proj = projectService.externalProjects[0]; assert.deepEqual(proj.getFileNames(/*excludeFilesFromExternalLibraries*/ true), [file1.path]); - assert.deepEqual(proj.getTypeAcquisition().include, ["kendo-ui", "office", "datatables.net"]); + assert.deepEqual(proj.getTypeAcquisition().include, ["kendo-ui", "office"]); } finally { projectService.resetSafeList(); } diff --git a/src/server/typesMap.json b/src/server/typesMap.json index 7da4f57af70..cfe7f6483c4 100644 --- a/src/server/typesMap.json +++ b/src/server/typesMap.json @@ -26,6 +26,11 @@ "Datatables.net": { "match": "^.*\\/(jquery\\.)?dataTables(\\.all)?(\\.min)?\\.js$", "types": ["datatables.net"] + }, + "Ace": { + "match": "^(.*)\\/ace.js", + "exclude": [["^", 1, "/.*"]], + "types": ["ace"] } }, "simpleMap": { @@ -356,6 +361,7 @@ "passport": "passport", "passport-local": "passport-local", "path": "pathjs", + "pdfkit":"pdfkit", "peer": "peerjs", "peg": "pegjs", "photoswipe": "photoswipe",