Skip to content

Commit cd8c750

Browse files
committed
fix app in IE
1 parent f5405dc commit cd8c750

File tree

4 files changed

+21
-86
lines changed

4 files changed

+21
-86
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
},
1717
"dependencies": {
1818
"compression": "^1.6.2",
19-
"es6-promise": "^3.2.1",
19+
"es6-promise": "^4.0.5",
2020
"express": "^4.14.0",
21-
"firebase": "^3.4.1",
21+
"firebase": "^3.6.1",
2222
"html-webpack-plugin": "^2.24.1",
2323
"lru-cache": "^4.0.1",
2424
"serialize-javascript": "^1.3.0",
@@ -33,16 +33,16 @@
3333
"autoprefixer": "^6.4.0",
3434
"buble": "^0.14.2",
3535
"buble-loader": "^0.3.2",
36-
"cross-env": "^2.0.0",
36+
"cross-env": "^3.1.3",
3737
"css-loader": "^0.25.0",
3838
"extract-text-webpack-plugin": "^2.0.0-beta.3",
3939
"file-loader": "^0.9.0",
4040
"rimraf": "^2.5.4",
4141
"stylus": "^0.54.5",
4242
"stylus-loader": "^2.1.2",
43-
"sw-precache-webpack-plugin": "^0.5.1",
43+
"sw-precache-webpack-plugin": "^0.6.0",
4444
"url-loader": "^0.5.7",
45-
"vue-loader": "^9.9.1",
45+
"vue-loader": "^9.9.3",
4646
"webpack": "^2.1.0-beta.26",
4747
"webpack-dev-middleware": "^1.6.1",
4848
"webpack-hot-middleware": "^2.12.2"

src/app.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@ Object.keys(filters).forEach(key => {
1717
// create the app instance.
1818
// here we inject the router and store to all child components,
1919
// making them available everywhere as `this.$router` and `this.$store`.
20-
const app = new Vue({
20+
const app = new Vue(Vue.util.extend({
2121
router,
22-
store,
23-
...App // Object spread copying everything from App.vue
24-
})
22+
store
23+
}, App))
2524

2625
// expose the app, the router and the store.
2726
// note we are not mounting the app here, since bootstrapping will be

src/client-entry.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require('es6-promise').polyfill()
1+
import 'es6-promise/auto'
22
import { app, store } from './app'
33

44
// prime the store with server-initialized state.

yarn.lock

Lines changed: 12 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -689,12 +689,11 @@ create-hmac@^1.1.0, create-hmac@^1.1.2:
689689
create-hash "^1.1.0"
690690
inherits "^2.0.1"
691691

692-
cross-env@^2.0.0:
693-
version "2.0.1"
694-
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-%3Cspan%20class="x x-first x-last">2.0.1.tgz#f283b4039ea759ada9ab7e987ad3bddb241b79a6"
692+
cross-env@^3.1.3:
693+
version "3.1.3"
694+
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-%3Cspan%20class="x x-first x-last">3.1.3.tgz#58cd8231808f50089708b091f7dd37275a8e8154"
695695
dependencies:
696696
cross-spawn "^3.0.1"
697-
lodash.assign "^3.2.0"
698697

699698
cross-spawn@^3.0.1:
700699
version "3.0.1"
@@ -1032,10 +1031,6 @@ error-ex@^1.2.0:
10321031
dependencies:
10331032
is-arrayish "^0.2.1"
10341033

1035-
es6-promise@^3.2.1:
1036-
version "3.3.1"
1037-
resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz#a08cdde84ccdbf34d027a1451bc91d4bcd28a613"
1038-
10391034
es6-promise@^4.0.5:
10401035
version "4.0.5"
10411036
resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.0.5.tgz#7882f30adde5b240ccfa7f7d78c548330951ae42"
@@ -1182,9 +1177,9 @@ find-up@^1.0.0:
11821177
path-exists "^2.0.0"
11831178
pinkie-promise "^2.0.0"
11841179

1185-
firebase@^3.4.1:
1186-
version "3.6.0"
1187-
resolved "https://registry.yarnpkg.com/firebase/-/firebase-3.6.%3Cspan%20class="x x-first x-last">0.tgz#d87c260e178c2b5d6c0bcdd133f85167646f9623"
1180+
firebase@^3.6.1:
1181+
version "3.6.1"
1182+
resolved "https://registry.yarnpkg.com/firebase/-/firebase-3.6.%3Cspan%20class="x x-first x-last">1.tgz#bcd7fe28f9eb75c8ecbefba9b4763b0800995229"
11881183
dependencies:
11891184
dom-storage "2.0.2"
11901185
faye-websocket "0.9.3"
@@ -1832,44 +1827,13 @@ loader-utils@^0.2.10, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^
18321827
json5 "^0.5.0"
18331828
object-assign "^4.0.1"
18341829

1835-
lodash._baseassign@^3.0.0:
1836-
version "3.2.0"
1837-
resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
1838-
dependencies:
1839-
lodash._basecopy "^3.0.0"
1840-
lodash.keys "^3.0.0"
1841-
1842-
lodash._basecopy@^3.0.0:
1843-
version "3.0.1"
1844-
resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
1845-
1846-
lodash._bindcallback@^3.0.0:
1847-
version "3.0.1"
1848-
resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
1849-
1850-
lodash._createassigner@^3.0.0:
1851-
version "3.1.1"
1852-
resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"
1853-
dependencies:
1854-
lodash._bindcallback "^3.0.0"
1855-
lodash._isiterateecall "^3.0.0"
1856-
lodash.restparam "^3.0.0"
1857-
18581830
lodash._createcompounder@^3.0.0:
18591831
version "3.0.0"
18601832
resolved "https://registry.yarnpkg.com/lodash._createcompounder/-/lodash._createcompounder-3.0.0.tgz#5dd2cb55372d6e70e0e2392fb2304d6631091075"
18611833
dependencies:
18621834
lodash.deburr "^3.0.0"
18631835
lodash.words "^3.0.0"
18641836

1865-
lodash._getnative@^3.0.0:
1866-
version "3.9.1"
1867-
resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
1868-
1869-
lodash._isiterateecall@^3.0.0:
1870-
version "3.0.9"
1871-
resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
1872-
18731837
lodash._reinterpolate@~3.0.0:
18741838
version "3.0.0"
18751839
resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -1878,14 +1842,6 @@ lodash._root@^3.0.0:
18781842
version "3.0.1"
18791843
resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
18801844

1881-
lodash.assign@^3.2.0:
1882-
version "3.2.0"
1883-
resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz#3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"
1884-
dependencies:
1885-
lodash._baseassign "^3.0.0"
1886-
lodash._createassigner "^3.0.0"
1887-
lodash.keys "^3.0.0"
1888-
18891845
lodash.camelcase@^3.0.1:
18901846
version "3.0.1"
18911847
resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-3.0.1.tgz#932c8b87f8a4377897c67197533282f97aeac298"
@@ -1906,26 +1862,6 @@ lodash.indexof@^4.0.5:
19061862
version "4.0.5"
19071863
resolved "https://registry.yarnpkg.com/lodash.indexof/-/lodash.indexof-4.0.5.tgz#53714adc2cddd6ed87638f893aa9b6c24e31ef3c"
19081864

1909-
lodash.isarguments@^3.0.0:
1910-
version "3.1.0"
1911-
resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
1912-
1913-
lodash.isarray@^3.0.0:
1914-
version "3.0.4"
1915-
resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
1916-
1917-
lodash.keys@^3.0.0:
1918-
version "3.1.2"
1919-
resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
1920-
dependencies:
1921-
lodash._getnative "^3.0.0"
1922-
lodash.isarguments "^3.0.0"
1923-
lodash.isarray "^3.0.0"
1924-
1925-
lodash.restparam@^3.0.0:
1926-
version "3.6.1"
1927-
resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
1928-
19291865
lodash.template@^4.4.0:
19301866
version "4.4.0"
19311867
resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
@@ -3192,9 +3128,9 @@ svgo@^0.7.0:
31923128
sax "~1.2.1"
31933129
whet.extend "~0.9.9"
31943130

3195-
sw-precache-webpack-plugin@^0.5.1:
3196-
version "0.5.1"
3197-
resolved "https://registry.yarnpkg.com/sw-precache-webpack-plugin/-/sw-precache-webpack-plugin-0.%3Cspan%20class="x x-first x-last">5.1.tgz#380320dcdf9c189b51b41a676382301b8669734f"
3131+
sw-precache-webpack-plugin@^0.6.0:
3132+
version "0.6.0"
3133+
resolved "https://registry.yarnpkg.com/sw-precache-webpack-plugin/-/sw-precache-webpack-plugin-0.%3Cspan%20class="x x-first x-last">6.0.tgz#6dab854c7b70a29466bea661dbc657dd74a573ea"
31983134
dependencies:
31993135
del "^2.2.2"
32003136
sw-precache "^4.1.0"
@@ -3418,9 +3354,9 @@ vue-hot-reload-api@^2.0.1:
34183354
version "2.0.6"
34193355
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.0.6.tgz#817d4bfb30f55428aa1012d029499e07f3147d21"
34203356

3421-
vue-loader@^9.9.1:
3422-
version "9.9.1"
3423-
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-9.9.%3Cspan%20class="x x-first x-last">1.tgz#2867dd29027fab6d0f94bef98c607dc2d3a36304"
3357+
vue-loader@^9.9.3:
3358+
version "9.9.3"
3359+
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-9.9.%3Cspan%20class="x x-first x-last">3.tgz#fc926c0ee352da372fbc786f8b085b82c1ba1683"
34243360
dependencies:
34253361
consolidate "^0.14.0"
34263362
hash-sum "^1.0.2"

0 commit comments

Comments
 (0)