mirror of
https://github.com/OpenLiberty/liberty-bikes.git
synced 2025-02-11 11:00:16 +08:00
Merge pull request #225 from realModusOperandi/angular8
Update some dependencies
This commit is contained in:
Liam Westby
GitHub
commit
3fedf015c1
@ -1,18 +1,22 @@
|
||||
apply plugin: 'com.moowork.node'
|
||||
// apply plugin: 'com.moowork.node'
|
||||
|
||||
buildscript {
|
||||
ext {
|
||||
gradleNodeVersion = '1.2.0'
|
||||
}
|
||||
// buildscript {
|
||||
// ext {
|
||||
// gradleNodeVersion = '1.2.0'
|
||||
// }
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { url 'https://plugins.gradle.org/m2' }
|
||||
}
|
||||
// repositories {
|
||||
// mavenCentral()
|
||||
// maven { url 'https://plugins.gradle.org/m2' }
|
||||
// }
|
||||
|
||||
dependencies {
|
||||
classpath "com.moowork.gradle:gradle-node-plugin:$gradleNodeVersion"
|
||||
}
|
||||
// dependencies {
|
||||
// classpath "com.moowork.gradle:gradle-node-plugin:$gradleNodeVersion"
|
||||
// }
|
||||
// }
|
||||
|
||||
plugins {
|
||||
id 'com.moowork.node' version '1.3.1'
|
||||
}
|
||||
|
||||
ext {
|
||||
@ -28,7 +32,7 @@ war {
|
||||
}
|
||||
|
||||
node {
|
||||
version = '10.15.3'
|
||||
version = '10.16.3'
|
||||
npmVersion = '6.9.0'
|
||||
download = true
|
||||
workDir = file("${rootDir}/frontend/prebuild/node")
|
||||
|
||||
12
frontend/prebuild/browserslist
Normal file
12
frontend/prebuild/browserslist
Normal file
@ -0,0 +1,12 @@
|
||||
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
|
||||
# For additional information regarding the format and rule options, please see:
|
||||
# https://github.com/browserslist/browserslist#queries
|
||||
|
||||
# You can see what browsers were selected by your queries by running:
|
||||
# npx browserslist
|
||||
|
||||
> 0.5%
|
||||
last 2 versions
|
||||
Firefox ESR
|
||||
not dead
|
||||
not IE 9-11 # For IE 9-11 support, remove 'not'.
|
||||
4668
frontend/prebuild/package-lock.json
generated
4668
frontend/prebuild/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -13,38 +13,36 @@
|
||||
},
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@angular/animations": "^7.2.15",
|
||||
"@angular/common": "^7.2.15",
|
||||
"@angular/compiler": "^7.2.15",
|
||||
"@angular/core": "^7.2.15",
|
||||
"@angular/forms": "^7.2.15",
|
||||
"@angular/http": "^7.2.15",
|
||||
"@angular/platform-browser": "^7.2.15",
|
||||
"@angular/platform-browser-dynamic": "^7.2.15",
|
||||
"@angular/router": "^7.2.15",
|
||||
"@ng-bootstrap/ng-bootstrap": "^2.0.0",
|
||||
"angular-in-memory-web-api": "^0.6.0",
|
||||
"@angular/animations": "^8.2.7",
|
||||
"@angular/common": "^8.2.7",
|
||||
"@angular/compiler": "^8.2.7",
|
||||
"@angular/core": "^8.2.7",
|
||||
"@angular/forms": "^8.2.7",
|
||||
"@angular/platform-browser": "^8.2.7",
|
||||
"@angular/platform-browser-dynamic": "^8.2.7",
|
||||
"@angular/router": "^8.2.7",
|
||||
"@ng-bootstrap/ng-bootstrap": "^5.1.1",
|
||||
"autoprefixer": "^7.2.6",
|
||||
"bootstrap": "^4.3.1",
|
||||
"core-js": "^2.5.6",
|
||||
"createjs-module": "^0.8.3",
|
||||
"ng-event-source": "^1.0.10",
|
||||
"node-sass": "^4.9.3",
|
||||
"rxjs": "^6.5.2",
|
||||
"rxjs": "^6.5.3",
|
||||
"rxjs-compat": "^6.2.0",
|
||||
"tslib": "^1.9.0",
|
||||
"web-animations-js": "^2.3.1",
|
||||
"zone.js": "^0.8.29"
|
||||
"web-animations-js": "^2.3.2",
|
||||
"zone.js": "~0.9.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular-devkit/build-angular": "~0.13.0",
|
||||
"@angular/cli": "~7.3.9",
|
||||
"@angular/compiler-cli": "^7.2.15",
|
||||
"@angular/language-service": "^7.2.15",
|
||||
"@angular-devkit/build-angular": "~0.803.4",
|
||||
"@angular/cli": "~8.3.4",
|
||||
"@angular/compiler-cli": "^8.2.7",
|
||||
"@angular/language-service": "^8.2.7",
|
||||
"@types/jasmine": "^2.8.8",
|
||||
"@types/jasminewd2": "~2.0.3",
|
||||
"@types/node": "^8.9.4",
|
||||
"codelyzer": "^4.3.0",
|
||||
"codelyzer": "^5.0.1",
|
||||
"jasmine-core": "~2.99.1",
|
||||
"jasmine-spec-reporter": "~4.2.1",
|
||||
"karma": "^4.1.0",
|
||||
@ -56,6 +54,6 @@
|
||||
"protractor": "~5.4.0",
|
||||
"ts-node": "~7.0.0",
|
||||
"tslint": "~5.11.0",
|
||||
"typescript": "~3.2.4"
|
||||
"typescript": "~3.5.3"
|
||||
}
|
||||
}
|
||||
|
||||
@ -23,7 +23,7 @@ import { SliderComponent } from './slider/slider.component';
|
||||
BrowserAnimationsModule,
|
||||
FormsModule,
|
||||
AppRoutingModule,
|
||||
NgbModule.forRoot(),
|
||||
NgbModule,
|
||||
HttpClientModule
|
||||
],
|
||||
declarations: [
|
||||
|
||||
@ -15,17 +15,28 @@ export class PlayerListComponent implements OnInit {
|
||||
playersService.messages.subscribe((msg) => {
|
||||
const json = msg as any;
|
||||
if (json.playerlist) {
|
||||
const newPlayers = new Array();
|
||||
// console.log(`Got playerlist ${JSON.stringify(json.playerlist)}`);
|
||||
for (let player of json.playerlist) {
|
||||
const newPlayer = new Player();
|
||||
newPlayer.name = player.name;
|
||||
newPlayer.status = player.status;
|
||||
newPlayer.color = player.color;
|
||||
newPlayers.push(newPlayer);
|
||||
}
|
||||
this.ngZone.run(() => {
|
||||
this.players = newPlayers;
|
||||
json.playerlist.forEach((player, i) => {
|
||||
if (this.players.length > i) {
|
||||
// Player already exists, compare
|
||||
if (this.players[i].name !== player.name) {
|
||||
this.players[i].name = player.name;
|
||||
}
|
||||
|
||||
if (this.players[i].status !== player.status) {
|
||||
this.players[i].status = player.status;
|
||||
}
|
||||
|
||||
if (this.players[i].color !== player.color) {
|
||||
this.players[i].color = player.color;
|
||||
}
|
||||
} else {
|
||||
const newPlayer = new Player();
|
||||
newPlayer.name = player.name;
|
||||
newPlayer.status = player.status;
|
||||
newPlayer.color = player.color;
|
||||
this.players.push(newPlayer);
|
||||
}
|
||||
});
|
||||
}
|
||||
}, (err) => {
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
"compilerOptions": {
|
||||
"outDir": "../out-tsc/app",
|
||||
"baseUrl": "./",
|
||||
"module": "es2015",
|
||||
"types": []
|
||||
},
|
||||
"exclude": [
|
||||
|
||||
@ -3,8 +3,6 @@
|
||||
"compilerOptions": {
|
||||
"outDir": "../out-tsc/spec",
|
||||
"baseUrl": "./",
|
||||
"module": "commonjs",
|
||||
"target": "es5",
|
||||
"types": [
|
||||
"jasmine",
|
||||
"node"
|
||||
|
||||
@ -1,14 +1,16 @@
|
||||
{
|
||||
"compileOnSave": false,
|
||||
"compilerOptions": {
|
||||
"downlevelIteration": true,
|
||||
"importHelpers": true,
|
||||
"module": "esnext",
|
||||
"outDir": "./dist/out-tsc",
|
||||
"sourceMap": true,
|
||||
"declaration": false,
|
||||
"moduleResolution": "node",
|
||||
"emitDecoratorMetadata": true,
|
||||
"experimentalDecorators": true,
|
||||
"target": "es5",
|
||||
"target": "es2015",
|
||||
"typeRoots": [
|
||||
"node_modules/@types"
|
||||
],
|
||||
|
||||
@ -128,12 +128,12 @@
|
||||
"kebab-case"
|
||||
],
|
||||
"no-output-on-prefix": true,
|
||||
"use-input-property-decorator": true,
|
||||
"use-output-property-decorator": true,
|
||||
"use-host-property-decorator": true,
|
||||
"no-inputs-metadata-property": true,
|
||||
"no-outputs-metadata-property": true,
|
||||
"no-host-metadata-property": true,
|
||||
"no-input-rename": true,
|
||||
"no-output-rename": true,
|
||||
"use-life-cycle-interface": true,
|
||||
"use-lifecycle-interface": true,
|
||||
"use-pipe-transform-interface": true,
|
||||
"component-class-suffix": true,
|
||||
"directive-class-suffix": true
|
||||
|
||||
Loading…
Reference in New Issue
Block a user