Skip to content

Commit 85223ea

Browse files
authored
Merge branch 'v2' into feat/nuxt-skip-hydrate-in-payload
2 parents 4746ff2 + 3d238f7 commit 85223ea

File tree

32 files changed

+2468
-1716
lines changed

32 files changed

+2468
-1716
lines changed

.github/CONTRIBUTING.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Contributions are welcome and will be fully credited!
44

5-
We accept contributions via Pull Requests on [Github](https://github.com/{{ githubAccount }}/{{ name }}).
5+
We accept contributions via Pull Requests on [Github](https://github.com/vuejs/pinia).
66

77
## Pull Requests
88

@@ -19,7 +19,7 @@ Here are some guidelines to make the process smoother:
1919

2020
### Bug reports
2121

22-
Always try to provide as much information as possible. If you are reporting a bug, try to provide a repro on jsfiddle.net (or anything else) or a stacktrace at the very least. This will help us check the problem quicker.
22+
Always try to provide as much information as possible. If you are reporting a bug, try to provide a repro on [this playground](https://play.pinia.vuejs.org) (or anything else) or a stacktrace at the very least. This will help us check the problem quicker.
2323

2424
### Feature requests
2525

@@ -86,3 +86,7 @@ pnpm run docs:translation:compare <lang> upstream/v2
8686
```
8787

8888
<!-- TODO: add an example once we have got one -->
89+
90+
### Translating Search text
91+
92+
The search box is powered by Algolia and you will need to translate the properties. Inspire yourself from `.vitepress/config/zh.ts` `zhSearch` variable.

.github/workflows/pkg.pr.new.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,8 @@ jobs:
2525
uses: actions/checkout@v4
2626
with:
2727
fetch-depth: 0
28-
29-
- run: corepack enable
30-
31-
- name: Set node
32-
uses: actions/setup-node@v4
28+
- uses: pnpm/action-setup@v4
29+
- uses: actions/setup-node@v4
3330
with:
3431
node-version: lts/*
3532
cache: pnpm

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<br/>
77
<p align="center">
88
<a href="https://npmjs.com/package/pinia"><img src="https://badgen.net/npm/v/pinia" alt="npm package"></a>
9-
<a href="https://github.com/vuejs/pinia/actions/workflows/test.yml?query=branch%3Av2"><img src="https://github.com/vuejs/pinia/workflows/test/badge.svg?branch=v2" alt="build status"></a>
9+
<a href="https://github.com/vuejs/pinia/actions/workflows/ci.yml"><img src="https://github.com/vuejs/pinia/actions/workflows/ci.yml/badge.svg" alt="build status"></a>
1010
<a href="https://codecov.io/gh/vuejs/pinia"><img src="https://codecov.io/gh/vuejs/pinia/graph/badge.svg?token=rU2xxQ6BGH"/></a>
1111
</p>
1212
<br/>

codecov.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
coverage:
2+
status:
3+
patch: off
4+
project:
5+
default:
6+
threshold: 2%

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,32 +35,32 @@
3535
"@rollup/plugin-terser": "^0.4.4",
3636
"@types/lodash.kebabcase": "^4.1.9",
3737
"@types/node": "^20.14.12",
38-
"@vitest/coverage-v8": "^2.0.4",
39-
"@vitest/ui": "^2.0.4",
40-
"@vue/compiler-sfc": "~3.4.34",
41-
"@vue/server-renderer": "~3.4.34",
38+
"@vitest/coverage-v8": "^2.1.1",
39+
"@vitest/ui": "^2.1.1",
40+
"@vue/compiler-sfc": "~3.5.10",
41+
"@vue/server-renderer": "~3.5.10",
4242
"chalk": "^5.3.0",
4343
"conventional-changelog-cli": "^2.2.2",
4444
"enquirer": "^2.4.1",
4545
"execa": "^9.3.0",
4646
"globby": "^14.0.1",
47-
"happy-dom": "^14.12.3",
47+
"happy-dom": "^15.7.4",
4848
"lint-staged": "^15.2.7",
4949
"lodash.kebabcase": "^4.1.1",
5050
"minimist": "^1.2.8",
5151
"p-series": "^3.0.0",
5252
"pascalcase": "^2.0.0",
5353
"prettier": "^3.3.3",
5454
"rimraf": "^6.0.1",
55-
"rollup": "^4.18.0",
55+
"rollup": "^4.22.5",
5656
"rollup-plugin-typescript2": "^0.36.0",
5757
"semver": "^7.6.3",
5858
"simple-git-hooks": "^2.11.1",
59-
"typedoc": "^0.26.5",
60-
"typedoc-plugin-markdown": "^4.2.3",
61-
"typescript": "~5.5.4",
62-
"vitest": "^2.0.4",
63-
"vue": "~3.4.34"
59+
"typedoc": "^0.26.7",
60+
"typedoc-plugin-markdown": "^4.2.8",
61+
"typescript": "~5.6.2",
62+
"vitest": "^2.1.1",
63+
"vue": "~3.5.10"
6464
},
6565
"simple-git-hooks": {
6666
"pre-commit": "pnpm lint-staged",

packages/docs/api/@pinia/nuxt/functions/default.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ editLink: false
1010

1111
# Function: default()
1212

13-
> **default**(`this`, `inlineOptions`, `nuxt`): `_ModuleSetupReturn`
13+
> **default**(`this`, `resolvedOptions`, `nuxt`): `ModuleSetupReturn`
1414
1515
## Parameters
1616

1717
**this**: `void`
1818

19-
**inlineOptions**: [`ModuleOptions`](../interfaces/ModuleOptions.md)
19+
**resolvedOptions**: [`ModuleOptions`](../interfaces/ModuleOptions.md)
2020

2121
**nuxt**: `Nuxt`
2222

2323
## Returns
2424

25-
`_ModuleSetupReturn`
25+
`ModuleSetupReturn`

packages/docs/api/@pinia/testing/interfaces/TestingPinia.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ App used by Pinia
4747

4848
### state
4949

50-
> **state**: `Ref`\<`Record`\<`string`, [`StateTree`](../../../pinia/type-aliases/StateTree.md)\>\>
50+
> **state**: `Ref`\<`Record`\<`string`, [`StateTree`](../../../pinia/type-aliases/StateTree.md)\>, `Record`\<`string`, [`StateTree`](../../../pinia/type-aliases/StateTree.md)\>\>
5151
5252
root state
5353

packages/docs/api/pinia/index.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ editLink: false
1818

1919
### Interfaces
2020

21+
- [\_StoreOnActionListenerContext](interfaces/StoreOnActionListenerContext.md)
22+
- [\_StoreWithState](interfaces/StoreWithState.md)
23+
- [\_SubscriptionCallbackMutationBase](interfaces/SubscriptionCallbackMutationBase.md)
2124
- [DefineSetupStoreOptions](interfaces/DefineSetupStoreOptions.md)
2225
- [DefineStoreOptions](interfaces/DefineStoreOptions.md)
2326
- [DefineStoreOptionsBase](interfaces/DefineStoreOptionsBase.md)
@@ -34,23 +37,9 @@ editLink: false
3437
- [SubscriptionCallbackMutationDirect](interfaces/SubscriptionCallbackMutationDirect.md)
3538
- [SubscriptionCallbackMutationPatchFunction](interfaces/SubscriptionCallbackMutationPatchFunction.md)
3639
- [SubscriptionCallbackMutationPatchObject](interfaces/SubscriptionCallbackMutationPatchObject.md)
37-
- [\_StoreOnActionListenerContext](interfaces/StoreOnActionListenerContext.md)
38-
- [\_StoreWithState](interfaces/StoreWithState.md)
39-
- [\_SubscriptionCallbackMutationBase](interfaces/SubscriptionCallbackMutationBase.md)
4040

4141
### Type Aliases
4242

43-
- [PiniaStorePlugin](type-aliases/PiniaStorePlugin.md)
44-
- [StateTree](type-aliases/StateTree.md)
45-
- [Store](type-aliases/Store.md)
46-
- [StoreActions](type-aliases/StoreActions.md)
47-
- [StoreGeneric](type-aliases/StoreGeneric.md)
48-
- [StoreGetters](type-aliases/StoreGetters.md)
49-
- [StoreOnActionListener](type-aliases/StoreOnActionListener.md)
50-
- [StoreOnActionListenerContext](type-aliases/StoreOnActionListenerContext.md)
51-
- [StoreState](type-aliases/StoreState.md)
52-
- [SubscriptionCallback](type-aliases/SubscriptionCallback.md)
53-
- [SubscriptionCallbackMutation](type-aliases/SubscriptionCallbackMutation.md)
5443
- [\_ActionsTree](type-aliases/ActionsTree.md)
5544
- [\_Awaited](type-aliases/Awaited.md)
5645
- [\_DeepPartial](type-aliases/DeepPartial.md)
@@ -73,6 +62,17 @@ editLink: false
7362
- [\_StoreWithActions](type-aliases/StoreWithActions.md)
7463
- [\_StoreWithGetters](type-aliases/StoreWithGetters.md)
7564
- [\_UnwrapAll](type-aliases/UnwrapAll.md)
65+
- [PiniaStorePlugin](type-aliases/PiniaStorePlugin.md)
66+
- [StateTree](type-aliases/StateTree.md)
67+
- [Store](type-aliases/Store.md)
68+
- [StoreActions](type-aliases/StoreActions.md)
69+
- [StoreGeneric](type-aliases/StoreGeneric.md)
70+
- [StoreGetters](type-aliases/StoreGetters.md)
71+
- [StoreOnActionListener](type-aliases/StoreOnActionListener.md)
72+
- [StoreOnActionListenerContext](type-aliases/StoreOnActionListenerContext.md)
73+
- [StoreState](type-aliases/StoreState.md)
74+
- [SubscriptionCallback](type-aliases/SubscriptionCallback.md)
75+
- [SubscriptionCallbackMutation](type-aliases/SubscriptionCallbackMutation.md)
7676

7777
### Variables
7878

packages/docs/api/pinia/interfaces/Pinia.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Every application must own its own pinia to be able to create stores
3434

3535
### state
3636

37-
> **state**: `Ref`\<`Record`\<`string`, [`StateTree`](../type-aliases/StateTree.md)\>\>
37+
> **state**: `Ref`\<`Record`\<`string`, [`StateTree`](../type-aliases/StateTree.md)\>, `Record`\<`string`, [`StateTree`](../type-aliases/StateTree.md)\>\>
3838
3939
root state
4040

packages/docs/api/pinia/interfaces/StoreProperties.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ Properties of a store.
2222

2323
## Properties
2424

25-
### $id
26-
27-
> **$id**: `Id`
28-
29-
Unique identifier of the store
30-
31-
***
32-
3325
### \_customProperties
3426

3527
> **\_customProperties**: `Set`\<`string`\>
3628
3729
Used by devtools plugin to retrieve properties added with plugins. Removed
3830
in production. Can be used by the user to add property keys of the store
3931
that should be displayed in devtools.
32+
33+
***
34+
35+
### $id
36+
37+
> **$id**: `Id`
38+
39+
Unique identifier of the store

0 commit comments

Comments
 (0)