From 453f56f91f158dfdd60703a9a3a6426ab4b3769f Mon Sep 17 00:00:00 2001 From: richbl Date: Mon, 15 Aug 2016 12:31:51 -0700 Subject: [PATCH] Updated against new base project (angular 2-quickstart) --- index.html | 15 +++++++------- package.json | 43 +++++++++++++++++++++++----------------- systemjs.config.js | 49 ++++++++++++++++++++++++++++++++++++++++++++++ tsconfig.json | 9 ++++----- typings.json | 6 ++++-- 5 files changed, 90 insertions(+), 32 deletions(-) create mode 100644 systemjs.config.js diff --git a/index.html b/index.html index 7f7d1f1..cb55521 100644 --- a/index.html +++ b/index.html @@ -7,14 +7,11 @@ - - - + - - - + + @@ -22,6 +19,10 @@ + + diff --git a/package.json b/package.json index 0b59fcb..d7a38bb 100644 --- a/package.json +++ b/package.json @@ -2,32 +2,39 @@ "name": "ng2-bootstrap-visualizejs", "version": "1.0.0", "scripts": { - "postinstall": " ./node_modules/.bin/typings install", + "start": "tsc && concurrently \"npm run tsc:w\" \"npm run lite\" ", + "lite": "lite-server", + "postinstall": "typings install", "tsc": "tsc", "tsc:w": "tsc -w", - "lite": "lite-server", - "start": "concurrently \"npm run tsc:w\" \"npm run lite\" " + "typings": "typings" }, "license": "ISC", "dependencies": { - "@angular/common": "^2.0.0-rc.1", - "@angular/compiler": "^2.0.0-rc.1", - "@angular/core": "^2.0.0-rc.1", - "@angular/platform-browser": "^2.0.0-rc.2", - "@angular/platform-browser-dynamic": "^2.0.0-rc.1", - "@angular/router-deprecated": "^2.0.0-rc.1", + "@angular/common": "2.0.0-rc.4", + "@angular/compiler": "2.0.0-rc.4", + "@angular/core": "2.0.0-rc.4", + "@angular/forms": "0.2.0", + "@angular/http": "2.0.0-rc.4", + "@angular/platform-browser": "2.0.0-rc.4", + "@angular/platform-browser-dynamic": "2.0.0-rc.4", + "@angular/router": "3.0.0-beta.1", + "@angular/router-deprecated": "2.0.0-rc.2", + "@angular/upgrade": "2.0.0-rc.4", + + "angular2-in-memory-web-api": "0.0.14", "bootstrap": "^3.3.6", - "es6-shim": "0.35.0", - "ng2-bootstrap": "^1.0.17", - "reflect-metadata": "0.1.2", + "core-js": "^2.4.0", + "ng2-bootstrap": "1.0.23", + "reflect-metadata": "^0.1.3", "rxjs": "5.0.0-beta.6", - "systemjs": "0.19.29", - "typings": "0.8.1", - "zone.js": "0.6.12" + "systemjs": "0.19.27", + "zone.js": "^0.6.12" }, "devDependencies": { - "concurrently": "2.0.0", - "lite-server": "2.2.0", - "typescript": "1.8.10" + "concurrently": "^2.0.0", + "lite-server": "^2.2.0", + "typescript": "^1.8.10", + "typings": "^1.0.4" } } diff --git a/systemjs.config.js b/systemjs.config.js new file mode 100644 index 0000000..c92df71 --- /dev/null +++ b/systemjs.config.js @@ -0,0 +1,49 @@ +/** + * System configuration for Angular 2 samples + * Adjust as necessary for your application needs. + */ +(function(global) { + // map tells the System loader where to look for things + var map = { + 'moment': 'node_modules/moment/moment.js', + 'app': 'app', + '@angular': 'node_modules/@angular', + 'angular2-in-memory-web-api': 'node_modules/angular2-in-memory-web-api', + 'rxjs': 'node_modules/rxjs' + }; + // packages tells the System loader how to load when no filename and/or no extension + var packages = { + 'app': { main: 'boot.js', defaultExtension: 'js' }, + 'rxjs': { defaultExtension: 'js' }, + 'angular2-in-memory-web-api': { main: 'index.js', defaultExtension: 'js' }, + }; + var ngPackageNames = [ + 'common', + 'compiler', + 'core', + 'forms', + 'http', + 'platform-browser', + 'platform-browser-dynamic', + 'router', + 'router-deprecated', + 'upgrade', + ]; + // Individual files (~300 requests): + function packIndex(pkgName) { + packages['@angular/'+pkgName] = { main: 'index.js', defaultExtension: 'js' }; + } + // Bundled (~40 requests): + function packUmd(pkgName) { + packages['@angular/'+pkgName] = { main: '/bundles/' + pkgName + '.umd.js', defaultExtension: 'js' }; + } + // Most environments should use UMD; some (Karma) need the individual index files + var setPackageConfig = System.packageWithIndex ? packIndex : packUmd; + // Add package entries for angular packages + ngPackageNames.forEach(setPackageConfig); + var config = { + map: map, + packages: packages + }; + System.config(config); +})(this); diff --git a/tsconfig.json b/tsconfig.json index 412a40b..d37b5a6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,17 +1,16 @@ { "compilerOptions": { - "target": "ES5", - "module": "system", + "target": "es5", + "module": "commonjs", "moduleResolution": "node", "sourceMap": true, "emitDecoratorMetadata": true, "experimentalDecorators": true, "removeComments": false, - "noImplicitAny": false, - "listFiles": true + "noImplicitAny": false }, "exclude": [ "node_modules", "typings/browser.d.ts" ] -} \ No newline at end of file +} diff --git a/typings.json b/typings.json index 2987eb3..3385926 100644 --- a/typings.json +++ b/typings.json @@ -1,5 +1,7 @@ { - "ambientDependencies": { - "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654" + "globalDependencies": { + "core-js": "registry:dt/core-js#0.0.0+20160602141332", + "jasmine": "registry:dt/jasmine#2.2.0+20160621224255", + "node": "registry:dt/node#6.0.0+20160621231320" } }