Merge pull request #39 from doxiaodong/develop

develop -> master

.gitignore

@@ -13,8 +13,6 @@ coverage/
 
 compiled/
 
-yarn.lock
-
 *.js
 *.d.ts
 *.js.map

.travis.yml

@@ -2,12 +2,10 @@ language: node_js
 
 node_js: "6.9.1"
 
-install:
-  - wget https://yarnpkg.com/latest.tar.gz && tar -xf latest.tar.gz && dist/bin/yarn
-
-# cache:
-#   directories:
-#     - $TRAVIS_BUILD_DIR/node_modules
+cache:
+  yarn: true
+  directories:
+    - node_modules
 
 before_script:
   - export CHROME_BIN=chromium-browser

config/webpack.common.js

@@ -299,9 +299,8 @@ module.exports = function(option) {
 
       // https://github.com/angular/angular/issues/11580
       new webpack.ContextReplacementPlugin(
-        // The (\\|\/) piece accounts for path separators in *nix and Windows
-        /angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,
-        helpers.root('./src') // location of your src
+        /angular(\\|\/)core(\\|\/)@angular/,
+        helpers.root('./src')
       ),
 
       new ngcWebpack.NgcWebpackPlugin({

package.json

@@ -56,99 +56,99 @@
     "ngc": "./node_modules/.bin/ngc-w -p tsconfig.aot.json"
   },
   "dependencies": {
-    "@angular/common": "^2.4.7",
-    "@angular/compiler": "^2.4.7",
-    "@angular/core": "^2.4.7",
-    "@angular/forms": "^2.4.7",
-    "@angular/http": "^2.4.7",
+    "@angular/animations": "^4.0.0",
+    "@angular/common": "^4.0.0",
+    "@angular/compiler": "^4.0.0",
+    "@angular/core": "^4.0.0",
+    "@angular/forms": "^4.0.0",
+    "@angular/http": "^4.0.0",
     "@angular/material": "^2.0.0-beta.2",
-    "@angular/platform-browser": "^2.4.7",
-    "@angular/platform-browser-dynamic": "^2.4.7",
-    "@angular/router": "^3.4.7",
+    "@angular/platform-browser": "^4.0.0",
+    "@angular/platform-browser-dynamic": "^4.0.0",
+    "@angular/router": "^4.0.0",
     "@angularclass/hmr": "^1.2.2",
     "angular-sortablejs": "^1.3.2",
     "core-js": "^2.4.1",
     "crypto-js": "^3.1.9-1",
     "emojione": "^2.2.7",
     "fetch-jsonp": "^1.0.6",
     "hammerjs": "^2.0.8",
-    "highlight.js": "^9.9.0",
+    "highlight.js": "^9.10.0",
     "js-base64": "^2.1.9",
     "marked": "^0.3.6",
-    "moment": "^2.17.1",
+    "moment": "^2.18.1",
     "ng2-clip": "~1.0.1",
     "ng2-simplemde": "^1.0.0",
     "ng2-translate": "^5.0.0",
-    "rxjs": "~5.1.1",
+    "rxjs": "~5.2.0",
     "simplemde": "^1.11.2",
-    "zone.js": "~0.7.7"
+    "zone.js": "~0.8.5"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "^2.4.7",
+    "@angular/compiler-cli": "^4.0.0",
     "@angularclass/hmr-loader": "^3.0.2",
-    "@types/core-js": "^0.9.35",
+    "@types/core-js": "^0.9.38",
     "@types/crypto-js": "^3.1.33",
     "@types/highlight.js": "^9.1.9",
-    "@types/jasmine": "^2.5.43",
+    "@types/jasmine": "^2.5.46",
     "@types/marked": "0.0.28",
     "@types/mathjax": "0.0.31",
-    "@types/node": "^7.0.5",
-    "@types/whatwg-fetch": "^0.0.33",
+    "@types/node": "^7.0.11",
     "angular2-template-loader": "^0.6.2",
-    "autoprefixer": "^6.7.3",
+    "autoprefixer": "^6.7.7",
     "chalk": "^1.1.3",
-    "codelyzer": "2.0.0",
+    "codelyzer": "3.0.0-beta.4",
     "copy-webpack-plugin": "^4.0.1",
-    "css-loader": "^0.26.1",
+    "css-loader": "^0.27.3",
     "es6-promise-loader": "^1.0.2",
-    "exports-loader": "^0.6.3",
+    "exports-loader": "^0.6.4",
     "expose-loader": "^0.7.3",
-    "extract-text-webpack-plugin": "^2.0.0-rc.3",
-    "file-loader": "^0.10.0",
+    "extract-text-webpack-plugin": "^2.1.0",
+    "file-loader": "^0.10.1",
     "html-webpack-plugin": "^2.28.0",
     "http-server": "^0.9.0",
     "image-webpack-loader": "^3.2.0",
     "imagemin": "^5.2.2",
-    "imports-loader": "^0.7.0",
+    "imports-loader": "^0.7.1",
     "istanbul-instrumenter-loader": "^2.0.0",
     "json-loader": "^0.5.4",
     "jsonminify": "^0.4.1",
-    "karma": "^1.4.1",
+    "karma": "^1.5.0",
     "karma-chrome-launcher": "^2.0.0",
     "karma-coverage": "^1.1.1",
     "karma-jasmine": "^1.1.0",
-    "karma-mocha-reporter": "^2.2.2",
+    "karma-mocha-reporter": "^2.2.3",
     "karma-remap-coverage": "^0.1.4",
     "karma-sourcemap-loader": "^0.3.7",
-    "karma-webpack": "2.0.2",
+    "karma-webpack": "2.0.3",
     "less": "^2.7.2",
-    "less-loader": "^2.2.3",
+    "less-loader": "^4.0.2",
     "ng-router-loader": "^2.1.0",
     "ngc-webpack": "^1.2.0",
     "node-dir": "^0.1.16",
-    "node-sass": "^4.5.0",
-    "parse5": "^3.0.1",
-    "postcss-loader": "^1.3.0",
+    "node-sass": "4.5.0",
+    "parse5": "^3.0.2",
+    "postcss-loader": "^1.3.3",
     "protractor": "^5.1.1",
     "raw-loader": "0.5.1",
-    "rimraf": "^2.5.4",
-    "sass-loader": "^6.0.0",
-    "source-map-loader": "^0.1.6",
-    "style-loader": "^0.13.1",
+    "rimraf": "^2.6.1",
+    "sass-loader": "^6.0.3",
+    "source-map-loader": "^0.2.0",
+    "style-loader": "^0.16.0",
     "svg-sprite-loader": "0.3.0",
     "ts-helpers": "1.1.2",
-    "ts-loader": "^2.0.0",
-    "ts-node": "^2.1.0",
-    "tslint": "^4.4.2",
-    "tslint-loader": "^3.4.2",
-    "typedoc": "^0.5.6",
-    "typescript": "~2.1.6",
-    "typescript-formatter": "^4.1.1",
-    "url-loader": "^0.5.7",
-    "webpack": "~2.2.1",
-    "webpack-dev-server": "~2.3.0",
+    "ts-loader": "^2.0.3",
+    "ts-node": "^3.0.2",
+    "tslint": "^4.5.1",
+    "tslint-loader": "^3.4.3",
+    "typedoc": "^0.5.9",
+    "typescript": "~2.2.1",
+    "typescript-formatter": "^5.1.2",
+    "url-loader": "^0.5.8",
+    "webpack": "~2.3.2",
+    "webpack-dev-server": "~2.4.2",
     "webpack-md5-hash": "^0.0.5",
-    "webpack-merge": "^2.6.1"
+    "webpack-merge": "^4.1.0"
   },
   "license": "MIT",
   "engines": {

src/app/app.e2e.ts

@@ -12,49 +12,49 @@ describe('app e2e', () => {
 
   it('should have a title', () => {
     let title = browser.getTitle()
-    expect(title).not.toEqual('')
+    expect<any>(title).not.toEqual('')
   })
 
   it('should have navbar', () => {
     let subject = element(by.css('comp-navbar')).isPresent()
     let result = true
-    expect(subject).toEqual(result)
+    expect<any>(subject).toEqual(result)
   })
 
   it('should have footer', () => {
     let subject = element(by.css('comp-footer')).isPresent()
     let result = true
-    expect(subject).toEqual(result)
+    expect<any>(subject).toEqual(result)
   })
 
   it('should have bg-picture', () => {
     let subject = element(by.css('#bg-picture')).isPresent()
     let result = true
-    expect(subject).toEqual(result)
+    expect<any>(subject).toEqual(result)
   })
 
   it('should have alert', () => {
     let subject = element(by.css('comp-alert')).isPresent()
     let result = true
-    expect(subject).toEqual(result)
+    expect<any>(subject).toEqual(result)
   })
 
   it('should have sign-modal', () => {
     let subject = element(by.css('comp-sign-modal')).isPresent()
     let result = true
-    expect(subject).toEqual(result)
+    expect<any>(subject).toEqual(result)
   })
 
   it('should have loading', () => {
     let subject = element(by.css('comp-loading')).isPresent()
     let result = true
-    expect(subject).toEqual(result)
+    expect<any>(subject).toEqual(result)
   })
 
   it('should have music', () => {
     let subject = element(by.css('comp-music')).isPresent()
     let result = true
-    expect(subject).toEqual(result)
+    expect<any>(subject).toEqual(result)
   })
 
 })

src/app/app.module.ts

@@ -5,6 +5,7 @@ import {
 import { APP_BASE_HREF } from '@angular/common'
 import { RouterModule } from '@angular/router'
 import { BrowserModule } from '@angular/platform-browser'
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
 import { Http } from '@angular/http'
 import { MdButtonModule } from '@angular/material/button'
 import {
@@ -86,6 +87,7 @@ export function simplemdeValue() {
   ],
   imports: [
     BrowserModule,
+    BrowserAnimationsModule,
     ShareModule.forRoot(),
 
     RouterModule.forRoot(ROUTES),

src/app/base/ngFor-animate/ngFor-animate.ts

@@ -5,7 +5,7 @@ import {
   transition,
   trigger,
   group
-} from '@angular/core'
+} from '@angular/animations'
 
 export function NgForAnimateFn() {
   return trigger('ngForAnimateTrigger', [

src/app/share/declarations/page-animate/page-animate.ts

@@ -4,7 +4,7 @@ import {
   style,
   // transition,
   trigger
-} from '@angular/core'
+} from '@angular/animations'
 
 export function PageAnimateFn() {
   return trigger('pageAnimateTrigger', [

src/main.browser.aot.ts

@@ -5,8 +5,6 @@ import { AppModuleNgFactory } from '../compiled/src/app/app.module.ngfactory'
 function main(): Promise<any> {
   if ('production' === ENV) {
     enableProdMode()
-  } else {
-    GLOBAL_VALUE.PIC_STATIC_URL_HOST = ''
   }
 
   return platformBrowser()

src/main.browser.ts

@@ -8,8 +8,6 @@ function main(): Promise<any> {
 
   if ('production' === ENV) {
     enableProdMode()
-  } else {
-    GLOBAL_VALUE.PIC_STATIC_URL_HOST = ''
   }
 
   return platformBrowserDynamic()

src/sw.js

@@ -1,7 +1,10 @@
 const staticCacheName = 'static'
 const version = 'v1::'
 const cacheKeys = [
-  /static\.darlin\.me/
+  /static\.darlin\.me/,
+  /cdn\.tristana\.cc/,
+  /cdn\.mathjax\.org/,
+  /cdn\.jsdelivr\.net/
 ]
 
 self.addEventListener('activate', function(event) {

tsconfig.aot.json

@@ -22,8 +22,7 @@
       "node",
       // "marked",
       // "highlight.js",
-      "mathjax",
-      "whatwg-fetch"
+      "mathjax"
     ]
   },
   "exclude": [

tsconfig.json

@@ -10,6 +10,10 @@
     // "noUnusedParameters": true,
     "noUnusedLocals": true,
     "baseUrl": "./src",
+    "lib": [
+      "es2015",
+      "dom"
+    ],
     "paths": {},
     "types": [
       "core-js",
@@ -18,7 +22,6 @@
       "marked",
       "highlight.js",
       "mathjax",
-      "whatwg-fetch",
       "crypto-js"
     ]
   },