Use DefinitelyTyped typings for whatwg-url and path-is-inside.

Polymer · Mar 29, 2018 · 8462167 · 8462167
1 parent 9b0c62e
commit 8462167
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 38 deletions.
diff --git a/custom_typings/main.d.ts b/custom_typings/main.d.ts
@@ -2,5 +2,3 @@
 /// <reference path="./indent.d.ts" />
 /// <reference path="./knuth-shuffle.d.ts" />
 /// <reference path="./strip-indent.d.ts" />
-/// <reference path="./whatwg-url.d.ts" />
-/// <reference path="./path-is-inside.d.ts" />
diff --git a/custom_typings/path-is-inside.d.ts b/custom_typings/path-is-inside.d.ts
diff --git a/custom_typings/whatwg-url.d.ts b/custom_typings/whatwg-url.d.ts
diff --git a/gulpfile.js b/gulpfile.js
@@ -114,7 +114,10 @@ task('json-schema', function () {
   const inPath = 'src/analysis-format/analysis-format.ts';
   const outPath = 'lib/analysis.schema.json';
   const command = path.normalize(`node_modules/.bin/typescript-json-schema`);
-  const child = child_process.spawn(command, [`--required`, `${inPath}`, `Analysis`], { shell: true, cwd: process.cwd(), hideWindows: true });
+  const child = child_process.spawn(
+      command,
+      [`--required`, `--ignoreErrors`, `${inPath}`, `Analysis`],
+      { shell: true, cwd: process.cwd(), hideWindows: true });
   let buffer = '';
   child.stdout.setEncoding('utf8');
   child.stdout.on('data', (chunk) => {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -61,7 +61,7 @@
     "tsc-then": "^1.0.1",
     "tslint": "^4.1.1",
     "typescript": "^2.7.1",
-    "typescript-json-schema": "^0.19.0"
+    "typescript-json-schema": "^0.21.0"
   },
   "dependencies": {
     "@types/babel-generator": "^6.25.1",
@@ -77,7 +77,9 @@
     "@types/minimatch": "^3.0.1",
     "@types/node": "^6.0.0",
     "@types/parse5": "^2.2.34",
+    "@types/path-is-inside": "^1.0.0",
     "@types/resolve": "0.0.6",
+    "@types/whatwg-url": "^6.4.0",
     "babel-generator": "^6.26.0",
     "babel-traverse": "^7.0.0-beta.3",
     "babel-types": "^7.0.0-beta.3",