From 81701d3cb5753b1e5a056e77848fad8f4317bdbb Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Wed, 15 Jun 2016 23:33:57 +0300 Subject: [PATCH] Fix json-schema-ref-parser importing --- lib/utils/SchemaManager.ts | 2 +- system.config.js | 62 ++++++++++++++--------------- typings/json-schema-ref-parser.d.ts | 2 +- 3 files changed, 31 insertions(+), 35 deletions(-) diff --git a/lib/utils/SchemaManager.ts b/lib/utils/SchemaManager.ts index 8182e429..b96d9ea4 100644 --- a/lib/utils/SchemaManager.ts +++ b/lib/utils/SchemaManager.ts @@ -1,6 +1,6 @@ 'use strict'; -import JsonSchemaRefParser from 'json-schema-ref-parser/dist/ref-parser'; +import JsonSchemaRefParser from 'json-schema-ref-parser'; import JsonPointer from './JsonPointer'; import {methods as swaggerMethods} from './swagger-defs'; diff --git a/system.config.js b/system.config.js index 8db71d8f..d73a633d 100644 --- a/system.config.js +++ b/system.config.js @@ -105,7 +105,7 @@ System.config({ "path-browserify": "npm:path-browserify@0.0.0" }, "github:jspm/nodelibs-process@0.1.2": { - "process": "npm:process@0.11.3" + "process": "npm:process@0.11.5" }, "github:jspm/nodelibs-punycode@0.1.0": { "punycode": "npm:punycode@1.3.2" @@ -171,14 +171,13 @@ System.config({ "sprintf-js": "npm:sprintf-js@1.0.3", "util": "github:jspm/nodelibs-util@0.1.0" }, - "npm:asn1.js@4.6.0": { + "npm:asn1.js@4.6.2": { "assert": "github:jspm/nodelibs-assert@0.1.0", - "bn.js": "npm:bn.js@4.11.3", + "bn.js": "npm:bn.js@4.11.4", "buffer": "github:jspm/nodelibs-buffer@0.1.0", "fs": "github:jspm/nodelibs-fs@0.1.2", "inherits": "npm:inherits@2.0.1", "minimalistic-assert": "npm:minimalistic-assert@1.0.0", - "systemjs-json": "github:systemjs/plugin-json@0.1.2", "vm": "github:jspm/nodelibs-vm@0.1.0" }, "npm:asn1@0.2.3": { @@ -229,9 +228,8 @@ System.config({ "readable-stream": "npm:readable-stream@2.0.6", "util": "github:jspm/nodelibs-util@0.1.0" }, - "npm:bn.js@4.11.3": { - "buffer": "github:jspm/nodelibs-buffer@0.1.0", - "systemjs-json": "github:systemjs/plugin-json@0.1.2" + "npm:bn.js@4.11.4": { + "buffer": "github:jspm/nodelibs-buffer@0.1.0" }, "npm:boom@2.10.1": { "hoek": "npm:hoek@2.16.3", @@ -264,7 +262,7 @@ System.config({ "systemjs-json": "github:systemjs/plugin-json@0.1.2" }, "npm:browserify-rsa@4.0.1": { - "bn.js": "npm:bn.js@4.11.3", + "bn.js": "npm:bn.js@4.11.4", "buffer": "github:jspm/nodelibs-buffer@0.1.0", "constants": "github:jspm/nodelibs-constants@0.1.0", "crypto": "github:jspm/nodelibs-crypto@0.1.0", @@ -272,13 +270,13 @@ System.config({ "systemjs-json": "github:systemjs/plugin-json@0.1.2" }, "npm:browserify-sign@4.0.0": { - "bn.js": "npm:bn.js@4.11.3", + "bn.js": "npm:bn.js@4.11.4", "browserify-rsa": "npm:browserify-rsa@4.0.1", "buffer": "github:jspm/nodelibs-buffer@0.1.0", "create-hash": "npm:create-hash@1.1.2", "create-hmac": "npm:create-hmac@1.1.4", "crypto": "github:jspm/nodelibs-crypto@0.1.0", - "elliptic": "npm:elliptic@6.2.3", + "elliptic": "npm:elliptic@6.3.1", "inherits": "npm:inherits@2.0.1", "parse-asn1": "npm:parse-asn1@5.0.0", "stream": "github:jspm/nodelibs-stream@0.1.0" @@ -377,10 +375,10 @@ System.config({ "buffer": "github:jspm/nodelibs-buffer@0.1.0" }, "npm:create-ecdh@4.0.0": { - "bn.js": "npm:bn.js@4.11.3", + "bn.js": "npm:bn.js@4.11.4", "buffer": "github:jspm/nodelibs-buffer@0.1.0", "crypto": "github:jspm/nodelibs-crypto@0.1.0", - "elliptic": "npm:elliptic@6.2.3" + "elliptic": "npm:elliptic@6.3.1" }, "npm:create-hash@1.1.2": { "buffer": "github:jspm/nodelibs-buffer@0.1.0", @@ -415,7 +413,7 @@ System.config({ "randombytes": "npm:randombytes@2.0.3", "systemjs-json": "github:systemjs/plugin-json@0.1.2" }, - "npm:dashdash@1.13.1": { + "npm:dashdash@1.14.0": { "assert-plus": "npm:assert-plus@1.0.0", "fs": "github:jspm/nodelibs-fs@0.1.2", "path": "github:jspm/nodelibs-path@0.1.0", @@ -423,12 +421,7 @@ System.config({ "util": "github:jspm/nodelibs-util@0.1.0" }, "npm:debug@2.2.0": { - "fs": "github:jspm/nodelibs-fs@0.1.2", - "ms": "npm:ms@0.7.1", - "net": "github:jspm/nodelibs-net@0.1.2", - "process": "github:jspm/nodelibs-process@0.1.2", - "tty": "github:jspm/nodelibs-tty@0.1.0", - "util": "github:jspm/nodelibs-util@0.1.0" + "ms": "npm:ms@0.7.1" }, "npm:delayed-stream@1.0.0": { "stream": "github:jspm/nodelibs-stream@0.1.0", @@ -440,7 +433,7 @@ System.config({ "minimalistic-assert": "npm:minimalistic-assert@1.0.0" }, "npm:diffie-hellman@5.0.2": { - "bn.js": "npm:bn.js@4.11.3", + "bn.js": "npm:bn.js@4.11.4", "buffer": "github:jspm/nodelibs-buffer@0.1.0", "crypto": "github:jspm/nodelibs-crypto@0.1.0", "miller-rabin": "npm:miller-rabin@4.0.0", @@ -455,8 +448,8 @@ System.config({ "crypto": "github:jspm/nodelibs-crypto@0.1.0", "jsbn": "npm:jsbn@0.1.0" }, - "npm:elliptic@6.2.3": { - "bn.js": "npm:bn.js@4.11.3", + "npm:elliptic@6.3.1": { + "bn.js": "npm:bn.js@4.11.4", "brorand": "npm:brorand@1.0.5", "hash.js": "npm:hash.js@1.0.3", "inherits": "npm:inherits@2.0.1", @@ -609,8 +602,8 @@ System.config({ "es6-promise": "npm:es6-promise@3.2.1", "events": "github:jspm/nodelibs-events@0.1.1", "fs": "github:jspm/nodelibs-fs@0.1.2", - "http": "npm:stream-http@2.3.0", - "https": "npm:stream-http@2.3.0", + "http": "github:jspm/nodelibs-http@1.7.1", + "https": "github:jspm/nodelibs-https@0.1.0", "js-yaml": "npm:js-yaml@3.6.1", "ono": "npm:ono@2.2.1", "process": "github:jspm/nodelibs-process@0.1.2", @@ -644,7 +637,7 @@ System.config({ "lodash._stringtopath": "npm:lodash._stringtopath@4.8.0" }, "npm:miller-rabin@4.0.0": { - "bn.js": "npm:bn.js@4.11.3", + "bn.js": "npm:bn.js@4.11.4", "brorand": "npm:brorand@1.0.5" }, "npm:mime-db@1.23.0": { @@ -677,7 +670,7 @@ System.config({ "process": "github:jspm/nodelibs-process@0.1.2" }, "npm:parse-asn1@5.0.0": { - "asn1.js": "npm:asn1.js@4.6.0", + "asn1.js": "npm:asn1.js@4.6.2", "browserify-aes": "npm:browserify-aes@1.0.6", "buffer": "github:jspm/nodelibs-buffer@0.1.0", "create-hash": "npm:create-hash@1.1.2", @@ -710,13 +703,16 @@ System.config({ "systemjs-json": "github:systemjs/plugin-json@0.1.2" }, "npm:process-nextick-args@1.0.7": { - "process": "github:jspm/nodelibs-process@0.1.2" + "process": "github:jspm/nodelibs-process@0.1.2", + "systemjs-json": "github:systemjs/plugin-json@0.1.2" }, - "npm:process@0.11.3": { - "assert": "github:jspm/nodelibs-assert@0.1.0" + "npm:process@0.11.5": { + "assert": "github:jspm/nodelibs-assert@0.1.0", + "fs": "github:jspm/nodelibs-fs@0.1.2", + "vm": "github:jspm/nodelibs-vm@0.1.0" }, "npm:public-encrypt@4.0.0": { - "bn.js": "npm:bn.js@4.11.3", + "bn.js": "npm:bn.js@4.11.4", "browserify-rsa": "npm:browserify-rsa@4.0.1", "buffer": "github:jspm/nodelibs-buffer@0.1.0", "create-hash": "npm:create-hash@1.1.2", @@ -829,7 +825,7 @@ System.config({ "assert-plus": "npm:assert-plus@1.0.0", "buffer": "github:jspm/nodelibs-buffer@0.1.0", "crypto": "github:jspm/nodelibs-crypto@0.1.0", - "dashdash": "npm:dashdash@1.13.1", + "dashdash": "npm:dashdash@1.14.0", "ecc-jsbn": "npm:ecc-jsbn@0.1.1", "getpass": "npm:getpass@0.1.6", "jodid25519": "npm:jodid25519@1.0.2", @@ -874,7 +870,7 @@ System.config({ "process": "github:jspm/nodelibs-process@0.1.2" }, "npm:timers-browserify@1.4.2": { - "process": "npm:process@0.11.3" + "process": "npm:process@0.11.5" }, "npm:to-arraybuffer@1.0.1": { "buffer": "github:jspm/nodelibs-buffer@0.1.0", @@ -929,7 +925,7 @@ System.config({ "process": "github:jspm/nodelibs-process@0.1.2", "request": "npm:request@2.72.0", "systemjs-json": "github:systemjs/plugin-json@0.1.2", - "validator": "npm:validator@5.2.0" + "validator": "npm:validator@5.4.0" }, "npm:zone.js@0.6.12": { "buffer": "github:jspm/nodelibs-buffer@0.1.0", diff --git a/typings/json-schema-ref-parser.d.ts b/typings/json-schema-ref-parser.d.ts index b35393ac..faf03b64 100644 --- a/typings/json-schema-ref-parser.d.ts +++ b/typings/json-schema-ref-parser.d.ts @@ -1,4 +1,4 @@ -declare module "json-schema-ref-parser/dist/ref-parser" { +declare module 'json-schema-ref-parser' { var x: any; export default x; }