From 99cf070520472261d7dff2ba8315e88f5447e880 Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Thu, 16 Jun 2016 00:33:06 +0300 Subject: [PATCH] remove es6 overrides from angular deps --- karma.conf.js | 4 ++-- package.json | 23 +---------------------- system.config.js | 13 +++++++++---- 3 files changed, 12 insertions(+), 28 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 5c5ce117..a3a61e34 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -65,13 +65,13 @@ module.exports = function (config) { }, proxies: { + '/.tmp/': '/base/.tmp/', '/tests/schemas': '/base/tests/schemas', '/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/': '/base/lib/', '/jspm_packages/': '/base/jspm_packages/', - '/node_modules/': '/base/node_modules/', - '/.tmp/': '/base/.tmp/' + '/node_modules/': '/base/node_modules/' }, reporters: travis ? ['mocha', 'coverage', 'coveralls'] : ['mocha', 'coverage'], diff --git a/package.json b/package.json index fcacb86a..dea001a5 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,6 @@ "@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-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", "es6-shim": "github:es-shims/es6-shim@^0.33.6", "hint.css": "npm:hint.css@^2.2.1", @@ -62,26 +61,6 @@ "systemjs/plugin-json": "github:systemjs/plugin-json@^0.1.0" }, "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": { "main": "src/openapi-sampler", "format": "esm" @@ -131,7 +110,7 @@ "karma-coverage": "github:douglasduteil/karma-coverage#next", "karma-coveralls": "^1.1.2", "karma-jasmine": "^0.3.6", - "karma-jspm": "^2.0.2", + "karma-jspm": "^2.1.1", "karma-mocha-reporter": "^2.0.0", "karma-phantomjs-launcher": "^1.0.0", "karma-phantomjs-shim": "^1.1.2", diff --git a/system.config.js b/system.config.js index d73a633d..08dbb169 100644 --- a/system.config.js +++ b/system.config.js @@ -138,12 +138,15 @@ System.config({ "browserify-zlib": "npm:browserify-zlib@0.1.4" }, "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": { - "@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": { + "process": "github:jspm/nodelibs-process@0.1.2", "rxjs": "npm:rxjs@5.0.0-beta.6", "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/compiler": "npm:@angular/compiler@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": { "@angular/common": "npm:@angular/common@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": { "fs": "github:jspm/nodelibs-fs@0.1.2",