From 8d849a63da5193f889d96a0a6aa0a3e06ba31122 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Mon, 11 Sep 2017 14:10:37 -0500 Subject: [PATCH 01/10] fix: Clearly label version compatibility closes #338 Great idea from @ThatBrianDude --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index afc7f409..e670b722 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ ## Features - Extremely easy deployment -- The widest OpenAPI features support (yes, it supports even `discriminator`)
+- The widest OpenAPI v2.0 features support (yes, it supports even `discriminator`)
![](docs/images/discriminator-demo.gif) - Neat **interactive** documentation for nested objects
![](docs/images/nested-demo.gif) @@ -32,6 +32,7 @@ - Multiple ReDoc instances on single page ([example](demo/examples/multiple-apis/index.html)) ## Roadmap + - [ ] [OpenAPI v3.0 support](https://github.com/Rebilly/ReDoc/issues/312) - [x] ~~performance optimizations~~ - [x] ~~better navigation (menu improvements + search)~~ - [ ] ability to simple branding/styling @@ -44,6 +45,12 @@ We host the latest and all the previous ReDoc releases on GitHub Pages-based **C - `v1.x.x` release: https://rebilly.github.io/ReDoc/releases/v1.x.x/redoc.min.js - `latest` release: https://rebilly.github.io/ReDoc/releases/latest/redoc.min.js this file is updated with each release of ReDoc and may introduce breaking changes. **Not recommended to use in production.** Use particular release or `v1.x.x`. +## Version Guidance +| ReDoc Release | OpenAPI Specification | +|:--------------|:----------------------| +| 1.18.x | 2.0 | +| 1.17.x | 2.0 | + ## Some Real-life usages - [Rebilly](https://rebilly.github.io/RebillyAPI) - [Docker Engine](https://docs.docker.com/engine/api/v1.25/) From d7b2af27a9046903748870774386becbdd25046c Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Tue, 19 Sep 2017 18:23:13 +0300 Subject: [PATCH 02/10] chore: downgrade to dropkickjs ~2.1.10 fixes #340 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8c834f67..52562c7f 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ }, "dependencies": { "core-js": "^2.4.1", - "dropkickjs": "^2.1.10", + "dropkickjs": "~2.1.10", "hint.css": "^2.3.2", "https-browserify": "^1.0.0", "json-pointer": "^0.6.0", From 9aac6366873510520c910c6c504b158c0560a16a Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Mon, 28 Aug 2017 14:45:04 +0300 Subject: [PATCH 03/10] chore: clean non-used entry-point --- demo/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/demo/index.html b/demo/index.html index 29bfdf66..e1727b54 100644 --- a/demo/index.html +++ b/demo/index.html @@ -30,7 +30,6 @@ - From 56d62e5ab2d8debd8f267e35eab7154d5a71af58 Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Thu, 21 Sep 2017 01:18:38 +0300 Subject: [PATCH 04/10] feat: add ignoredHeaderParameters option --- README.md | 1 + docs/redoc-vendor-extensions.md | 23 ++++++++++++++++- lib/components/ParamsList/params-list.ts | 32 ++++++++++++++++-------- lib/services/options.service.ts | 4 ++- 4 files changed, 47 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index e670b722..1b206b1b 100644 --- a/README.md +++ b/README.md @@ -138,6 +138,7 @@ ReDoc makes use of the following [vendor extensions](http://swagger.io/specifica * [`x-displayName`](docs/redoc-vendor-extensions.md#x-displayname) - specify human-friendly names for the menu categories * [`x-tagGroups`](docs/redoc-vendor-extensions.md#x-tagGroups) - group tags by categories in the side menu * [`x-servers`](docs/redoc-vendor-extensions.md#x-servers) - ability to specify different servers for API (backported from OpenAPI 3.0) +* [`x-ignoredHeaderParameters`](docs/redoc-vendor-extensions.md#x-ignoredHeaderParameters) - ability to specify header parameter names to ignore ### `` tag attributes * `spec-url` - relative or absolute url to your spec file; diff --git a/docs/redoc-vendor-extensions.md b/docs/redoc-vendor-extensions.md index b285aafb..8985bf6b 100644 --- a/docs/redoc-vendor-extensions.md +++ b/docs/redoc-vendor-extensions.md @@ -54,7 +54,28 @@ x-tagGroups: - Secondary Stats ``` -#### Logo Object +#### x-ignoredHeaderParameters + + +| Field Name | Type | Description | +| :-------------------------- | :-----------: | :---------- | +| x-ignoredHeaderParameters | [ string ] | A list of ignored headers | + + +###### Usage in Redoc +`x-ignoredHeaderParameters` is used to specify header parameter names which are ignored by ReDoc + +###### x-ignoredHeaderParameters example +```yaml +swagger: '2.0' +info: + ... +tags: [...] +x-ignoredHeaderParameters: + - Accept + - User-Agent + - X-Test-Header +``` ### Info Object vendor extensions Extends OpenAPI [Info Object](http://swagger.io/specification/#infoObject) diff --git a/lib/components/ParamsList/params-list.ts b/lib/components/ParamsList/params-list.ts index 281c68a6..63629d08 100644 --- a/lib/components/ParamsList/params-list.ts +++ b/lib/components/ParamsList/params-list.ts @@ -1,7 +1,8 @@ -'use strict'; -import { Component, Input, ChangeDetectionStrategy, OnInit } from '@angular/core'; -import { BaseComponent, SpecManager } from '../base'; +import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; + +import { OptionsService } from '../../services/options.service'; import { SchemaHelper } from '../../services/schema-helper.service'; +import { BaseComponent, SpecManager } from '../base'; function safePush(obj, prop, item) { if (!obj[prop]) obj[prop] = []; @@ -12,16 +13,16 @@ function safePush(obj, prop, item) { selector: 'params-list', templateUrl: './params-list.html', styleUrls: ['./params-list.css'], - changeDetection: ChangeDetectionStrategy.OnPush + changeDetection: ChangeDetectionStrategy.OnPush, }) export class ParamsList extends BaseComponent implements OnInit { - @Input() pointer:string; + @Input() pointer: string; params: Array; empty: boolean; bodyParam: any; - constructor(specMgr:SpecManager) { + constructor(specMgr: SpecManager, private options: OptionsService) { super(specMgr); } @@ -29,11 +30,20 @@ export class ParamsList extends BaseComponent implements OnInit { this.params = []; let paramsList = this.specMgr.getOperationParams(this.pointer); - paramsList = paramsList.map(paramSchema => { - let propPointer = paramSchema._pointer; - if (paramSchema.in === 'body') return paramSchema; - return SchemaHelper.preprocess(paramSchema, propPointer, this.pointer); - }); + const igrnoredHeaders = + this.specMgr.schema['x-ignoredHeaderParameters'] || + this.options.options.ignoredHeaderParameters || + []; + + paramsList = paramsList + .map(paramSchema => { + let propPointer = paramSchema._pointer; + if (paramSchema.in === 'body') return paramSchema; + return SchemaHelper.preprocess(paramSchema, propPointer, this.pointer); + }) + .filter(param => { + return param.in !== 'header' || igrnoredHeaders.indexOf(param.name) < 0; + }); let paramsMap = this.orderParams(paramsList); diff --git a/lib/services/options.service.ts b/lib/services/options.service.ts index c046e01e..ef2cc975 100644 --- a/lib/services/options.service.ts +++ b/lib/services/options.service.ts @@ -20,7 +20,8 @@ const OPTION_NAMES = new Set([ 'noAutoAuth', 'pathInMiddlePanel', 'untrustedSpec', - 'hideLoading' + 'hideLoading', + 'ignoredHeaderParameters', ]); export interface Options { @@ -38,6 +39,7 @@ export interface Options { untrustedSpec?: boolean; hideLoading?: boolean; spec?: any; + ignoredHeaderParameters?: string[]; } @Injectable() From d304047139c3d150158bc939bc497e0550db01a8 Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Thu, 21 Sep 2017 11:48:10 +0300 Subject: [PATCH 05/10] chore: update deps --- package.json | 76 +++--- yarn.lock | 655 ++++++++++++++++++++++++++++++++++----------------- 2 files changed, 480 insertions(+), 251 deletions(-) diff --git a/package.json b/package.json index 52562c7f..e11aca71 100644 --- a/package.json +++ b/package.json @@ -54,38 +54,38 @@ "author": "Roman Hotsiy", "license": "MIT", "devDependencies": { - "@angular/common": "^4.3.2", - "@angular/compiler": "^4.3.2", - "@angular/compiler-cli": "^4.3.2", - "@angular/core": "^4.3.2", - "@angular/platform-browser": "^4.3.2", - "@angular/platform-browser-dynamic": "^4.3.2", - "@angular/platform-server": "^4.3.2", - "@types/jasmine": "^2.5.53", - "@types/requirejs": "^2.1.29", - "@types/should": "^8.3.0", - "@types/swagger-schema-official": "^2.0.5", - "@types/webpack": "^3.0.5", + "@angular/common": "^4.4.3", + "@angular/compiler": "^4.4.3", + "@angular/compiler-cli": "^4.4.3", + "@angular/core": "^4.4.3", + "@angular/platform-browser": "^4.4.3", + "@angular/platform-browser-dynamic": "^4.4.3", + "@angular/platform-server": "^4.4.3", + "@types/jasmine": "^2.6.0", + "@types/requirejs": "^2.1.31", + "@types/should": "^11.2.0", + "@types/swagger-schema-official": "^2.0.6", + "@types/webpack": "^3.0.11", "angular2-inline-template-style": "^1.1.0", "angular2-template-loader": "^0.6.2", - "awesome-typescript-loader": "^3.2.2", + "awesome-typescript-loader": "^3.2.3", "branch-release": "^1.0.3", - "chalk": "^2.0.1", - "codelyzer": "^3.1.2", - "conventional-changelog-cli": "^1.3.2", - "css-loader": "^0.28.1", + "chalk": "^2.1.0", + "codelyzer": "^3.2.0", + "conventional-changelog-cli": "^1.3.3", + "css-loader": "^0.28.7", "deploy-to-gh-pages": "^1.3.3", "exports-loader": "^0.6.4", "http-server": "^0.10.0", "istanbul-instrumenter-loader": "^3.0.0", - "jasmine-core": "^2.7.0", - "jasmine-spec-reporter": "^4.1.1", - "karma": "^1.6.0", + "jasmine-core": "^2.8.0", + "jasmine-spec-reporter": "^4.2.1", + "karma": "^1.7.1", "karma-chrome-launcher": "^2.2.0", "karma-coverage": "^1.1.1", "karma-coveralls": "^1.1.2", "karma-jasmine": "^1.0.2", - "karma-mocha-reporter": "^2.2.3", + "karma-mocha-reporter": "^2.2.4", "karma-phantomjs-launcher": "^1.0.4", "karma-phantomjs-shim": "^1.1.2", "karma-remap-coverage": "^0.1.4", @@ -94,24 +94,23 @@ "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^2.0.4", "node-sass": "^4.5.3", - "npm-run-all": "^4.0.2", - "phantomjs-prebuilt": "^2.1.14", + "npm-run-all": "^4.1.1", "protractor": "^5.1.1", "raw-loader": "^0.5.1", - "rimraf": "^2.6.1", - "rxjs": "^5.4.2", + "rimraf": "^2.6.2", + "rxjs": "^5.4.3", "sass-loader": "^6.0.6", "shelljs": "^0.7.7", - "should": "^11.2.1", - "sinon": "^2.4.1", + "should": "^13.1.0", + "sinon": "^3.3.0", "source-map-loader": "^0.2.1", "string-replace-webpack-plugin": "^0.1.3", "style-loader": "^0.18.2", "swagger-schema-official": "^2.0.0-bab6bed", - "tslint": "^5.5.0", - "typescript": "^2.4.2", - "webpack": "^3.4.1", - "webpack-dev-server": "^2.6.1", + "tslint": "^5.7.0", + "typescript": "^2.5.2", + "webpack": "^3.6.0", + "webpack-dev-server": "^2.8.2", "webpack-merge": "^4.1.0" }, "peerDependencies": { @@ -127,22 +126,23 @@ "rxjs": "^5.3.1" }, "dependencies": { - "core-js": "^2.4.1", + "core-js": "^2.5.1", "dropkickjs": "~2.1.10", "hint.css": "^2.3.2", "https-browserify": "^1.0.0", "json-pointer": "^0.6.0", - "json-schema-ref-parser": "^3.2.0", + "json-schema-ref-parser": "^3.3.1", "lunr": "^1.0.0", "mark.js": "github:julmot/mark.js", - "openapi-sampler": "^0.4.2", - "perfect-scrollbar": "^0.7.0", - "prismjs": "^1.5.1", + "openapi-sampler": "^0.4.3", + "perfect-scrollbar": "^0.8.1", + "phantomjs-prebuilt": "^2.1.15", + "prismjs": "^1.8.1", "remarkable": "1.7.1", "scrollparent": "^2.0.1", - "slugify": "^1.0.2", + "slugify": "^1.2.1", "stream-http": "^2.6.1", "ts-helpers": "^1.1.2", - "zone.js": "^0.8.16" + "zone.js": "^0.8.17" } } diff --git a/yarn.lock b/yarn.lock index a26dfbb3..6db49b60 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,61 +2,61 @@ # yarn lockfile v1 -"@angular/common@^4.3.2": - version "4.3.2" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-4.3.2.tgz#2fbd97b39e845399c3457e1d55abc6b1f60e09b8" +"@angular/common@^4.4.3": + version "4.4.3" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-4.4.3.tgz#f92ac68b02bec5f0e6d3603a843294dc96c96074" dependencies: tslib "^1.7.1" -"@angular/compiler-cli@^4.3.2": - version "4.3.2" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-4.3.2.tgz#a9c4b94590c82d0e3f28b1de497be636e21c3cc6" +"@angular/compiler-cli@^4.4.3": + version "4.4.3" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-4.4.3.tgz#183af81f141186b8d660b06429592d40b7540a4a" dependencies: - "@angular/tsc-wrapped" "4.3.2" + "@angular/tsc-wrapped" "4.4.3" minimist "^1.2.0" reflect-metadata "^0.1.2" -"@angular/compiler@^4.3.2": - version "4.3.2" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-4.3.2.tgz#b7922d0b2087a82e7b516a1c111a5993054f68b3" +"@angular/compiler@^4.4.3": + version "4.4.3" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-4.4.3.tgz#8f01163dad7db3408497d99d387554b6b185ad66" dependencies: tslib "^1.7.1" -"@angular/core@^4.3.2": - version "4.3.2" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-4.3.2.tgz#ea78341c3501ad8f43b51ffb183e200dc19844c3" +"@angular/core@^4.4.3": + version "4.4.3" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-4.4.3.tgz#e71d2b07beaacbab48ab7f51d4e2286ea5d70e15" dependencies: tslib "^1.7.1" -"@angular/platform-browser-dynamic@^4.3.2": - version "4.3.2" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.3.2.tgz#f434f1a2e70f53803f19f8fd4f466516fc34eed5" +"@angular/platform-browser-dynamic@^4.4.3": + version "4.4.3" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.3.tgz#e41ddd8252432775310eab5940cdd8df0618f084" dependencies: tslib "^1.7.1" -"@angular/platform-browser@^4.3.2": - version "4.3.2" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-4.3.2.tgz#7ff0f6a5c29f138faeeb7ab808eb7ab202a08594" +"@angular/platform-browser@^4.4.3": + version "4.4.3" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-4.4.3.tgz#23f9a45bd3dc7f44d97877fbf8e6032decfc9dcb" dependencies: tslib "^1.7.1" -"@angular/platform-server@^4.3.2": - version "4.3.2" - resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-4.3.2.tgz#6139143a7f8aaa0130b851c2f5ae4fa04ba5d450" +"@angular/platform-server@^4.4.3": + version "4.4.3" + resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-4.4.3.tgz#e65dce9de54d6ca6649cc9894c5c7a3247baaf4c" dependencies: parse5 "^3.0.1" tslib "^1.7.1" xhr2 "^0.1.4" -"@angular/tsc-wrapped@4.3.2": - version "4.3.2" - resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-4.3.2.tgz#81eb97d5cd4cc5c7a0a7a442561855bdc0569387" +"@angular/tsc-wrapped@4.4.3": + version "4.4.3" + resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-4.4.3.tgz#2d3f38210a1d4db03fc86dcf1e095812b85cd119" dependencies: tsickle "^0.21.0" -"@types/jasmine@^2.5.53": - version "2.5.53" - resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.5.53.tgz#4e0cefad09df5ec48c8dd40433512f84b1568d61" +"@types/jasmine@^2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.6.0.tgz#997b41a27752b4850af2683bc4a8d8222c25bd02" "@types/node@*", "@types/node@^6.0.46": version "6.0.84" @@ -66,25 +66,25 @@ version "0.0.32" resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5" -"@types/requirejs@^2.1.29": - version "2.1.29" - resolved "https://registry.yarnpkg.com/@types/requirejs/-/requirejs-2.1.29.tgz#bc48bc833c079c2c24ba6afbca6d3a03b3f4e2f3" +"@types/requirejs@^2.1.31": + version "2.1.31" + resolved "https://registry.yarnpkg.com/@types/requirejs/-/requirejs-2.1.31.tgz#a24eaa0ee4f6b84feb8f521ca6550d48490b2bc6" "@types/selenium-webdriver@^2.53.35", "@types/selenium-webdriver@~2.53.39": version "2.53.42" resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-2.53.42.tgz#74cb77fb6052edaff2a8984ddafd88d419f25cac" -"@types/should@^8.3.0": - version "8.3.0" - resolved "https://registry.yarnpkg.com/@types/should/-/should-8.3.0.tgz#e2b460243685dbe377182f39ef38d37f4d157ada" +"@types/should@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@types/should/-/should-11.2.0.tgz#e74aadfc13a1a0fc4b43786093eda395b6b32263" "@types/source-map@*": version "0.5.0" resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.0.tgz#dd34bbd8e32fe4e74f2e3d8ac07f8aa5b45a47ac" -"@types/swagger-schema-official@^2.0.5": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@types/swagger-schema-official/-/swagger-schema-official-2.0.5.tgz#9fe49b40b1d033fd73bebb7bb69cfa8cbf30b9f1" +"@types/swagger-schema-official@^2.0.6": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@types/swagger-schema-official/-/swagger-schema-official-2.0.6.tgz#d2ca46728e32004a16e8c6c7fc8305b7cedf31b5" "@types/tapable@*": version "0.2.3" @@ -96,9 +96,9 @@ dependencies: "@types/source-map" "*" -"@types/webpack@^3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-3.0.5.tgz#da3bca3665071ccbaba9ff929e361db85d3cc48a" +"@types/webpack@^3.0.11": + version "3.0.11" + resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-3.0.11.tgz#dabaf14f75a6a88e66df3f6ab13b8c1d88c83d96" dependencies: "@types/node" "*" "@types/tapable" "*" @@ -233,6 +233,12 @@ ansi-styles@^3.1.0: dependencies: color-convert "^1.0.0" +ansi-styles@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88" + dependencies: + color-convert "^1.9.0" + anymatch@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507" @@ -310,6 +316,13 @@ array-ify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece" +array-includes@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d" + dependencies: + define-properties "^1.1.2" + es-abstract "^1.7.0" + array-map@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662" @@ -404,6 +417,10 @@ async@~0.2.10, async@~0.2.6: version "0.2.10" resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" +async@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9" + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -427,9 +444,9 @@ autoprefixer@^6.3.1: postcss "^5.2.16" postcss-value-parser "^3.2.3" -awesome-typescript-loader@^3.2.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-3.2.2.tgz#f2e247cd8c129eef17c0c073d7d3a67d74a90684" +awesome-typescript-loader@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-3.2.3.tgz#aa2119b7c808a031e2b28945b031450a8975367f" dependencies: colors "^1.1.2" enhanced-resolve "3.3.0" @@ -766,6 +783,21 @@ buffer@^4.3.0: ieee754 "^1.1.4" isarray "^1.0.0" +build@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/build/-/build-0.1.4.tgz#707fe026ffceddcacbfdcdf356eafda64f151046" + dependencies: + cssmin "0.3.x" + jsmin "1.x" + jxLoader "*" + moo-server "*" + promised-io "*" + timespan "2.x" + uglify-js "1.x" + walker "1.x" + winston "*" + wrench "1.3.x" + builtin-modules@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" @@ -863,7 +895,7 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" -chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3: +chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" dependencies: @@ -881,6 +913,14 @@ chalk@^2.0.1: escape-string-regexp "^1.0.5" supports-color "^4.0.0" +chalk@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e" + dependencies: + ansi-styles "^3.1.0" + escape-string-regexp "^1.0.5" + supports-color "^4.0.0" + change-case@2.3.x: version "2.3.1" resolved "https://registry.yarnpkg.com/change-case/-/change-case-2.3.1.tgz#2c4fde3f063bb41d00cd68e0d5a09db61cbe894f" @@ -1002,9 +1042,9 @@ code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" -codelyzer@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-3.1.2.tgz#9ff1f041fb9b5ee5dbeb45ba866dfaf04983af04" +codelyzer@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-3.2.0.tgz#68eb0a67771ea73006b517053c3035c1838abf14" dependencies: app-root-path "^2.0.1" css-selector-tokenizer "^0.7.0" @@ -1021,7 +1061,7 @@ collection-visit@^0.2.1: map-visit "^0.1.5" object-visit "^0.3.4" -color-convert@^1.0.0, color-convert@^1.3.0: +color-convert@^1.0.0, color-convert@^1.3.0, color-convert@^1.9.0: version "1.9.0" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a" dependencies: @@ -1053,7 +1093,7 @@ colormin@^1.0.5: css-color-names "0.0.4" has "^1.0.1" -colors@1.0.3: +colors@1.0.3, colors@1.0.x: version "1.0.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" @@ -1150,6 +1190,14 @@ concat-stream@1.5.x: readable-stream "~2.0.0" typedarray "~0.0.5" +concat-stream@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" + dependencies: + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + connect-history-api-fallback@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz#e51d17f8f0ef0db90a64fdb47de3051556e9f169" @@ -1192,48 +1240,46 @@ content-type@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed" -conventional-changelog-angular@^1.3.4: - version "1.4.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.4.0.tgz#118b9f7d41a3d99500bfb6bea1f3525e055e8b9b" +conventional-changelog-angular@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.5.0.tgz#50b2d45008448455fdf67e06ea01972fbd08182a" dependencies: compare-func "^1.3.1" - github-url-from-git "^1.4.0" q "^1.4.1" - read-pkg-up "^2.0.0" -conventional-changelog-atom@^0.1.0: +conventional-changelog-atom@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz#d40a9b297961b53c745e5d1718fd1a3379f6a92f" dependencies: q "^1.4.1" -conventional-changelog-cli@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-1.3.2.tgz#33abf2b5720a9b094df38e81741ccb502e1a4125" +conventional-changelog-cli@^1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-1.3.3.tgz#ca38f229a27ec14036021b1786a48f5b8d48d7ff" dependencies: add-stream "^1.0.0" - conventional-changelog "^1.1.4" + conventional-changelog "^1.1.5" lodash "^4.1.0" meow "^3.7.0" tempfile "^1.1.1" -conventional-changelog-codemirror@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.1.0.tgz#7577a591dbf9b538e7a150a7ee62f65a2872b334" +conventional-changelog-codemirror@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.0.tgz#3cc925955f3b14402827b15168049821972d9459" dependencies: q "^1.4.1" -conventional-changelog-core@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-1.9.0.tgz#de5dfbc091847656508d4a389e35c9a1bc49e7f4" +conventional-changelog-core@^1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-1.9.1.tgz#ddf767c405850dfc8df31726c80fa1a6a10bdc7b" dependencies: - conventional-changelog-writer "^1.1.0" - conventional-commits-parser "^1.0.0" + conventional-changelog-writer "^2.0.1" + conventional-commits-parser "^2.0.0" dateformat "^1.0.12" get-pkg-repo "^1.0.0" git-raw-commits "^1.2.0" git-remote-origin-url "^2.0.0" - git-semver-tags "^1.2.0" + git-semver-tags "^1.2.1" lodash "^4.0.0" normalize-package-data "^2.3.5" q "^1.4.1" @@ -1241,21 +1287,21 @@ conventional-changelog-core@^1.9.0: read-pkg-up "^1.0.1" through2 "^2.0.0" -conventional-changelog-ember@^0.2.6: - version "0.2.6" - resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.2.6.tgz#8b7355419f5127493c4c562473ab2fc792f1c2b6" +conventional-changelog-ember@^0.2.7: + version "0.2.7" + resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.2.7.tgz#c6aff35976284e7222649f81c62bd96ff3217bd2" dependencies: q "^1.4.1" -conventional-changelog-eslint@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-0.1.0.tgz#a52411e999e0501ce500b856b0a643d0330907e2" +conventional-changelog-eslint@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.0.tgz#b4b9b5dc09417844d87c7bcfb16bdcc686c4b1c1" dependencies: q "^1.4.1" -conventional-changelog-express@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.1.0.tgz#55c6c841c811962036c037bdbd964a54ae310fce" +conventional-changelog-express@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.2.0.tgz#8d666ad41b10ebf964a4602062ddd2e00deb518d" dependencies: q "^1.4.1" @@ -1271,16 +1317,16 @@ conventional-changelog-jscs@^0.1.0: dependencies: q "^1.4.1" -conventional-changelog-jshint@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.1.0.tgz#00cab8e9a3317487abd94c4d84671342918d2a07" +conventional-changelog-jshint@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.0.tgz#63ad7aec66cd1ae559bafe80348c4657a6eb1872" dependencies: compare-func "^1.3.1" q "^1.4.1" -conventional-changelog-writer@^1.1.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-1.4.1.tgz#3f4cb4d003ebb56989d30d345893b52a43639c8e" +conventional-changelog-writer@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-2.0.1.tgz#47c10d0faba526b78d194389d1e931d09ee62372" dependencies: compare-func "^1.3.1" conventional-commits-filter "^1.0.0" @@ -1293,20 +1339,20 @@ conventional-changelog-writer@^1.1.0: split "^1.0.0" through2 "^2.0.0" -conventional-changelog@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.4.tgz#108bc750c2a317e200e2f9b413caaa1f8c7efa3b" +conventional-changelog@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.5.tgz#4c46fb64b2986cab19888d8c4b87ca7c0e431bfd" dependencies: - conventional-changelog-angular "^1.3.4" - conventional-changelog-atom "^0.1.0" - conventional-changelog-codemirror "^0.1.0" - conventional-changelog-core "^1.9.0" - conventional-changelog-ember "^0.2.6" - conventional-changelog-eslint "^0.1.0" - conventional-changelog-express "^0.1.0" + conventional-changelog-angular "^1.5.0" + conventional-changelog-atom "^0.1.1" + conventional-changelog-codemirror "^0.2.0" + conventional-changelog-core "^1.9.1" + conventional-changelog-ember "^0.2.7" + conventional-changelog-eslint "^0.2.0" + conventional-changelog-express "^0.2.0" conventional-changelog-jquery "^0.1.0" conventional-changelog-jscs "^0.1.0" - conventional-changelog-jshint "^0.1.0" + conventional-changelog-jshint "^0.2.0" conventional-commits-filter@^1.0.0: version "1.0.0" @@ -1315,9 +1361,9 @@ conventional-commits-filter@^1.0.0: is-subset "^0.1.1" modify-values "^1.0.0" -conventional-commits-parser@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-1.3.0.tgz#e327b53194e1a7ad5dc63479ee9099a52b024865" +conventional-commits-parser@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz#71d01910cb0a99aeb20c144e50f81f4df3178447" dependencies: JSONStream "^1.0.4" is-text-path "^1.0.0" @@ -1343,10 +1389,14 @@ copy-descriptor@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" -core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1: +core-js@^2.2.0, core-js@^2.4.0: version "2.4.1" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e" +core-js@^2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b" + core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -1399,7 +1449,7 @@ cross-spawn@^3.0.0: lru-cache "^4.0.1" which "^1.2.9" -cross-spawn@^5.0.1: +cross-spawn@^5.0.1, cross-spawn@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" dependencies: @@ -1432,9 +1482,9 @@ css-color-names@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" -css-loader@^0.28.1: - version "0.28.4" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.4.tgz#6cf3579192ce355e8b38d5f42dd7a1f2ec898d0f" +css-loader@^0.28.7: + version "0.28.7" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.7.tgz#5f2ee989dd32edd907717f953317656160999c1b" dependencies: babel-code-frame "^6.11.0" css-selector-tokenizer "^0.7.0" @@ -1449,7 +1499,7 @@ css-loader@^0.28.1: postcss-modules-scope "^1.0.0" postcss-modules-values "^1.1.0" postcss-value-parser "^3.3.0" - source-list-map "^0.1.7" + source-list-map "^2.0.0" css-loader@^0.9.1: version "0.9.1" @@ -1477,6 +1527,10 @@ cssesc@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4" +cssmin@0.3.x: + version "0.3.2" + resolved "https://registry.yarnpkg.com/cssmin/-/cssmin-0.3.2.tgz#ddce4c547b510ae0d594a8f1fbf8aaf8e2c5c00d" + "cssnano@>=2.6.1 <4": version "3.10.0" resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38" @@ -1535,6 +1589,10 @@ custom-event@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" +cycle@1.0.x: + version "1.0.3" + resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2" + d@1: version "1.0.0" resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f" @@ -1592,6 +1650,12 @@ debug@2.6.7: dependencies: ms "2.0.0" +debug@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.0.1.tgz#0564c612b521dc92d9f2988f0549e34f9c98db64" + dependencies: + ms "2.0.0" + decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -1608,6 +1672,13 @@ deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" +default-gateway@^2.2.2: + version "2.5.0" + resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.5.0.tgz#78e24dbd2e1df7490c2b8050515b8e816bfa7da5" + dependencies: + execa "^0.7.0" + ip-regex "^2.1.0" + define-properties@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94" @@ -1755,7 +1826,7 @@ dot-prop@^3.0.0: dependencies: is-obj "^1.0.0" -dropkickjs@^2.1.10: +dropkickjs@~2.1.10: version "2.1.10" resolved "https://registry.yarnpkg.com/dropkickjs/-/dropkickjs-2.1.10.tgz#f13c9402141da09e74adf4e63798d792204438f2" @@ -1894,6 +1965,16 @@ es-abstract@^1.4.3: is-callable "^1.1.3" is-regex "^1.0.3" +es-abstract@^1.7.0: + version "1.8.2" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.8.2.tgz#25103263dc4decbda60e0c737ca32313518027ee" + dependencies: + es-to-primitive "^1.1.1" + function-bind "^1.1.1" + has "^1.0.1" + is-callable "^1.1.3" + is-regex "^1.0.4" + es-to-primitive@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d" @@ -2193,10 +2274,23 @@ extract-zip@~1.5.0: mkdirp "0.5.0" yauzl "2.4.1" +extract-zip@~1.6.5: + version "1.6.5" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.5.tgz#99a06735b6ea20ea9b705d779acffcc87cff0440" + dependencies: + concat-stream "1.6.0" + debug "2.2.0" + mkdirp "0.5.0" + yauzl "2.4.1" + extsprintf@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550" +eyes@0.1.x: + version "0.1.8" + resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0" + fancy-log@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.0.tgz#45be17d02bb9917d60ccffd4995c999e6c8c9948" @@ -2332,7 +2426,7 @@ format-util@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/format-util/-/format-util-1.0.3.tgz#032dca4a116262a12c43f4c3ec8566416c5b2d95" -formatio@1.2.0: +formatio@1.2.0, formatio@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.2.0.tgz#f3b2167d9068c4698a8d51f4f760a39a54d818eb" dependencies: @@ -2402,6 +2496,10 @@ function-bind@^1.0.2, function-bind@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771" +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" @@ -2480,7 +2578,7 @@ git-remote-origin-url@^2.0.0: gitconfiglocal "^1.0.0" pify "^2.3.0" -git-semver-tags@^1.2.0: +git-semver-tags@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.2.1.tgz#6ccd2a52e735b736748dc762444fcd9588e27490" dependencies: @@ -2506,10 +2604,6 @@ gitconfiglocal@^1.0.0: dependencies: ini "^1.3.2" -github-url-from-git@^1.4.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/github-url-from-git/-/github-url-from-git-1.5.0.tgz#f985fedcc0a9aa579dc88d7aff068d55cc6251a0" - glob-base@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" @@ -2924,11 +3018,12 @@ ini@^1.3.2, ini@^1.3.4, ini@~1.3.0: version "1.3.4" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e" -internal-ip@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-1.2.0.tgz#ae9fbf93b984878785d50a8de1b356956058cf5c" +internal-ip@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-2.0.3.tgz#ed3cf9b671ac7ff23037bfacad42eb439cd9546c" dependencies: - meow "^3.3.0" + default-gateway "^2.2.2" + ipaddr.js "^1.5.2" interpret@^1.0.0: version "1.0.3" @@ -2944,7 +3039,11 @@ invert-kv@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" -ip@^1.1.0: +ip-regex@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" + +ip@^1.1.0, ip@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" @@ -2952,6 +3051,10 @@ ipaddr.js@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.3.0.tgz#1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec" +ipaddr.js@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0" + is-absolute-url@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" @@ -3143,7 +3246,7 @@ is-property@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" -is-regex@^1.0.3: +is-regex@^1.0.3, is-regex@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" dependencies: @@ -3193,6 +3296,10 @@ is-utf8@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" +is-wsl@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" + isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" @@ -3219,7 +3326,7 @@ isobject@^3.0.0, isobject@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" -isstream@~0.1.2: +isstream@0.1.x, isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" @@ -3267,17 +3374,17 @@ istanbul@0.4.5, istanbul@^0.4.0: which "^1.1.1" wordwrap "^1.0.0" -jasmine-core@^2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.7.0.tgz#50ff8c4f92d8ef5c0b2c1b846dd263ed85152091" +jasmine-core@^2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e" jasmine-core@~2.6.0: version "2.6.4" resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.6.4.tgz#dec926cd0a9fa287fb6db5c755fa487e74cecac5" -jasmine-spec-reporter@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.1.1.tgz#5a6d58ab5d61bea7309fbc279239511756b1b588" +jasmine-spec-reporter@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22" dependencies: colors "1.1.2" @@ -3301,6 +3408,10 @@ js-tokens@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" +js-yaml@0.3.x: + version "0.3.7" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-0.3.7.tgz#d739d8ee86461e54b354d6a7d7d1f2ad9a167f62" + js-yaml@3.6.1: version "3.6.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30" @@ -3334,6 +3445,10 @@ jsesc@~0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" +jsmin@1.x: + version "1.0.1" + resolved "https://registry.yarnpkg.com/jsmin/-/jsmin-1.0.1.tgz#e7bd0dcd6496c3bf4863235bf461a3d98aa3b98c" + json-loader@^0.5.4: version "0.5.6" resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.6.tgz#51697650c63f7d17e21561582117282e1e711db8" @@ -3344,12 +3459,12 @@ json-pointer@^0.6.0: dependencies: foreach "^2.0.4" -json-schema-ref-parser@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/json-schema-ref-parser/-/json-schema-ref-parser-3.2.0.tgz#c2c3725755e69818418e9aeacd61903a494a43d8" +json-schema-ref-parser@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/json-schema-ref-parser/-/json-schema-ref-parser-3.3.1.tgz#86e751b8099357bf601a7cfe42d10123ee906a32" dependencies: call-me-maybe "^1.0.1" - debug "^2.6.8" + debug "^3.0.0" es6-promise "^4.1.1" js-yaml "^3.9.1" ono "^4.0.2" @@ -3408,6 +3523,19 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.3.6" +just-extend@^1.1.22: + version "1.1.22" + resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-1.1.22.tgz#3330af756cab6a542700c64b2e4e4aa062d52fff" + +jxLoader@*: + version "0.1.1" + resolved "https://registry.yarnpkg.com/jxLoader/-/jxLoader-0.1.1.tgz#0134ea5144e533b594fc1ff25ff194e235c53ecd" + dependencies: + js-yaml "0.3.x" + moo-server "1.3.x" + promised-io "*" + walker "1.x" + karma-chrome-launcher@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf" @@ -3436,11 +3564,13 @@ karma-jasmine@^1.0.2: version "1.1.0" resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.0.tgz#22e4c06bf9a182e5294d1f705e3733811b810acf" -karma-mocha-reporter@^2.2.3: - version "2.2.3" - resolved "https://registry.yarnpkg.com/karma-mocha-reporter/-/karma-mocha-reporter-2.2.3.tgz#04fdda45a1d9697a73871c7472223c581701ab20" +karma-mocha-reporter@^2.2.4: + version "2.2.4" + resolved "https://registry.yarnpkg.com/karma-mocha-reporter/-/karma-mocha-reporter-2.2.4.tgz#0c9cb22c27d864d0f6694df0cf01caabce9064d4" dependencies: - chalk "1.1.3" + chalk "^2.1.0" + log-symbols "^2.0.0" + strip-ansi "^4.0.0" karma-phantomjs-launcher@^1.0.4: version "1.0.4" @@ -3483,9 +3613,9 @@ karma-webpack@^2.0.4: source-map "^0.1.41" webpack-dev-middleware "^1.0.11" -karma@^1.6.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/karma/-/karma-1.7.0.tgz#6f7a1a406446fa2e187ec95398698f4cee476269" +karma@^1.7.1: + version "1.7.1" + resolved "https://registry.yarnpkg.com/karma/-/karma-1.7.1.tgz#85cc08e9e0a22d7ce9cca37c4a1be824f6a2b1ae" dependencies: bluebird "^3.3.0" body-parser "^1.16.1" @@ -3688,7 +3818,7 @@ lodash.escape@^3.0.0: dependencies: lodash._root "^3.0.0" -lodash.get@^4.1.2: +lodash.get@^4.1.2, lodash.get@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" @@ -3778,6 +3908,12 @@ log-driver@1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.5.tgz#7ae4ec257302fd790d557cb10c97100d857b0056" +log-symbols@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.0.0.tgz#595e63be4d5c8cbf294a9e09e0d5629f5913fc0c" + dependencies: + chalk "^2.0.1" + log4js@^0.6.31: version "0.6.38" resolved "https://registry.yarnpkg.com/log4js/-/log4js-0.6.38.tgz#2c494116695d6fb25480943d3fc872e662a522fd" @@ -3793,6 +3929,10 @@ lolex@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.6.0.tgz#3a9a0283452a47d7439e72731b9e07d7386e49f6" +lolex@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.1.2.tgz#2694b953c9ea4d013e5b8bfba891c991025b2629" + longest@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" @@ -3839,6 +3979,12 @@ macaddress@^0.2.8: version "0.2.8" resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12" +makeerror@1.0.x: + version "1.0.11" + resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" + dependencies: + tmpl "1.0.x" + map-cache@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" @@ -3883,6 +4029,12 @@ memory-fs@^0.4.0, memory-fs@~0.4.1: errno "^0.1.3" readable-stream "^2.0.1" +memory-streams@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/memory-streams/-/memory-streams-0.1.2.tgz#273ff777ab60fec599b116355255282cca2c50c2" + dependencies: + readable-stream "~1.0.2" + meow@^3.3.0, meow@^3.6.0, meow@^3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" @@ -4023,6 +4175,10 @@ modify-values@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.0.tgz#e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2" +moo-server@*, moo-server@1.3.x: + version "1.3.0" + resolved "https://registry.yarnpkg.com/moo-server/-/moo-server-1.3.0.tgz#5dc79569565a10d6efed5439491e69d2392e58f1" + ms@0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098" @@ -4087,6 +4243,16 @@ negotiator@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" +nise@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/nise/-/nise-1.1.0.tgz#37e41b9bf0041ccb83d1bf03e79440bbc0db10ad" + dependencies: + formatio "^1.2.0" + just-extend "^1.1.22" + lolex "^1.6.0" + path-to-regexp "^1.7.0" + text-encoding "^0.6.4" + node-forge@0.6.33: version "0.6.33" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.6.33.tgz#463811879f573d45155ad6a9f43dc296e8e85ebc" @@ -4215,14 +4381,16 @@ normalize-url@^1.4.0: query-string "^4.1.0" sort-keys "^1.0.0" -npm-run-all@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.0.2.tgz#a84669348e6db6ccbe052200b4cdb6bfe034a4fe" +npm-run-all@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.1.tgz#3095cf3f3cacf57fcb662b210ab10c609af6ddbb" dependencies: - chalk "^1.1.3" - cross-spawn "^5.0.1" - minimatch "^3.0.2" - ps-tree "^1.0.1" + ansi-styles "^3.2.0" + chalk "^2.1.0" + cross-spawn "^5.1.0" + memory-streams "^0.1.2" + minimatch "^3.0.4" + ps-tree "^1.1.0" read-pkg "^2.0.0" shell-quote "^1.6.1" string.prototype.padend "^3.0.0" @@ -4331,20 +4499,19 @@ ono@^4.0.2: dependencies: format-util "^1.0.3" -openapi-sampler@^0.4.2: - version "0.4.2" - resolved "https://registry.yarnpkg.com/openapi-sampler/-/openapi-sampler-0.4.2.tgz#a687bc966c72ee8a98b51bc0c31d5e77a66c6ae1" +openapi-sampler@^0.4.3: + version "0.4.3" + resolved "https://registry.yarnpkg.com/openapi-sampler/-/openapi-sampler-0.4.3.tgz#de3aa522f45744c8349f598d4d9b6f35caaf25b2" opener@~1.4.0: version "1.4.3" resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8" -opn@4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95" +opn@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/opn/-/opn-5.1.0.tgz#72ce2306a17dbea58ff1041853352b4a8fc77519" dependencies: - object-assign "^4.0.1" - pinkie-promise "^2.0.0" + is-wsl "^1.1.0" optimist@0.6.x, optimist@^0.6.1, optimist@~0.6.0: version "0.6.1" @@ -4590,15 +4757,29 @@ pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" -perfect-scrollbar@^0.7.0: - version "0.7.1" - resolved "https://registry.yarnpkg.com/perfect-scrollbar/-/perfect-scrollbar-0.7.1.tgz#0c256fb9c5cee401d60a299687a3f9a61487e0d5" +perfect-scrollbar@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/perfect-scrollbar/-/perfect-scrollbar-0.8.1.tgz#9cdcb50e72740b8da7e5a4a534f36c35f4e0a613" performance-now@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" -phantomjs-prebuilt@^2.1.14, phantomjs-prebuilt@^2.1.7: +phantomjs-prebuilt@^2.1.15: + version "2.1.15" + resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.15.tgz#20f86e82d3349c505917527745b7a411e08b3903" + dependencies: + es6-promise "~4.0.3" + extract-zip "~1.6.5" + fs-extra "~1.0.0" + hasha "~2.2.0" + kew "~0.7.0" + progress "~1.1.8" + request "~2.81.0" + request-progress "~2.0.1" + which "~1.2.10" + +phantomjs-prebuilt@^2.1.7: version "2.1.14" resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.14.tgz#d53d311fcfb7d1d08ddb24014558f1188c516da0" dependencies: @@ -4900,9 +5081,9 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -prismjs@^1.5.1: - version "1.6.0" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.6.0.tgz#118d95fb7a66dba2272e343b345f5236659db365" +prismjs@^1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.8.1.tgz#bd0cdc32e9a561c1c8c3c9733765a7f1ec3b54ee" optionalDependencies: clipboard "^1.5.5" @@ -4924,6 +5105,10 @@ promise@^7.1.1: dependencies: asap "~2.0.3" +promised-io@*: + version "0.3.5" + resolved "https://registry.yarnpkg.com/promised-io/-/promised-io-0.3.5.tgz#4ad217bb3658bcaae9946b17a8668ecd851e1356" + protocols@^1.1.0, protocols@^1.4.0: version "1.4.5" resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.5.tgz#21de1f441c4ef7094408ed9f1c94f7a114b87557" @@ -4959,7 +5144,7 @@ prr@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a" -ps-tree@^1.0.1: +ps-tree@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.1.0.tgz#b421b24140d6203f1ed3c76996b4427b08e8c014" dependencies: @@ -5098,7 +5283,7 @@ read-pkg@^2.0.0: normalize-package-data "^2.3.2" path-type "^2.0.0" -readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.6, readable-stream@^2.2.9: +readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.2.9: version "2.3.3" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" dependencies: @@ -5300,7 +5485,7 @@ request@2, request@2.79.0, request@^2.72.0, request@^2.78.0, request@^2.79.0, re tunnel-agent "~0.4.1" uuid "^3.0.0" -request@^2.81.0: +request@^2.81.0, request@~2.81.0: version "2.81.0" resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" dependencies: @@ -5365,6 +5550,12 @@ rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2. dependencies: glob "^7.0.5" +rimraf@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" + dependencies: + glob "^7.0.5" + ripemd160@^2.0.0, ripemd160@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7" @@ -5372,9 +5563,9 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^2.0.0" inherits "^2.0.1" -rxjs@^5.4.2: - version "5.4.2" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.4.2.tgz#2a3236fcbf03df57bae06fd6972fd99e5c08fcf7" +rxjs@^5.4.3: + version "5.4.3" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.4.3.tgz#0758cddee6033d68e0fd53676f0f3596ce3d483f" dependencies: symbol-observable "^1.0.1" @@ -5605,13 +5796,13 @@ shelljs@^0.7.0, shelljs@^0.7.7: interpret "^1.0.0" rechoir "^0.6.2" -should-equal@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/should-equal/-/should-equal-1.0.1.tgz#0b6e9516f2601a9fb0bb2dcc369afa1c7e200af7" +should-equal@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/should-equal/-/should-equal-2.0.0.tgz#6072cf83047360867e68e98b09d71143d04ee0c3" dependencies: - should-type "^1.0.0" + should-type "^1.4.0" -should-format@^3.0.2: +should-format@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/should-format/-/should-format-3.0.3.tgz#9bfc8f74fa39205c53d38c34d717303e277124f1" dependencies: @@ -5625,7 +5816,7 @@ should-type-adaptors@^1.0.1: should-type "^1.3.0" should-util "^1.0.0" -should-type@^1.0.0, should-type@^1.3.0, should-type@^1.4.0: +should-type@^1.3.0, should-type@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/should-type/-/should-type-1.4.0.tgz#0756d8ce846dfd09843a6947719dfa0d4cff5cf3" @@ -5633,12 +5824,12 @@ should-util@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/should-util/-/should-util-1.0.0.tgz#c98cda374aa6b190df8ba87c9889c2b4db620063" -should@^11.2.1: - version "11.2.1" - resolved "https://registry.yarnpkg.com/should/-/should-11.2.1.tgz#90f55145552d01cfc200666e4e818a1c9670eda2" +should@^13.1.0: + version "13.1.0" + resolved "https://registry.yarnpkg.com/should/-/should-13.1.0.tgz#0b7be3abf5ebf7c7e116935753918a40660de51e" dependencies: - should-equal "^1.0.0" - should-format "^3.0.2" + should-equal "^2.0.0" + should-format "^3.0.3" should-type "^1.4.0" should-type-adaptors "^1.0.1" should-util "^1.0.0" @@ -5647,22 +5838,25 @@ signal-exit@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" -sinon@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/sinon/-/sinon-2.4.1.tgz#021fd64b54cb77d9d2fb0d43cdedfae7629c3a36" +sinon@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/sinon/-/sinon-3.3.0.tgz#9132111b4bbe13c749c2848210864250165069b1" dependencies: + build "^0.1.4" diff "^3.1.0" formatio "1.2.0" - lolex "^1.6.0" + lodash.get "^4.4.2" + lolex "^2.1.2" native-promise-only "^0.8.1" + nise "^1.0.1" path-to-regexp "^1.7.0" samsam "^1.1.3" text-encoding "0.6.4" type-detect "^4.0.0" -slugify@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.1.0.tgz#7e5b0938d52b5efab1878247ef0f6a4f05db7ee0" +slugify@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.2.1.tgz#2118f4b0fbcfd79d7b2c451c22b724e5c1991330" snake-case@^1.1.0: version "1.1.2" @@ -5771,10 +5965,6 @@ sort-keys@^1.0.0: dependencies: is-plain-obj "^1.0.0" -source-list-map@^0.1.7: - version "0.1.8" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106" - source-list-map@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085" @@ -5915,6 +6105,10 @@ sshpk@^1.7.0: jsbn "~0.1.0" tweetnacl "~0.14.0" +stack-trace@0.0.x: + version "0.0.10" + resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" + static-extend@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" @@ -6060,7 +6254,7 @@ supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" -supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.2.3: +supports-color@^3.1.0, supports-color@^3.2.3: version "3.2.3" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" dependencies: @@ -6131,7 +6325,7 @@ tempfile@^1.1.1: os-tmpdir "^1.0.0" uuid "^2.0.1" -text-encoding@0.6.4: +text-encoding@0.6.4, text-encoding@^0.6.4: version "0.6.4" resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19" @@ -6175,6 +6369,10 @@ timers-browserify@^2.0.2: dependencies: setimmediate "^1.0.4" +timespan@2.x: + version "2.3.0" + resolved "https://registry.yarnpkg.com/timespan/-/timespan-2.3.0.tgz#4902ce040bd13d845c8f59b27e9d59bad6f39929" + tiny-emitter@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.0.1.tgz#e65919d91e488e2a78f7ebe827a56c6b188d51af" @@ -6202,6 +6400,10 @@ tmp@0.0.31, tmp@0.0.x: dependencies: os-tmpdir "~1.0.1" +tmpl@1.0.x: + version "1.0.4" + resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" + to-array@0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" @@ -6278,9 +6480,9 @@ tslib@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec" -tslint@^5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.5.0.tgz#10e8dab3e3061fa61e9442e8cee3982acf20a6aa" +tslint@^5.7.0: + version "5.7.0" + resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.7.0.tgz#c25e0d0c92fa1201c2bc30e844e08e682b4f3552" dependencies: babel-code-frame "^6.22.0" colors "^1.1.2" @@ -6291,11 +6493,11 @@ tslint@^5.5.0: resolve "^1.3.2" semver "^5.3.0" tslib "^1.7.1" - tsutils "^2.5.1" + tsutils "^2.8.1" -tsutils@^2.5.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.7.1.tgz#411a0e9466525a2b2869260a55620d7292155e24" +tsutils@^2.8.1: + version "2.8.2" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.8.2.tgz#2c1486ba431260845b0ac6f902afd9d708a8ea6a" dependencies: tslib "^1.7.1" @@ -6334,13 +6536,17 @@ type-is@~1.6.15: media-typer "0.3.0" mime-types "~2.1.15" -typedarray@~0.0.5: +typedarray@^0.0.6, typedarray@~0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -typescript@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.2.tgz#f8395f85d459276067c988aa41837a8f82870844" +typescript@^2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.2.tgz#038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34" + +uglify-js@1.x: + version "1.3.5" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-1.3.5.tgz#4b5bfff9186effbaa888e4c9e94bd9fc4c94929d" uglify-js@2.6.x: version "2.6.4" @@ -6547,6 +6753,12 @@ void-elements@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" +walker@1.x: + version "1.0.7" + resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb" + dependencies: + makeerror "1.0.x" + watchpack@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac" @@ -6593,11 +6805,12 @@ webpack-dev-middleware@^1.0.11, webpack-dev-middleware@^1.11.0: path-is-absolute "^1.0.0" range-parser "^1.0.3" -webpack-dev-server@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.6.1.tgz#0b292a9da96daf80a65988f69f87b4166e5defe7" +webpack-dev-server@^2.8.2: + version "2.8.2" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.8.2.tgz#abd61f410778cc4c843d7cebbf41465b1ab7734c" dependencies: ansi-html "0.0.7" + array-includes "^3.0.3" bonjour "^3.5.0" chokidar "^1.6.0" compression "^1.5.2" @@ -6606,19 +6819,20 @@ webpack-dev-server@^2.6.1: express "^4.13.3" html-entities "^1.2.0" http-proxy-middleware "~0.17.4" - internal-ip "^1.2.0" + internal-ip "^2.0.2" + ip "^1.1.5" loglevel "^1.4.1" - opn "4.0.2" + opn "^5.1.0" portfinder "^1.0.9" selfsigned "^1.9.1" serve-index "^1.7.2" sockjs "0.3.18" sockjs-client "1.1.4" spdy "^3.4.1" - strip-ansi "^3.0.0" - supports-color "^3.1.1" + strip-ansi "^3.0.1" + supports-color "^4.2.1" webpack-dev-middleware "^1.11.0" - yargs "^6.0.0" + yargs "^6.6.0" webpack-merge@^4.1.0: version "4.1.0" @@ -6633,9 +6847,9 @@ webpack-sources@^1.0.1: source-list-map "^2.0.0" source-map "~0.5.3" -webpack@^3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.4.1.tgz#4c3f4f3fb318155a4db0cb6a36ff05c5697418f4" +webpack@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.6.0.tgz#a89a929fbee205d35a4fa2cc487be9cbec8898bc" dependencies: acorn "^5.0.0" acorn-dynamic-import "^2.0.0" @@ -6706,6 +6920,17 @@ window-size@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" +winston@*: + version "2.3.1" + resolved "https://registry.yarnpkg.com/winston/-/winston-2.3.1.tgz#0b48420d978c01804cf0230b648861598225a119" + dependencies: + async "~1.0.0" + colors "1.0.x" + cycle "1.0.x" + eyes "0.1.x" + isstream "0.1.x" + stack-trace "0.0.x" + wordwrap@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" @@ -6729,6 +6954,10 @@ wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" +wrench@1.3.x: + version "1.3.9" + resolved "https://registry.yarnpkg.com/wrench/-/wrench-1.3.9.tgz#6f13ec35145317eb292ca5f6531391b244111411" + ws@1.1.2, ws@^1.0.1: version "1.1.2" resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.2.tgz#8a244fa052401e08c9886cf44a85189e1fd4067f" @@ -6840,7 +7069,7 @@ yargs@^4.7.1: y18n "^3.2.1" yargs-parser "^2.4.1" -yargs@^6.0.0: +yargs@^6.6.0: version "6.6.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208" dependencies: @@ -6923,6 +7152,6 @@ z-schema@^3.18.2: optionalDependencies: commander "^2.7.1" -zone.js@^0.8.16: - version "0.8.16" - resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.16.tgz#ac31b6c418f88c0f918ad6acd8a402aca9313abb" +zone.js@^0.8.17: + version "0.8.17" + resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.17.tgz#4c5e5185a857da8da793daf3919371c5a36b2a0b" From 869daaaca5f2a57135cbc05e15a344cf04da56ba Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Thu, 21 Sep 2017 11:51:33 +0300 Subject: [PATCH 06/10] =?UTF-8?q?chore:=20use=20headless=20=F0=9F=97=A1=20?= =?UTF-8?q?=F0=9F=98=91=20chrome=20instead=20of=20phantomjs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 1 + karma.conf.js | 30 ++++----- package.json | 3 - yarn.lock | 164 +++----------------------------------------------- 4 files changed, 25 insertions(+), 173 deletions(-) diff --git a/.travis.yml b/.travis.yml index 93032cf9..d557f87a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ env: - secure: apiavCfCQngL9Een1m7MIXMf3bqO3rY4YY59TMBl/yFKi80CEsHPHhgVUkl6hC+aM5PeBt/vgjh37rHMX31j/pcSZ4Z8SO/4Bwr36iHfhSxSEuAQog8P07qWqH7wYYWGIVmF682stgl0fYF+GN92sx/6edFVzsWVECf2G7imtICKSTbhKGm3Dhn2JwGnhD7eyfgZ33omgiaswumdu0xABoXDfqSZR+16fC4Ap5rhv3fXO9ndvRNy1STn376nT+my6e86UrQL4aS/S+HNHgIe1BUs+5cOp6Jgw6t0ie7phY0EAiECsRxy9K4e3Dctv9m6+Wma4+vy65MS0zGyrqey6oyV4l827sCOjrD1qcqc9bX6FlMSouVoNfE4ZjINNAbgigTaiLSoDSPcf5I5smkkM2ezzFOMSZwZxNdaNL2LKb97vc8m/ZUkv0sKZyT7oqVL7aJweEivsSHj5l2KR8Z7XrVB1y2eI6GvyTSa/d+CL4dSRzjh8+IRN047YBrdTKD5IkdT0upfoBu14WPUfFmLKxX+iMCslXRWb6kwojhrWNYmZvL65KRAzJ6+eIPDG/W5QUOpYyYT77bLlBQjVo6NmVvl9v3HMECq9CHH0ivKFBGPiKMOx7cJkTax3FuyznOW2WCXB9kTb5Zk9toaiNlSp9L6ll/h2Eyxa6n6sWUgmmM= addons: sauce_connect: true + chrome: stable cache: yarn before_install: if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi before_deploy: diff --git a/karma.conf.js b/karma.conf.js index 0732fa82..f3d059bb 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,51 +1,53 @@ -module.exports = function (config) { +module.exports = function(config) { const testWebpackConfig = require('./build/webpack.test.js'); const travis = process.env.TRAVIS; config.set({ - frameworks: ['phantomjs-shim', 'jasmine', 'sinon', 'should'], + frameworks: ['jasmine', 'sinon', 'should'], preprocessors: { - './tests/spec-bundle.js': ['coverage', 'webpack', 'sourcemap'] + './tests/spec-bundle.js': ['coverage', 'webpack', 'sourcemap'], }, coverageReporter: { - type: 'in-memory' + type: 'in-memory', }, remapCoverageReporter: { 'text-summary': null, 'text-lcov': './coverage/lcov.info', - 'html': './coverage/html' + html: './coverage/html', }, webpack: testWebpackConfig, webpackMiddleware: { stats: 'errors-only', - state: true + state: true, }, client: { chai: { - truncateThreshold: 0 - } + truncateThreshold: 0, + }, }, files: [ { pattern: './tests/spec-bundle.js', watched: false }, { pattern: 'tests/schemas/**/*.json', included: false }, { pattern: 'tests/schemas/**/*.yml', included: false }, { pattern: 'lib/**/*.html', included: false }, - { pattern: 'lib/**/*.css', included: false } + { pattern: 'lib/**/*.css', included: false }, ], proxies: { '/tests/schemas': '/base/tests/schemas', '/lib/': '/base/lib/', - '/node_modules/': '/base/node_modules/' + '/node_modules/': '/base/node_modules/', }, colors: true, singleRun: true, - reporters: travis ? ['mocha', 'coverage', 'remap-coverage', 'coveralls'] : ['mocha', 'coverage', 'remap-coverage'], + reporters: travis + ? ['mocha', 'coverage', 'remap-coverage', 'coveralls'] + : ['mocha', 'coverage', 'remap-coverage'], - browsers: ['PhantomJS'], + browsers: ['ChromeHeadless'], - browserNoActivityTimeout: 60000 + browserNoActivityTimeout: 60000, }); -} +}; diff --git a/package.json b/package.json index e11aca71..9020bc85 100644 --- a/package.json +++ b/package.json @@ -86,8 +86,6 @@ "karma-coveralls": "^1.1.2", "karma-jasmine": "^1.0.2", "karma-mocha-reporter": "^2.2.4", - "karma-phantomjs-launcher": "^1.0.4", - "karma-phantomjs-shim": "^1.1.2", "karma-remap-coverage": "^0.1.4", "karma-should": "^1.0.0", "karma-sinon": "^1.0.4", @@ -136,7 +134,6 @@ "mark.js": "github:julmot/mark.js", "openapi-sampler": "^0.4.3", "perfect-scrollbar": "^0.8.1", - "phantomjs-prebuilt": "^2.1.15", "prismjs": "^1.8.1", "remarkable": "1.7.1", "scrollparent": "^2.0.1", diff --git a/yarn.lock b/yarn.lock index 6db49b60..d33eecc1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1174,14 +1174,6 @@ concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" -concat-stream@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.0.tgz#53f7d43c51c5e43f81c8fdd03321c631be68d611" - dependencies: - inherits "~2.0.1" - readable-stream "~2.0.0" - typedarray "~0.0.5" - concat-stream@1.5.x: version "1.5.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266" @@ -1190,14 +1182,6 @@ concat-stream@1.5.x: readable-stream "~2.0.0" typedarray "~0.0.5" -concat-stream@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" - dependencies: - inherits "^2.0.3" - readable-stream "^2.2.2" - typedarray "^0.0.6" - connect-history-api-fallback@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz#e51d17f8f0ef0db90a64fdb47de3051556e9f169" @@ -1622,10 +1606,6 @@ dateformat@^1.0.11, dateformat@^1.0.12, dateformat@^1.0.6: get-stdin "^4.0.1" meow "^3.3.0" -debug@0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39" - debug@2, debug@2.6.8, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8: version "2.6.8" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc" @@ -2013,10 +1993,6 @@ es6-promise@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.1.1.tgz#8811e90915d9a0dba36274f0b242dbda78f9c92a" -es6-promise@~4.0.3: - version "4.0.5" - resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.0.5.tgz#7882f30adde5b240ccfa7f7d78c548330951ae42" - es6-set@~0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1" @@ -2265,24 +2241,6 @@ extglob@^1.1.0: snapdragon "^0.8.1" to-regex "^2.1.0" -extract-zip@~1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.5.0.tgz#92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4" - dependencies: - concat-stream "1.5.0" - debug "0.7.4" - mkdirp "0.5.0" - yauzl "2.4.1" - -extract-zip@~1.6.5: - version "1.6.5" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.5.tgz#99a06735b6ea20ea9b705d779acffcc87cff0440" - dependencies: - concat-stream "1.6.0" - debug "2.2.0" - mkdirp "0.5.0" - yauzl "2.4.1" - extsprintf@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550" @@ -2322,12 +2280,6 @@ faye-websocket@~0.11.0: dependencies: websocket-driver ">=0.5.1" -fd-slicer@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" - dependencies: - pend "~1.2.0" - file-loader@^0.8.1: version "0.8.5" resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.8.5.tgz#9275d031fe780f27d47f5f4af02bd43713cc151b" @@ -2456,14 +2408,6 @@ fs-access@^1.0.0: dependencies: null-check "^1.0.0" -fs-extra@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950" - dependencies: - graceful-fs "^4.1.2" - jsonfile "^2.1.0" - klaw "^1.0.0" - fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -2683,7 +2627,7 @@ good-listener@^1.2.2: dependencies: delegate "^3.1.2" -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9: +graceful-fs@^4.1.2: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" @@ -2819,13 +2763,6 @@ hash.js@^1.0.0, hash.js@^1.0.3: inherits "^2.0.3" minimalistic-assert "^1.0.0" -hasha@~2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/hasha/-/hasha-2.2.0.tgz#78d7cbfc1e6d66303fe79837365984517b2f6ee1" - dependencies: - is-stream "^1.0.1" - pinkie-promise "^2.0.0" - hawk@~3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4" @@ -3258,7 +3195,7 @@ is-ssh@^1.3.0: dependencies: protocols "^1.1.0" -is-stream@^1.0.1, is-stream@^1.1.0: +is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -3496,12 +3433,6 @@ json5@^0.5.0, json5@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" -jsonfile@^2.1.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8" - optionalDependencies: - graceful-fs "^4.1.6" - jsonify@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" @@ -3572,17 +3503,6 @@ karma-mocha-reporter@^2.2.4: log-symbols "^2.0.0" strip-ansi "^4.0.0" -karma-phantomjs-launcher@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.4.tgz#d23ca34801bda9863ad318e3bb4bd4062b13acd2" - dependencies: - lodash "^4.0.1" - phantomjs-prebuilt "^2.1.7" - -karma-phantomjs-shim@^1.1.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/karma-phantomjs-shim/-/karma-phantomjs-shim-1.4.0.tgz#21072f436e07764a425fbbdc15175b537106e7ed" - karma-remap-coverage@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/karma-remap-coverage/-/karma-remap-coverage-0.1.4.tgz#29feff25aa159655cc347586bcf4a200591b3b28" @@ -3645,10 +3565,6 @@ karma@^1.7.1: tmp "0.0.31" useragent "^2.1.12" -kew@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b" - kind-of@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5" @@ -3667,12 +3583,6 @@ kind-of@^4.0.0: dependencies: is-buffer "^1.1.5" -klaw@^1.0.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439" - optionalDependencies: - graceful-fs "^4.1.9" - lazy-cache@^0.2.3: version "0.2.7" resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65" @@ -3900,7 +3810,7 @@ lodash@^3.8.0: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^4.0.0, lodash@^4.0.1, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.5.0, lodash@~4.17.4: +lodash@^4.0.0, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.5.0, lodash@~4.17.4: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -4159,12 +4069,6 @@ mixin-object@^2.0.1: for-in "^0.1.3" is-extendable "^0.1.1" -mkdirp@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12" - dependencies: - minimist "0.0.8" - mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" @@ -4753,10 +4657,6 @@ pbkdf2@^3.0.3: safe-buffer "^5.0.1" sha.js "^2.4.8" -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - perfect-scrollbar@^0.8.1: version "0.8.1" resolved "https://registry.yarnpkg.com/perfect-scrollbar/-/perfect-scrollbar-0.8.1.tgz#9cdcb50e72740b8da7e5a4a534f36c35f4e0a613" @@ -4765,34 +4665,6 @@ performance-now@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" -phantomjs-prebuilt@^2.1.15: - version "2.1.15" - resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.15.tgz#20f86e82d3349c505917527745b7a411e08b3903" - dependencies: - es6-promise "~4.0.3" - extract-zip "~1.6.5" - fs-extra "~1.0.0" - hasha "~2.2.0" - kew "~0.7.0" - progress "~1.1.8" - request "~2.81.0" - request-progress "~2.0.1" - which "~1.2.10" - -phantomjs-prebuilt@^2.1.7: - version "2.1.14" - resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.14.tgz#d53d311fcfb7d1d08ddb24014558f1188c516da0" - dependencies: - es6-promise "~4.0.3" - extract-zip "~1.5.0" - fs-extra "~1.0.0" - hasha "~2.2.0" - kew "~0.7.0" - progress "~1.1.8" - request "~2.79.0" - request-progress "~2.0.1" - which "~1.2.10" - pify@^2.0.0, pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -5095,10 +4967,6 @@ process@^0.11.0: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" -progress@~1.1.8: - version "1.1.8" - resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be" - promise@^7.1.1: version "7.3.1" resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" @@ -5283,7 +5151,7 @@ read-pkg@^2.0.0: normalize-package-data "^2.3.2" path-type "^2.0.0" -readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.2.9: +readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.6, readable-stream@^2.2.9: version "2.3.3" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" dependencies: @@ -5454,13 +5322,7 @@ replace-ext@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" -request-progress@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-2.0.1.tgz#5d36bb57961c673aa5b788dbc8141fdf23b44e08" - dependencies: - throttleit "^1.0.0" - -request@2, request@2.79.0, request@^2.72.0, request@^2.78.0, request@^2.79.0, request@~2.79.0: +request@2, request@2.79.0, request@^2.72.0, request@^2.78.0, request@^2.79.0: version "2.79.0" resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" dependencies: @@ -5485,7 +5347,7 @@ request@2, request@2.79.0, request@^2.72.0, request@^2.78.0, request@^2.79.0, re tunnel-agent "~0.4.1" uuid "^3.0.0" -request@^2.81.0, request@~2.81.0: +request@^2.81.0: version "2.81.0" resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" dependencies: @@ -6333,10 +6195,6 @@ text-extensions@^1.0.0: version "1.5.0" resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.5.0.tgz#d1cb2d14b5d0bc45bfdca8a08a473f68c7eb0cbc" -throttleit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" - through2@2.0.1, through2@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.1.tgz#384e75314d49f32de12eebb8136b8eb6b5d59da9" @@ -6536,7 +6394,7 @@ type-is@~1.6.15: media-typer "0.3.0" mime-types "~2.1.15" -typedarray@^0.0.6, typedarray@~0.0.5: +typedarray@~0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -6896,7 +6754,7 @@ which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" -which@1, which@^1.1.1, which@^1.2.1, which@^1.2.9, which@~1.2.10: +which@1, which@^1.1.1, which@^1.2.1, which@^1.2.9: version "1.2.14" resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5" dependencies: @@ -7132,12 +6990,6 @@ yargs@~3.10.0: decamelize "^1.0.0" window-size "0.1.0" -yauzl@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005" - dependencies: - fd-slicer "~1.0.1" - yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" From ec64c6c4ad0583b81656f580c188798e1822dc91 Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Thu, 21 Sep 2017 11:52:37 +0300 Subject: [PATCH 07/10] chore: remove unused .eslintignore --- .eslintignore | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .eslintignore diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index 02fbde32..00000000 --- a/.eslintignore +++ /dev/null @@ -1,5 +0,0 @@ -build/ -gulpfile.js -*.conf.js -*.config.js -demo/ From d8b6e022b7d293335dece6f932107c109e2350cf Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Thu, 21 Sep 2017 12:39:17 +0300 Subject: [PATCH 08/10] fix: HEAD http verb support closes #342 --- .../EndpointLink/endpoint-link.scss | 6 +- lib/components/Redoc/redoc.scss | 68 ++++++++++++------- lib/shared/styles/_variables.scss | 1 + 3 files changed, 49 insertions(+), 26 deletions(-) diff --git a/lib/components/EndpointLink/endpoint-link.scss b/lib/components/EndpointLink/endpoint-link.scss index c78bc197..c9ff1a2a 100644 --- a/lib/components/EndpointLink/endpoint-link.scss +++ b/lib/components/EndpointLink/endpoint-link.scss @@ -30,7 +30,7 @@ } .operation-api-url { - color: rgba($black, .8); + color: rgba($black, 0.8); &-path { font-family: $headers-font, $headers-font-family; position: relative; @@ -146,4 +146,8 @@ &.link { background-color: $link-color; } + + &.head { + background-color: $head-color; + } } diff --git a/lib/components/Redoc/redoc.scss b/lib/components/Redoc/redoc.scss index f0c1501f..59becb06 100644 --- a/lib/components/Redoc/redoc.scss +++ b/lib/components/Redoc/redoc.scss @@ -4,11 +4,11 @@ display: block; box-sizing: border-box; - -webkit-tap-highlight-color: rgba(0,0,0,0); - -moz-tap-highlight-color: rgba(0,0,0,0); - -ms-tap-highlight-color: rgba(0,0,0,0); - -o-tap-highlight-color: rgba(0,0,0,0); - tap-highlight-color: rgba(0,0,0,0); + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); + -moz-tap-highlight-color: rgba(0, 0, 0, 0); + -ms-tap-highlight-color: rgba(0, 0, 0, 0); + -o-tap-highlight-color: rgba(0, 0, 0, 0); + tap-highlight-color: rgba(0, 0, 0, 0); -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; font-smoothing: antialiased; @@ -18,10 +18,10 @@ -webkit-text-size-adjust: 100%; -moz-text-size-adjust: 100%; text-size-adjust: 100%; - -webkit-text-shadow: 1px 1px 1px rgba(0,0,0,0.004); - -ms-text-shadow: 1px 1px 1px rgba(0,0,0,0.004); - text-shadow: 1px 1px 1px rgba(0,0,0,0.004); - text-rendering: optimizeSpeed!important; + -webkit-text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.004); + -ms-text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.004); + text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.004); + text-rendering: optimizeSpeed !important; font-smooth: always; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; @@ -96,7 +96,6 @@ side-menu { } } - .redoc-error { padding: 20px; text-align: center; @@ -131,7 +130,7 @@ side-menu { background-color: #333; border-radius: 3px; vertical-align: top; - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAACgCAYAAADuDlcXAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpFNjQ5N0JDQUE3OTYxMUU0ODNGMUE0RUM3NjRDRTQyNyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpFNjQ5N0JDQkE3OTYxMUU0ODNGMUE0RUM3NjRDRTQyNyI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkU2NDk3QkM4QTc5NjExRTQ4M0YxQTRFQzc2NENFNDI3IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkU2NDk3QkM5QTc5NjExRTQ4M0YxQTRFQzc2NENFNDI3Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+mIrGwQAAAZ9JREFUeNrsmtuOwyAMRBmU//9lbx9208ayjQ1EarSDVFW56ARIGGZIIK/S3gWvX3X7LN3a6WxDHdPnnDBpcZHEOe3wrmLUMg2zatKykPOq1/5fK71tLIQR9jjYsaJfWdWAAcRsM2W1z9LNGcFkRlmtPhvpf7qmHAGEESZqLFr/qbHaCy4Is6oxLdvT+nWr0lLPCCPsFn+mA5e2UjLycL1o6qLMiapqRGoifVCDinrgU2mRyJthzZg3CSPs+2HhIM4YGq0a4oDgiGjYTKw20/OwUzAEuXz73YSqtdsV+F1a3eZpweFEGGG7Y3ULbJRk4nYPlEHbUi86wpNtbz4oB37PICOrLEdC9DKzFv7EkQ8tYY8Nr8tuyJrRsdpMrIJ0n4GPBmGEEUbYzRMKnFwug1B7rppmbCiyBjBrQ1vC8KW/CxrF7osNrRbxMjofWsIIuwU2vapnZfTRq4/wFXl3hG9bMzP6ZWV47LoB+Gym1/EyUleKI2GEPW8pQpu80bHLvsifSWFVAVEzo2VDTxxb9T16eO7sF0vmxPNPxPFHgAEA/rGUMXq/uWcAAAAASUVORK5CYII='); + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAACgCAMAAADZ0KclAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAZQTFRF////////VXz1bAAAAAJ0Uk5T/wDltzBKAAAA80lEQVR42uSWSwLCIAxEX+5/aa2QZBJw5UIt9QMdRqSPEAAw/TyvqzZf150NzdXL49qreXwXjeqz9bqN1tgJl/KLyaVrrL7K7gx+1vlNMqy+helOO4rfBGYZiEkq1ubQ3DeKvc97Et+d+e01vIZlLZZqb1WNJFd8ZKYsmv4Hh3H2fDgjMUI5WSExjiEZs7rEZ5T+/jQn9lhgsw53j/e9MQtxqPsbZY54M5fNl/MY/f1s7NbRSkYlYjc0KPsWMrmhIU9933ywxDiSE+upYNH8TdusUotllNvcAUzfnE/NC4OSYyklQhpdl9E4Tw0Cm4/G9xBgAO7VCkjWLOMfAAAAAElFTkSuQmCC'); background-repeat: no-repeat; background-position: 6px 4px; text-indent: -9000px; @@ -177,13 +176,18 @@ side-menu { background-position: 4px -131px; background-color: $link-color; } + + &.head { + background-position: 6px -102px; + background-color: $head-color; + } } } /* global redoc styles */ @for $index from 1 through 5 { - :host /deep/ h#{$index}{ + :host /deep/ h#{$index} { margin-top: 0; font-family: $headers-font, $headers-font-family; color: $secondary-color; @@ -194,11 +198,23 @@ side-menu { } :host /deep/ { - h1 { font-size: $h1; color: $headers-color; } - h2 { font-size: $h2; } - h3 { font-size: $h3; } - h4 { font-size: $h4; } - h5 { font-size: $h5; line-height: 20px; } + h1 { + font-size: $h1; + color: $headers-color; + } + h2 { + font-size: $h2; + } + h3 { + font-size: $h3; + } + h4 { + font-size: $h4; + } + h5 { + font-size: $h5; + line-height: 20px; + } p { font-family: $base-font, $base-font-family; @@ -215,7 +231,7 @@ side-menu { p > code { color: $red; - border: 1px solid rgba(38,50,56,0.1); + border: 1px solid rgba(38, 50, 56, 0.1); } .hint--inversed { @@ -247,7 +263,6 @@ footer { } } - /* markdown elements */ :host /deep/ .redoc-markdown-block { @@ -260,13 +275,14 @@ footer { overflow-x: auto; line-height: normal; border-radius: $border-radius; - border: 1px solid rgba(38,50,56,0.1); + border: 1px solid rgba(38, 50, 56, 0.1); code { background-color: transparent; color: white; - &:before, &:after { + &:before, + &:after { content: none; } } @@ -274,12 +290,12 @@ footer { code { font-family: Courier, monospace; - background-color: rgba(38,50,56,0.04); + background-color: rgba(38, 50, 56, 0.04); padding: 0.1em 0.2em 0.2em; font-size: 1em; border-radius: $border-radius; color: $red; - border: 1px solid rgba(38,50,56, 0.1); + border: 1px solid rgba(38, 50, 56, 0.1); } p:last-of-type { @@ -299,7 +315,8 @@ footer { box-sizing: content-box; } - ul, ol { + ul, + ol { padding-left: 2em; margin: 0; margin-bottom: 1em; @@ -332,7 +349,8 @@ footer { } } - table th, table td { + table th, + table td { padding: 6px 13px; border: 1px solid #ddd; } diff --git a/lib/shared/styles/_variables.scss b/lib/shared/styles/_variables.scss index b8a6ec74..67f49c18 100644 --- a/lib/shared/styles/_variables.scss +++ b/lib/shared/styles/_variables.scss @@ -77,6 +77,7 @@ $post-color: #248fb2; $put-color: #9b708b; $options-color: #d3ca12; $patch-color: #e09d43; +$head-color: #c167e4; $delete-color: #e27a7a; $basic-color: #999; $link-color: #31bbb6; From f2ed92c69ebf63f59af715ad42c1f693b5208175 Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Thu, 21 Sep 2017 18:03:31 +0300 Subject: [PATCH 09/10] feat: add native-scrollbars option to workaround scrolling perf issues --- README.md | 1 + lib/components/SideMenu/side-menu.scss | 1 + lib/services/options.service.ts | 6 ++- .../PerfectScrollbar/perfect-scrollbar.ts | 38 ++++++++++++------- 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 1b206b1b..7f353c9f 100644 --- a/README.md +++ b/README.md @@ -156,6 +156,7 @@ ReDoc makes use of the following [vendor extensions](http://swagger.io/specifica * `no-auto-auth` - do not inject Authentication section automatically * `path-in-middle-panel` - show path link and HTTP verb in the middle panel instead of the right one * `hide-loading` - do not show loading animation. Useful for small docs +* `native-scrollbars` - use native scrollbar for sidemenu instead of perfect-scroll (scrolling performance optimization for big specs) ## Advanced usage Instead of adding `spec-url` attribute to the `` element you can initialize ReDoc via globally exposed `Redoc` object: diff --git a/lib/components/SideMenu/side-menu.scss b/lib/components/SideMenu/side-menu.scss index 4cb52754..f213f419 100644 --- a/lib/components/SideMenu/side-menu.scss +++ b/lib/components/SideMenu/side-menu.scss @@ -9,6 +9,7 @@ $mobile-menu-compact-breakpoint: 550px; #resources-nav { position: relative; width: 100%; + overflow: scroll; } ul.menu-root { diff --git a/lib/services/options.service.ts b/lib/services/options.service.ts index ef2cc975..97d099d3 100644 --- a/lib/services/options.service.ts +++ b/lib/services/options.service.ts @@ -22,6 +22,7 @@ const OPTION_NAMES = new Set([ 'untrustedSpec', 'hideLoading', 'ignoredHeaderParameters', + 'nativeScrollbars', ]); export interface Options { @@ -40,6 +41,7 @@ export interface Options { hideLoading?: boolean; spec?: any; ignoredHeaderParameters?: string[]; + nativeScrollbars?: boolean; } @Injectable() @@ -79,7 +81,7 @@ export class OptionsService { this._normalizeOptions(); } - _normalizeOptions():void { + _normalizeOptions(): void { // modify scrollYOffset to always be a function if (!isFunction(this._options.scrollYOffset)) { if (isFinite(this._options.scrollYOffset)) { @@ -109,6 +111,8 @@ export class OptionsService { if (isString(this._options.pathInMiddlePanel)) this._options.pathInMiddlePanel = true; if (isString(this._options.untrustedSpec)) this._options.untrustedSpec = true; if (isString(this._options.hideLoading)) this._options.hideLoading = true; + if (isString(this._options.nativeScrollbars)) + this._options.nativeScrollbars = true; if (isString(this._options.expandResponses)) { let str = this._options.expandResponses as string; if (str === 'all') return; diff --git a/lib/shared/components/PerfectScrollbar/perfect-scrollbar.ts b/lib/shared/components/PerfectScrollbar/perfect-scrollbar.ts index 5ef6fc0d..7ceafb45 100644 --- a/lib/shared/components/PerfectScrollbar/perfect-scrollbar.ts +++ b/lib/shared/components/PerfectScrollbar/perfect-scrollbar.ts @@ -1,37 +1,49 @@ -'use strict'; - import 'perfect-scrollbar/dist/css/perfect-scrollbar.css'; -import { Directive, ElementRef, Input, OnInit, OnDestroy } from '@angular/core'; -import { BrowserDomAdapter as DOM } from '../../../utils/browser-adapter'; - +import { Directive, ElementRef, OnDestroy, OnInit } from '@angular/core'; import * as PS from 'perfect-scrollbar'; +import { OptionsService } from '../../../services/options.service'; + @Directive({ - selector: '[perfect-scrollbar]' + selector: '[perfect-scrollbar]', }) export class PerfectScrollbar implements OnInit, OnDestroy { $element: any; subscription: any; + enabled: boolean = true; - constructor(elementRef:ElementRef) { + constructor(elementRef: ElementRef, optionsService: OptionsService) { this.$element = elementRef.nativeElement; + this.enabled = !optionsService.options.nativeScrollbars; } update() { + if (!this.enabled) return; PS.update(this.$element); } ngOnInit() { - requestAnimationFrame(() => PS.initialize(this.$element, { - wheelSpeed: 2, - wheelPropagation: false, - minScrollbarLength: 20, - suppressScrollX: true - })); + if (!this.enabled) return; + requestAnimationFrame(() => + PS.initialize(this.$element, { + wheelSpeed: 2, + handlers: [ + 'click-rail', + 'drag-scrollbar', + 'keyboard', + 'wheel', + 'touch', + ], + wheelPropagation: true, + minScrollbarLength: 20, + suppressScrollX: true, + } as any), + ); } ngOnDestroy() { + if (!this.enabled) return; PS.destroy(this.$element); } } From 278e5d79177a5ee47dd90cd77af4c9d839c7cadb Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Thu, 21 Sep 2017 18:22:24 +0300 Subject: [PATCH 10/10] v1.19.0 --- CHANGELOG.md | 16 ++++++++++++++++ README.md | 1 + package.json | 11 +++++++---- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9900591..25b3c827 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ + +# [1.19.0](https://github.com/Rebilly/ReDoc/compare/v1.18.1...v1.19.0) (2017-09-21) + + +### Bug Fixes + +* Clearly label version compatibility ([8d849a6](https://github.com/Rebilly/ReDoc/commit/8d849a6)), closes [#338](https://github.com/Rebilly/ReDoc/issues/338) +* HEAD http verb support ([d8b6e02](https://github.com/Rebilly/ReDoc/commit/d8b6e02)), closes [#342](https://github.com/Rebilly/ReDoc/issues/342) + + +### Features + +* add ignoredHeaderParameters option ([56d62e5](https://github.com/Rebilly/ReDoc/commit/56d62e5)) +* add native-scrollbars option to workaround scrolling perf issues ([f2ed92c](https://github.com/Rebilly/ReDoc/commit/f2ed92c)) + + ## [1.18.1](https://github.com/Rebilly/ReDoc/compare/v1.17.0...v1.18.1) (2017-08-28) diff --git a/README.md b/README.md index 7f353c9f..e8ead823 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,7 @@ We host the latest and all the previous ReDoc releases on GitHub Pages-based **C ## Version Guidance | ReDoc Release | OpenAPI Specification | |:--------------|:----------------------| +| 1.19.x | 2.0 | | 1.18.x | 2.0 | | 1.17.x | 2.0 | diff --git a/package.json b/package.json index 9020bc85..b4cf0485 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "redoc", "description": "Swagger-generated API Reference Documentation", - "version": "1.18.1", + "version": "1.19.0", "repository": { "type": "git", "url": "git://github.com/Rebilly/ReDoc" @@ -14,7 +14,8 @@ "module": "dist/redoc.module.js", "types": "dist/redoc.module.d.ts", "scripts": { - "start": "webpack-dev-server --config build/webpack.dev.js --content-base demo", + "start": + "webpack-dev-server --config build/webpack.dev.js --content-base demo", "start:prod": "NODE_ENV=production npm start", "test": "npm run lint && node ./build/run_tests.js", "lint": "tslint -e \"lib/**/*{ngfactory|css.shim}.ts\" lib/**/*.ts", @@ -26,12 +27,14 @@ "e2e-server": "http-server -p 3000 tests/e2e", "e2e-copy": "cp dist/redoc.min.js tests/e2e/", "webdriver": "webdriver-manager update", - "deploy": "node ./build/prepare_deploy.js && deploy-to-gh-pages --update demo", + "deploy": + "node ./build/prepare_deploy.js && deploy-to-gh-pages --update demo", "branch-release": "git reset --hard && branch-release", "clean": "rimraf dist .tmp compiled lib/**/*.css", "ngc": "ngc -p tsconfig.json", "inline": "ng2-inline -o .tmp -r --compress \"lib/**/*.ts\"", - "build:module": "npm run build:sass && npm run inline && ngc -p tsconfig.aot.json && npm run module:css", + "build:module": + "npm run build:sass && npm run inline && ngc -p tsconfig.aot.json && npm run module:css", "module:css": "node build/join-module-css.js", "webpack:prod": "webpack --config build/webpack.prod.js --profile --bail", "build:sass": "node-sass -q -o lib lib",