Redocly/redoc
1
1
Fork 0
mirror of https://github.com/Redocly/redoc.git synced 2025-07-10 16:22:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove es6 overrides from angular deps

Browse Source
This commit is contained in:
Roman Hotsiy 2016-06-16 00:33:06 +03:00
parent 81701d3cb5
commit 99cf070520
3 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
karma.conf.js
View File

@ -65,13 +65,13 @@ module.exports = function (config) {
}, },
proxies: { proxies: {
'/.tmp/': '/base/.tmp/',
'/tests/schemas': '/base/tests/schemas', '/tests/schemas': '/base/tests/schemas',
'/lib/components/redoc/redoc-initial-styles.scss': '/base/.tmp/lib/components/Redoc/redoc-initial-styles.scss', '/lib/components/redoc/redoc-initial-styles.scss': '/base/.tmp/lib/components/Redoc/redoc-initial-styles.scss',
'/lib/version.json': '/base/.tmp/lib/version.json', '/lib/version.json': '/base/.tmp/lib/version.json',
'/lib/': '/base/lib/', '/lib/': '/base/lib/',
'/jspm_packages/': '/base/jspm_packages/', '/jspm_packages/': '/base/jspm_packages/',
'/node_modules/': '/base/node_modules/', '/node_modules/': '/base/node_modules/'
'/.tmp/': '/base/.tmp/'
}, },
reporters: travis ? ['mocha', 'coverage', 'coveralls'] : ['mocha', 'coverage'], reporters: travis ? ['mocha', 'coverage', 'coveralls'] : ['mocha', 'coverage'],

23
package.json
View File

@ -37,7 +37,6 @@
"@angular/core": "npm:@angular/core@^2.0.0-rc.1", "@angular/core": "npm:@angular/core@^2.0.0-rc.1",
"@angular/platform-browser": "npm:@angular/platform-browser@^2.0.0-rc.1", "@angular/platform-browser": "npm:@angular/platform-browser@^2.0.0-rc.1",
"@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@^2.0.0-rc.1", "@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@^2.0.0-rc.1",
"Robdel12/DropKick": "github:Robdel12/DropKick@^2.1.7",
"dropkickjs": "npm:dropkickjs@^2.1.8", "dropkickjs": "npm:dropkickjs@^2.1.8",
"es6-shim": "github:es-shims/es6-shim@^0.33.6", "es6-shim": "github:es-shims/es6-shim@^0.33.6",
"hint.css": "npm:hint.css@^2.2.1", "hint.css": "npm:hint.css@^2.2.1",
@ -62,26 +61,6 @@
"systemjs/plugin-json": "github:systemjs/plugin-json@^0.1.0" "systemjs/plugin-json": "github:systemjs/plugin-json@^0.1.0"
}, },
"overrides": { "overrides": {
"npm:@angular/core@2.0.0-rc.1": {
"main": "esm/index.js",
"format": "esm"
},
"npm:@angular/common@2.0.0-rc.1": {
"main": "esm/index.js",
"format": "esm"
},
"npm:@angular/compiler@2.0.0-rc.1": {
"main": "esm/index.js",
"format": "esm"
},
"npm:@angular/platform-browser-dynamic@2.0.0-rc.1": {
"main": "esm/index.js",
"format": "esm"
},
"npm:@angular/platform-browser@2.0.0-rc.1": {
"main": "esm/index.js",
"format": "esm"
},
"npm:openapi-sampler@0.1.2": { "npm:openapi-sampler@0.1.2": {
"main": "src/openapi-sampler", "main": "src/openapi-sampler",
"format": "esm" "format": "esm"
@ -131,7 +110,7 @@
"karma-coverage": "github:douglasduteil/karma-coverage#next", "karma-coverage": "github:douglasduteil/karma-coverage#next",
"karma-coveralls": "^1.1.2", "karma-coveralls": "^1.1.2",
"karma-jasmine": "^0.3.6", "karma-jasmine": "^0.3.6",
"karma-jspm": "^2.0.2", "karma-jspm": "^2.1.1",
"karma-mocha-reporter": "^2.0.0", "karma-mocha-reporter": "^2.0.0",
"karma-phantomjs-launcher": "^1.0.0", "karma-phantomjs-launcher": "^1.0.0",
"karma-phantomjs-shim": "^1.1.2", "karma-phantomjs-shim": "^1.1.2",

13
system.config.js
View File

@ -138,12 +138,15 @@ System.config({
"browserify-zlib": "npm:browserify-zlib@0.1.4" "browserify-zlib": "npm:browserify-zlib@0.1.4"
}, },
"npm:@angular/common@2.0.0-rc.1": { "npm:@angular/common@2.0.0-rc.1": {
"@angular/core": "npm:@angular/core@2.0.0-rc.1" "@angular/core": "npm:@angular/core@2.0.0-rc.1",
"process": "github:jspm/nodelibs-process@0.1.2"
}, },
"npm:@angular/compiler@2.0.0-rc.1": { "npm:@angular/compiler@2.0.0-rc.1": {
"@angular/core": "npm:@angular/core@2.0.0-rc.1" "@angular/core": "npm:@angular/core@2.0.0-rc.1",
"process": "github:jspm/nodelibs-process@0.1.2"
}, },
"npm:@angular/core@2.0.0-rc.1": { "npm:@angular/core@2.0.0-rc.1": {
"process": "github:jspm/nodelibs-process@0.1.2",
"rxjs": "npm:rxjs@5.0.0-beta.6", "rxjs": "npm:rxjs@5.0.0-beta.6",
"zone.js": "npm:zone.js@0.6.12" "zone.js": "npm:zone.js@0.6.12"
}, },
@ -151,12 +154,14 @@ System.config({
"@angular/common": "npm:@angular/common@2.0.0-rc.1", "@angular/common": "npm:@angular/common@2.0.0-rc.1",
"@angular/compiler": "npm:@angular/compiler@2.0.0-rc.1", "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.1",
"@angular/core": "npm:@angular/core@2.0.0-rc.1", "@angular/core": "npm:@angular/core@2.0.0-rc.1",
"@angular/platform-browser": "npm:@angular/platform-browser@2.0.0-rc.1" "@angular/platform-browser": "npm:@angular/platform-browser@2.0.0-rc.1",
"process": "github:jspm/nodelibs-process@0.1.2"
}, },
"npm:@angular/platform-browser@2.0.0-rc.1": { "npm:@angular/platform-browser@2.0.0-rc.1": {
"@angular/common": "npm:@angular/common@2.0.0-rc.1", "@angular/common": "npm:@angular/common@2.0.0-rc.1",
"@angular/compiler": "npm:@angular/compiler@2.0.0-rc.1", "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.1",
"@angular/core": "npm:@angular/core@2.0.0-rc.1" "@angular/core": "npm:@angular/core@2.0.0-rc.1",
"process": "github:jspm/nodelibs-process@0.1.2"
}, },
"npm:amdefine@1.0.0": { "npm:amdefine@1.0.0": {
"fs": "github:jspm/nodelibs-fs@0.1.2", "fs": "github:jspm/nodelibs-fs@0.1.2",