Update angular2 to rc.5 and its router to rc.1.

Closes #70.
This commit is contained in:
József Farkas
2016-08-10 18:29:59 +02:00
parent 23b5dab284
commit baf55077ce
5 changed files with 48 additions and 21 deletions

View File

@@ -16,6 +16,7 @@
"npm-run-all": "^2.3.0",
"raw-loader": "^0.5.1",
"sass-loader": "^4.0.0",
"string-replace-loader": "^1.0.3",
"stylelint": "^7.0.3",
"ts-loader": "^0.8.2",
"tslint": "^3.14.0",
@@ -27,12 +28,12 @@
"yargs": "^4.8.1"
},
"dependencies": {
"@angular/common": "2.0.0-rc.4",
"@angular/compiler": "2.0.0-rc.4",
"@angular/core": "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.2",
"@angular/common": "2.0.0-rc.5",
"@angular/compiler": "2.0.0-rc.5",
"@angular/core": "2.0.0-rc.5",
"@angular/platform-browser": "2.0.0-rc.5",
"@angular/platform-browser-dynamic": "2.0.0-rc.5",
"@angular/router": "^3.0.0-rc.1",
"bootstrap": "^3.3.7",
"browser-stdout": "^1.3.0",
"es6-shim": "^0.35.1",

26
src/app.module.ts Normal file
View File

@@ -0,0 +1,26 @@
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { LocationStrategy, HashLocationStrategy } from '@angular/common';
import { APP_ROUTER_PROVIDERS } from './main-app.routes';
import { DataProviderService } from './services/data-provider.service';
import { MapperService } from './services/mapper.service';
import { MainAppComponent } from './main-app.component';
import { KeymapComponent } from './components/keymap/keymap.component';
import { MacroComponent } from './components/macro/macro.component';
import { LegacyLoaderComponent } from './components/legacy/legacy-loader.component';
@NgModule({
declarations: [MainAppComponent, KeymapComponent, MacroComponent, LegacyLoaderComponent],
imports: [BrowserModule],
providers: [
DataProviderService,
MapperService,
APP_ROUTER_PROVIDERS,
{ provide: LocationStrategy, useClass: HashLocationStrategy }
],
bootstrap: [MainAppComponent]
})
export class AppModule { }

View File

@@ -1,17 +1,6 @@
import { bootstrap } from '@angular/platform-browser-dynamic';
import { MainAppComponent } from './main-app.component';
import { DataProviderService } from './services/data-provider.service';
import { MapperService } from './services/mapper.service';
import { APP_ROUTER_PROVIDERS } from './main-app.routes';
import { LocationStrategy, HashLocationStrategy } from '@angular/common';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { AppModule } from './app.module';
process.stdout = require('browser-stdout')();
bootstrap(MainAppComponent, [
DataProviderService,
MapperService,
APP_ROUTER_PROVIDERS,
{ provide: LocationStrategy, useClass: HashLocationStrategy }
]).catch(err => console.error(err));
platformBrowserDynamic().bootstrapModule(AppModule);

View File

@@ -47,7 +47,7 @@
<mouse-tab #tab *ngSwitchCase="TabName.Mouse" class="popover-content" [defaultKeyAction]="defaultKeyAction"></mouse-tab>
<macro-tab #tab *ngSwitchCase="TabName.Macro" class="popover-content" [defaultKeyAction]="defaultKeyAction"></macro-tab>
<keymap-tab #tab *ngSwitchCase="TabName.Keymap" class="popover-content" [defaultKeyAction]="defaultKeyAction"></keymap-tab>
<none-tab #tab *ngSwitchCase="TabName.None" class="popover-content" [defaultKeyAction]="defaultKeyAction"></none-tab>
<none-tab #tab *ngSwitchCase="TabName.None" class="popover-content"></none-tab>
</div>
<div class="row">
<div class="popover-action">

View File

@@ -20,6 +20,17 @@ module.exports = {
]
},
module: {
preLoaders: [
{
test: /(.js|.ts)$/,
loader: 'string-replace-loader',
query: {
search: 'moduleId: module.id,',
replace: '',
flags: 'g'
}
}
],
loaders: [
{ test: /\.ts$/, loader: 'ts-loader', exclude: /node_modules/ },
{ test: /\.html$/, loader: 'html-loader' },