Skip to content

Commit 8cabf76

Browse files
committed
Merge branch 'master' of github.com:chantouchsek/vuejs-google-maps
2 parents c344711 + 959b0b7 commit 8cabf76

File tree

3 files changed

+57
-9
lines changed

3 files changed

+57
-9
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ export default {
4343
// Simple usage
4444
'vuejs-google-maps/nuxt',
4545
// Passing options in module configuration
46-
['vuejs-google-maps/nuxt', {api: 'xxxxxx', libraries: [/* rest of libraries */]}]
46+
['vuejs-google-maps/nuxt', {apiKey: 'xxxxxx', libraries: [/* rest of libraries */]}]
4747
],
4848
// Passing options in module top level configuration
49-
googleMaps: {api: 'xxxxxx', libraries: [/* rest of libraries */]}
49+
googleMaps: {apiKey: 'xxxxxx', libraries: [/* rest of libraries */]}
5050
}
5151
```
5252

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"node-sass": "^4.11.0",
5959
"sass-loader": "^10.1.1",
6060
"terser": "3.14.1",
61-
"vue-material": "1.0.0-beta-11",
61+
"vue-material": "1.0.0-beta-15",
6262
"vue-router": "^3.5.1",
6363
"vue-template-compiler": "^2.6.12",
6464
"vuejs-google-maps": "^0.0.12"

yarn.lock

Lines changed: 54 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5031,6 +5031,11 @@ form-data@~2.3.2:
50315031
combined-stream "^1.0.6"
50325032
mime-types "^2.1.12"
50335033

5034+
format-thousands@^1.1.1:
5035+
version "1.1.1"
5036+
resolved "https://registry.yarnpkg.com/format-thousands/-/format-thousands-1.1.1.tgz#7975bee30338d9006390da5831db0b41c323fbfa"
5037+
integrity sha1-eXW+4wM42QBjkNpYMdsLQcMj+/o=
5038+
50345039
forwarded@~0.1.2:
50355040
version "0.1.2"
50365041
resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
@@ -5215,6 +5220,11 @@ getpass@^0.1.1:
52155220
dependencies:
52165221
assert-plus "^1.0.0"
52175222

5223+
github-buttons@^2.8.0:
5224+
version "2.14.4"
5225+
resolved "https://registry.yarnpkg.com/github-buttons/-/github-buttons-2.14.4.tgz#f4b335d1af235bfb4a4598162e8f2ca190635124"
5226+
integrity sha512-Fikb6lylJ2skQnoBaEv9m1yc6QwA8qbRFMRFWU08tMKXpbaql1LMKCghBAiuNpiWiGA25NiKuFO0oeD63030Kw==
5227+
52185228
glob-base@^0.3.0:
52195229
version "0.3.0"
52205230
resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@@ -7941,6 +7951,11 @@ node-cache@^4.1.1:
79417951
clone "2.x"
79427952
lodash "^4.17.15"
79437953

7954+
node-fetch@^2.3.0:
7955+
version "2.6.1"
7956+
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
7957+
integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
7958+
79447959
node-forge@^0.10.0:
79457960
version "0.10.0"
79467961
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
@@ -8301,6 +8316,11 @@ open@^6.3.0:
83018316
dependencies:
83028317
is-wsl "^1.1.0"
83038318

8319+
opencollective-postinstall@^2.0.2:
8320+
version "2.0.3"
8321+
resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259"
8322+
integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==
8323+
83048324
opener@^1.5.1:
83058325
version "1.5.2"
83068326
resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
@@ -11092,7 +11112,7 @@ tsconfig@^7.0.0:
1109211112
strip-bom "^3.0.0"
1109311113
strip-json-comments "^2.0.0"
1109411114

11095-
tslib@^1.9.0:
11115+
tslib@^1.9.0, tslib@^1.9.3:
1109611116
version "1.14.1"
1109711117
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
1109811118
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
@@ -11445,6 +11465,22 @@ vue-eslint-parser@^7.6.0:
1144511465
esquery "^1.4.0"
1144611466
lodash "^4.17.15"
1144711467

11468+
vue-github-button@^1.2.0:
11469+
version "1.3.0"
11470+
resolved "https://registry.yarnpkg.com/vue-github-button/-/vue-github-button-1.3.0.tgz#a4da317a3b93d05824768b3916a0d22fa91603be"
11471+
integrity sha512-Cc92t+GBLwBPhwtHSvKXjbx07U3+6xdi+eR+s9c734tHbndipCLenJjLVkgErNhKZ0EvDjRyuu8Hu69gg9/TxQ==
11472+
dependencies:
11473+
github-buttons "^2.8.0"
11474+
11475+
vue-github-buttons@^3.1.0:
11476+
version "3.1.0"
11477+
resolved "https://registry.yarnpkg.com/vue-github-buttons/-/vue-github-buttons-3.1.0.tgz#eaea2ba0b7e0df5a7fd1c61ba37dabf7553dd79a"
11478+
integrity sha512-x0b9bdhP5xZOD5kQ9+nnCzvKqVyHb4moqN2l06mjYB/k2WRdW5jiAWlneUgoPFwPvcqM40vrTDXVvBrS0MMlEQ==
11479+
dependencies:
11480+
format-thousands "^1.1.1"
11481+
node-fetch "^2.3.0"
11482+
tslib "^1.9.3"
11483+
1144811484
vue-hot-reload-api@^2.3.0:
1144911485
version "2.3.4"
1145011486
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
@@ -11478,10 +11514,15 @@ vue-loader@^15.7.0:
1147811514
vue-hot-reload-api "^2.3.0"
1147911515
vue-style-loader "^4.1.0"
1148011516

11481-
11482-
version "1.0.0-beta-11"
11483-
resolved "https://registry.yarnpkg.com/vue-material/-/vue-material-1.0.0-beta-11.tgz#11baf0cdb22a35d35859c619099d6c3cb3cc2cc3"
11484-
integrity sha512-1+dIVkQafMIA/zNONb7OwGaTjAxaWk/JhUA2/FInQvbArxf1ToKB+yIdeSfzopQ1KICnBTAmk9E0Vdr5p4MWNA==
11517+
11518+
version "1.0.0-beta-15"
11519+
resolved "https://registry.yarnpkg.com/vue-material/-/vue-material-1.0.0-beta-15.tgz#949025464f8fe2ff3b9be2ba1365d9eab770ad8a"
11520+
integrity sha512-nNC1mF1BQNKsyEjRXPYxweYlIOcVE9rK4LeeyppOU6h4vgQnZuNmlGIRnl6fUe8dj+x7c5x5/qydLhJRabPMng==
11521+
dependencies:
11522+
opencollective-postinstall "^2.0.2"
11523+
vue-github-button "^1.2.0"
11524+
vue-github-buttons "^3.1.0"
11525+
vue-toc "0.0.1"
1148511526

1148611527
vue-router@^3.5.1:
1148711528
version "3.5.1"
@@ -11509,7 +11550,14 @@ vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.9.0:
1150911550
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
1151011551
integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
1151111552

11512-
vue@^2.6.12:
11553+
11554+
version "0.0.1"
11555+
resolved "https://registry.yarnpkg.com/vue-toc/-/vue-toc-0.0.1.tgz#6a4dfa9c144445679705cd7b991a1a73ac080cc0"
11556+
integrity sha512-RZfVgLzk/kpEmk05ptvU/+x3TVo4Ai4BBARvV4iCurR9bJsAqnnrqwjEBKnEG+s6NT0yQ6EY0JMGViyOUGysDw==
11557+
dependencies:
11558+
vue "^2.6.10"
11559+
11560+
vue@^2.6.10, vue@^2.6.12:
1151311561
version "2.6.12"
1151411562
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123"
1151511563
integrity sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==

0 commit comments

Comments
 (0)