Skip to content

Commit

Permalink
Merge branch 'release/6.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
dweber019 committed Jun 25, 2017
2 parents 69274ac + cc5f2ac commit 9dc3848
Show file tree
Hide file tree
Showing 21 changed files with 634 additions and 4,809 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: node_js
node_js:
- "6.9.1"
install:
- npm run install:dev
- npm install
script:
- npm test
- npm start -- build
Expand Down
66 changes: 33 additions & 33 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aurelia-typescript-boilerplate",
"version": "5.0.1",
"version": "6.0.0",
"title": "Aurelia Typescript Boilerplate",
"description": "A starter kit for building a standard navigation-style app with Aurelia and Webpack.",
"main": "dist/app.bundle.js",
Expand Down Expand Up @@ -35,9 +35,7 @@
},
"scripts": {
"start": "nps",
"test": "nps test",
"install:dev": "npm i && npm run install:typings",
"install:typings": "./node_modules/.bin/typings i"
"test": "nps test"
},
"jest": {
"modulePaths": [
Expand Down Expand Up @@ -77,10 +75,13 @@
"mapCoverage": true
},
"devDependencies": {
"@types/jest": "^19.2.3",
"@types/lodash": "^4.14.64",
"@types/node": "^7.0.21",
"@types/webpack": "^2.2.15",
"@types/cordova": "^0.0.34",
"@types/i18next-browser-languagedetector": "^0.0.31",
"@types/jest": "^20.0.2",
"@types/jquery": "^2.0.46",
"@types/lodash": "^4.14.66",
"@types/node": "^8.0.2",
"@types/webpack": "^3.0.0",
"aurelia-loader-nodejs": "^1.0.1",
"aurelia-pal-nodejs": "1.0.0-beta.1.0.0",
"aurelia-protractor-plugin": "^1.0.3",
Expand All @@ -89,51 +90,50 @@
"aurelia-webpack-plugin": "^2.0.0-rc.2",
"autoprefixer": "^7.1.1",
"awesome-typescript-loader": "^3.1.3",
"case-sensitive-paths-webpack-plugin": "^2.0.0",
"case-sensitive-paths-webpack-plugin": "^2.1.1",
"chalk": "^1.1.3",
"compression-webpack-plugin": "^0.4.0",
"copy-webpack-plugin": "^4.0.1",
"cordova": "^7.0.1",
"cross-env": "^5.0.0",
"css-loader": "^0.28.1",
"cross-env": "^5.0.1",
"css-loader": "^0.28.4",
"expose-loader": "^0.7.3",
"extract-text-webpack-plugin": "^2.1.0",
"extract-text-webpack-plugin": "^2.1.2",
"favicons-webpack-plugin": "^0.0.7",
"file-loader": "^0.11.1",
"html-webpack-plugin": "^2.28.0",
"file-loader": "^0.11.2",
"html-webpack-plugin": "^2.29.0",
"http-server": "^0.10.0",
"img-loader": "^2.0.0",
"istanbul-instrumenter-loader": "^2.0.0",
"jasmine-core": "^2.6.2",
"jest": "^20.0.3",
"jest-cli": "^20.0.3",
"jasmine-core": "^2.6.4",
"jest": "^20.0.4",
"jest-cli": "^20.0.4",
"json-loader": "^0.5.4",
"karma": "^1.7.0",
"karma-chrome-launcher": "^2.1.1",
"karma-coverage-istanbul-reporter": "^1.2.1",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage-istanbul-reporter": "^1.3.0",
"karma-jasmine": "^1.1.0",
"karma-mocha-reporter": "^2.2.3",
"karma-webpack": "^2.0.3",
"loader-utils": "^1.1.0",
"ncp": "^2.0.0",
"node-sass": "^4.5.3",
"nps": "^5.2.0",
"nps": "^5.3.2",
"nps-utils": "^1.2.0",
"postcss-loader": "^2.0.5",
"postcss-loader": "^2.0.6",
"protractor": "^5.1.2",
"sass-loader": "^6.0.5",
"style-loader": "^0.17.0",
"ts-jest": "^20.0.4",
"ts-node": "^3.0.4",
"sass-loader": "^6.0.6",
"style-loader": "^0.18.2",
"ts-jest": "^20.0.6",
"ts-node": "^3.1.0",
"tslib": "^1.7.1",
"tslint": "^5.2.0",
"tslint": "^5.4.3",
"tslint-loader": "^3.5.3",
"typescript": "^2.3.2",
"typings": "^2.1.1",
"url-loader": "^0.5.8",
"typescript": "^2.3.4",
"url-loader": "^0.5.9",
"wait-on": "^2.0.2",
"webpack": "^2.5.1",
"webpack-dev-server": "^2.4.5",
"webpack": "^3.0.0",
"webpack-dev-server": "^2.5.0",
"webpack-notifier": "^1.5.0"
},
"dependencies": {
Expand All @@ -144,7 +144,7 @@
"aurelia-fetch-client": "^1.1.2",
"aurelia-framework": "^1.1.2",
"aurelia-history-browser": "^1.0.0",
"aurelia-i18n": "^1.6.0",
"aurelia-i18n": "^1.6.1",
"aurelia-loader-webpack": "^2.1.0",
"aurelia-logging-console": "^1.0.0",
"aurelia-pal-browser": "^1.2.1",
Expand All @@ -158,7 +158,7 @@
"bluebird": "^3.5.0",
"bootstrap-sass": "^3.3.7",
"font-awesome": "^4.7.0",
"i18next-browser-languagedetector": "^1.0.1",
"i18next-browser-languagedetector": "^2.0.0",
"isomorphic-fetch": "^2.2.1",
"jquery": "^3.2.1",
"moment": "^2.18.1"
Expand Down
2 changes: 1 addition & 1 deletion src/app/app.vm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Lazy, inject, PLATFORM } from 'aurelia-framework';
import { Router, RouterConfiguration } from 'aurelia-router';
import { I18N } from 'aurelia-i18n';
import { HttpClient } from 'aurelia-fetch-client';
import * as moment from 'moment';
import moment from 'moment';

import { LogManager, Logger} from './services/logger.service';
import { AppConfigService } from './services/app-config.service';
Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/welcome/welcome.vm.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h3>Custom global attribute</h3>
<div red-square></div>

<h3>Global value converter</h3>
<p>${currentDate | dateFormat}</p>
<p>${currentDate | dateFormat & signal:'locale:changed'}</p>

<h3>Switch Language</h3>
<button click.delegate="switchLanguage()" class="btn btn-primary">Click me!</button>
Expand Down
2 changes: 1 addition & 1 deletion src/app/resources/converters/date-format.converter.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as moment from 'moment';
import moment from 'moment';

export class DateFormatValueConverter {
public toView(value: Date): string {
Expand Down
2 changes: 1 addition & 1 deletion src/app/services/language.service.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { autoinject } from 'aurelia-framework';
import { I18N } from 'aurelia-i18n';
import { BindingSignaler } from 'aurelia-templating-resources';
import * as moment from 'moment/moment';
import moment from 'moment';

import { Logger, LogManager} from './logger.service';

Expand Down
4 changes: 3 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
// Be strict
"alwaysStrict": true,
"strict": true,
"noImplicitAny": false
"noImplicitAny": false,
// For i18next and any other module with default export error
"allowSyntheticDefaultImports": true
},
"exclude": [
"node_modules",
Expand Down
11 changes: 0 additions & 11 deletions typings.json

This file was deleted.

74 changes: 0 additions & 74 deletions typings/globals/cordova/index.d.ts

This file was deleted.

8 changes: 0 additions & 8 deletions typings/globals/cordova/typings.json

This file was deleted.

80 changes: 0 additions & 80 deletions typings/globals/i18next-browser-languagedetector/index.d.ts

This file was deleted.

8 changes: 0 additions & 8 deletions typings/globals/i18next-browser-languagedetector/typings.json

This file was deleted.

Loading

0 comments on commit 9dc3848

Please sign in to comment.