Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into docs
Browse files Browse the repository at this point in the history
  • Loading branch information
juzser committed Mar 13, 2024
2 parents 0678520 + 26fc692 commit 67e30ca
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 27 deletions.
7 changes: 6 additions & 1 deletion docs/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,19 @@ export default defineConfig({

The [AppProvider](/components/AppProvider) component is **required** to use PolarisVue. Without it, the components in your application will not function correctly. You must wrap the root (the top) of your application in the app provider component.

The `i18n` prop is required to pass the locales, you can check the [supported locales](/utilities#locales) here.

::: code-group
```vue [App.vue]
<template>
<AppProvider>
<AppProvider :i18n="locales">
...
<router-view />
</AppProvider>
</template>
<script setup>
import locales from '@ownego/polaris-vue/locales/en.json';
</script>
```
:::

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@shopify/postcss-plugin": "^5.0.2",
"@types/node": "^20.10.4",
"@vitejs/plugin-vue": "^5.0.2",
"@vue/language-plugin-pug": "^1.8.27",
"@vue/language-plugin-pug": "^2.0.6",
"change-case": "^5.3.0",
"eslint": "^8.54.0",
"eslint-plugin-vue": "^9.18.1",
Expand Down
67 changes: 42 additions & 25 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -572,24 +572,37 @@
dependencies:
"@volar/source-map" "1.11.1"

"@volar/language-service@~1.11.0":
version "1.11.1"
resolved "https://registry.yarnpkg.com/@volar/language-service/-/language-service-1.11.1.tgz#076bec41b8bdaa89ce61cb35be7da93df7285d87"
integrity sha512-dKo8z1UzQRPHnlXxwfONGrasS1wEWXMoLQiohZ8KgWqZALbekZCwdGImLZD4DeFGNjk3HTTdfeCzo3KjwohjEQ==
"@volar/language-[email protected]":
version "2.1.2"
resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-2.1.2.tgz#2053c0ee48a822d5418be2c192e51e580764b49f"
integrity sha512-5qsDp0Gf6fE09UWCeK7bkVn6NxMwC9OqFWQkMMkeej8h8XjyABPdRygC2RCrqDrfVdGijqlMQeXs6yRS+vfZYA==
dependencies:
"@volar/language-core" "1.11.1"
"@volar/source-map" "1.11.1"
"@volar/source-map" "2.1.2"

"@volar/language-service@~2.1.0":
version "2.1.2"
resolved "https://registry.yarnpkg.com/@volar/language-service/-/language-service-2.1.2.tgz#d5753d017d383c5b7116665a473eb05359e03ff9"
integrity sha512-CmVbbKdqzVq+0FT67hfELdHpboqXhKXh6EjypypuFX5ptIRftHZdkaq3/lCCa46EHxS5tvE44jn+s7faN4iRDA==
dependencies:
"@volar/language-core" "2.1.2"
vscode-languageserver-protocol "^3.17.5"
vscode-languageserver-textdocument "^1.0.11"
vscode-uri "^3.0.8"

"@volar/[email protected]", "@volar/source-map@~1.11.0", "@volar/source-map@~1.11.1":
"@volar/[email protected]", "@volar/source-map@~1.11.1":
version "1.11.1"
resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-1.11.1.tgz#535b0328d9e2b7a91dff846cab4058e191f4452f"
integrity sha512-hJnOnwZ4+WT5iupLRnuzbULZ42L7BWWPMmruzwtLhJfpDVoZLjNBxHDi2sY2bgZXCKlpU5XcsMFoYrsQmPhfZg==
dependencies:
muggle-string "^0.3.1"

"@volar/[email protected]", "@volar/source-map@~2.1.2":
version "2.1.2"
resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-2.1.2.tgz#d270ff8ef5c814582f0efe08272c0fd6b9effb3b"
integrity sha512-yFJqsuLm1OaWrsz9E3yd3bJcYIlHqdZ8MbmIoZLrAzMYQDcoF26/INIhgziEXSdyHc8xd7rd/tJdSnUyh0gH4Q==
dependencies:
muggle-string "^0.4.0"

"@volar/typescript@~1.11.1":
version "1.11.1"
resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-1.11.1.tgz#ba86c6f326d88e249c7f5cfe4b765be3946fd627"
Expand Down Expand Up @@ -725,13 +738,13 @@
path-browserify "^1.0.1"
vue-template-compiler "^2.7.14"

"@vue/language-plugin-pug@^1.8.27":
version "1.8.27"
resolved "https://registry.yarnpkg.com/@vue/language-plugin-pug/-/language-plugin-pug-1.8.27.tgz#db91b488071f951a37d9b06208500031382af235"
integrity sha512-5Z4Kf9FOSROR+rTEjtd27IimadD2ph54oqk8f3sZPszJxJrnNWdPSSArudj6gdRiPHViOQ8uwTsn7QhnkmlvPw==
"@vue/language-plugin-pug@^2.0.6":
version "2.0.6"
resolved "https://registry.yarnpkg.com/@vue/language-plugin-pug/-/language-plugin-pug-2.0.6.tgz#8f1e0a779076d926a8374507c621f8eecaf0589f"
integrity sha512-tZMvm3aGuYKPSClC/bJHhLUWWU6nd0LAy7i6gGcG7OXwTRSZ7b44Tmyhdx5RVEBlolZYTr8rjDELH9yi40rCqw==
dependencies:
"@volar/source-map" "~1.11.1"
volar-service-pug "0.0.17"
"@volar/source-map" "~2.1.2"
volar-service-pug "0.0.31"

"@vue/[email protected]":
version "3.4.19"
Expand Down Expand Up @@ -1876,6 +1889,11 @@ muggle-string@^0.3.1:
resolved "https://registry.yarnpkg.com/muggle-string/-/muggle-string-0.3.1.tgz#e524312eb1728c63dd0b2ac49e3282e6ed85963a"
integrity sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==

muggle-string@^0.4.0:
version "0.4.1"
resolved "https://registry.yarnpkg.com/muggle-string/-/muggle-string-0.4.1.tgz#3b366bd43b32f809dc20659534dd30e7c8a0d328"
integrity sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==

nanoid@^3.3.7:
version "3.3.7"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
Expand Down Expand Up @@ -2567,25 +2585,24 @@ void-elements@^3.1.0:
resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
integrity sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==

[email protected].17:
version "0.0.17"
resolved "https://registry.yarnpkg.com/volar-service-html/-/volar-service-html-0.0.17.tgz#de5e95efb8deb7893f4729b5b7168fe3561c068e"
integrity sha512-OGkP+ZTo13j/+enafGe+esXvda/W4eU78YNLbbHxtV3rnX4odVrewenLJmXiECg6wdQz/PG8rLijZqQnDUYkfw==
[email protected].31:
version "0.0.31"
resolved "https://registry.yarnpkg.com/volar-service-html/-/volar-service-html-0.0.31.tgz#ee5c6f9a6126ca18b8c7c92b3fa28a9e931d7219"
integrity sha512-duMjl/VLvPWtmYsIAUtwYw/esFY3FWnVmH7537UpnfY9ncYTX/G43xmoVd+oQJPWh7xi8zwFeUQgZAA6T45Bhg==
dependencies:
vscode-html-languageservice "^5.1.0"
vscode-languageserver-textdocument "^1.0.11"
vscode-uri "^3.0.8"

[email protected].17:
version "0.0.17"
resolved "https://registry.yarnpkg.com/volar-service-pug/-/volar-service-pug-0.0.17.tgz#2569f4a2e545186246109d81279e307423f93927"
integrity sha512-p6oDgH+ufWyS6r6Jv5h76cWGtjLOG/vhd5NH4Sk0pMCdh8zANHJsKsxsrIOiYsK6J9uNU1H6qRRHGg95xj34eQ==
[email protected].31:
version "0.0.31"
resolved "https://registry.yarnpkg.com/volar-service-pug/-/volar-service-pug-0.0.31.tgz#24b16ea9d7b788d7e82ea3981c5c36e3b6ab7774"
integrity sha512-hnzdMb9lq74FgKy3LI3nNW4SARWbPy+FwMr6VLaII0R8F3IOvx5w+2nJSzboivPDJ0F5xHASPTWO53G5mXK+vQ==
dependencies:
"@volar/language-service" "~1.11.0"
"@volar/source-map" "~1.11.0"
muggle-string "^0.3.1"
"@volar/language-service" "~2.1.0"
pug-lexer "^5.0.1"
pug-parser "^6.0.0"
volar-service-html "0.0.17"
volar-service-html "0.0.31"
vscode-html-languageservice "^5.1.0"
vscode-languageserver-textdocument "^1.0.11"

Expand Down

0 comments on commit 67e30ca

Please sign in to comment.