Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/PWA' into PWA
Browse files Browse the repository at this point in the history
  • Loading branch information
eitanfr committed May 30, 2017
2 parents 16e1afe + 1695ed1 commit 541bc22
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
4 changes: 3 additions & 1 deletion .angular-cli.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "app",
"serviceWorker": true,
"styles": [
"theme/variables.scss",
"styles.scss",
Expand Down Expand Up @@ -55,6 +56,7 @@
},
"defaults": {
"styleExt": "scss",
"component": {}
"component": {
}
}
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"@angular/platform-browser": "^4.1.0",
"@angular/platform-browser-dynamic": "^4.1.0",
"@angular/router": "^4.0.0",
"@angular/service-worker": "^1.0.0-beta.14",
"@types/graphql": "^0.9.1",
"apollo-angular": "^0.13.0",
"apollo-client": "^1.3.0",
Expand Down
13 changes: 12 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,13 @@
version "4.1.3"
resolved "https://registry.yarnpkg.com/@angular/router/-/router-4.1.3.tgz#ddafd46ae7ccc8b1f74904ffb45f394e44625216"

"@angular/service-worker@^1.0.0-beta.14":
version "1.0.0-beta.14"
resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-1.0.0-beta.14.tgz#445242b7a62fedf9fc6c439eede4a31fa2c9f07f"
dependencies:
base64-js "^1.1.2"
jshashes "^1.0.5"

"@angular/[email protected]":
version "4.1.3"
resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-4.1.3.tgz#2d6372c9187bf1621eacd960b94b39c4f95293cd"
Expand Down Expand Up @@ -544,7 +551,7 @@ [email protected]:
version "0.1.5"
resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"

base64-js@^1.0.2:
base64-js@^1.0.2, base64-js@^1.1.2:
version "1.2.0"
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"

Expand Down Expand Up @@ -2884,6 +2891,10 @@ jsesc@~0.5.0:
version "0.5.0"
resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"

jshashes@^1.0.5:
version "1.0.6"
resolved "https://registry.yarnpkg.com/jshashes/-/jshashes-1.0.6.tgz#b04eb4ae8f9987b2d3ce00a6337c120543949bfd"

json-loader@^0.5.4:
version "0.5.4"
resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.4.tgz#8baa1365a632f58a3c46d20175fc6002c96e37de"
Expand Down

0 comments on commit 541bc22

Please sign in to comment.