Skip to content
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ba8ef05
add BB_ prefix
dai-shi Apr 1, 2026
2ca3f5e
pass building blocks around
dai-shi Apr 1, 2026
ca6a88b
fix react
dai-shi Apr 1, 2026
7a4888b
bb at first
dai-shi Apr 2, 2026
183d3d4
do not pass store around
dai-shi Apr 2, 2026
b4d845c
fix lint
dai-shi Apr 2, 2026
a810624
fix tests
dai-shi Apr 2, 2026
f05efd6
refactor
dai-shi Apr 2, 2026
7c10e57
remove BB_ prefix
dai-shi Apr 2, 2026
d6e7bd3
make BUILDING_BLOCK_atomOnInit pure again
dai-shi Apr 3, 2026
c60ab0e
store as a building block
dai-shi Apr 3, 2026
0c4fc25
fix tests
dai-shi Apr 3, 2026
fc3660c
refactor back internals
dai-shi Apr 7, 2026
7403a4f
Revert "fix tests"
dai-shi Apr 7, 2026
52b1a22
fix test
dai-shi Apr 7, 2026
f264251
fix type
dai-shi Apr 7, 2026
22f351c
Merge branch 'main' into breaking/building-blocks-in-params
dai-shi Apr 7, 2026
2b646da
Merge branch 'main' into breaking/building-blocks-in-params
dai-shi Apr 7, 2026
d04cb1d
Merge branch 'main' into breaking/building-blocks-in-params
dai-shi Apr 7, 2026
c541c12
use store for the key
dai-shi Apr 8, 2026
74684cb
fix format
dai-shi Apr 13, 2026
0d5fb00
bump building blocks rev
dai-shi Apr 13, 2026
a1818de
revert atom intercepters signature
dai-shi Apr 13, 2026
6049784
fix workflow file
dai-shi Apr 13, 2026
47fc007
extract ensureAtomState from building blocks
dai-shi Apr 16, 2026
96f5dbb
Revert "extract ensureAtomState from building blocks"
dai-shi Apr 21, 2026
ac38969
fix: make bb functions to receive the pair of (buildingBlocks, store)…
dai-shi Apr 21, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test-multiple-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
sed -i~ "s/resolve('\.\/src\(.*\)\.ts')/resolve('\.\/dist\1.js')/" vitest.config.mts
sed -i~ "s/import { useResetAtom } from 'jotai\/react\/utils'/const { useResetAtom } = require('..\/..\/..\/dist\/react\/utils.js')/" tests/react/utils/useResetAtom.test.tsx
sed -i~ "s/import { RESET, atomWithReducer, atomWithReset } from 'jotai\/vanilla\/utils'/const { RESET, atomWithReducer, atomWithReset } = require('..\/..\/..\/dist\/vanilla\/utils.js')/" tests/react/utils/useResetAtom.test.tsx
perl -i~ -0777 -pe "s/import {[^}]+} from 'jotai\/vanilla\/internals'/const { INTERNAL_buildStoreRev2: INTERNAL_buildStore, INTERNAL_initializeStoreHooksRev2: INTERNAL_initializeStoreHooks, INTERNAL_getBuildingBlocksRev2: INTERNAL_getBuildingBlocks } = require('..\/..\/dist\/vanilla\/internals.js')/g" tests/vanilla/store.test.tsx tests/vanilla/internals.test.tsx tests/vanilla/derive.test.tsx tests/vanilla/effect.test.ts
perl -i~ -0777 -pe "s/import {[^}]+} from 'jotai\/vanilla\/internals'/const { INTERNAL_buildStoreRev3: INTERNAL_buildStore, INTERNAL_initializeStoreHooksRev3: INTERNAL_initializeStoreHooks, INTERNAL_getBuildingBlocksRev3: INTERNAL_getBuildingBlocks } = require('..\/..\/dist\/vanilla\/internals.js')/g" tests/vanilla/store.test.tsx tests/vanilla/internals.test.tsx tests/vanilla/derive.test.tsx tests/vanilla/effect.test.ts
- name: Patch for ESM
if: ${{ matrix.build == 'esm' }}
run: |
Expand Down
6 changes: 3 additions & 3 deletions src/react/useAtomValue.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useDebugValue, useEffect, useReducer } from 'react'
import { INTERNAL_getBuildingBlocksRev2 as INTERNAL_getBuildingBlocks } from '../vanilla/internals.ts'
import { INTERNAL_getBuildingBlocksRev3 as INTERNAL_getBuildingBlocks } from '../vanilla/internals.ts'
import type { Atom, ExtractAtomValue } from '../vanilla.ts'
import { useStore } from './Provider.ts'

Expand Down Expand Up @@ -85,7 +85,7 @@ const createContinuablePromise = <T>(
continuablePromiseMap.set(nextValue, continuablePromise!)
curr = nextValue
nextValue.then(onFulfilled(nextValue), onRejected(nextValue))
registerAbortHandler(store, nextValue, onAbort)
registerAbortHandler(buildingBlocks, nextValue, onAbort)
} else {
resolve(nextValue)
}
Expand All @@ -94,7 +94,7 @@ const createContinuablePromise = <T>(
}
}
promise.then(onFulfilled(promise), onRejected(promise))
registerAbortHandler(store, promise, onAbort)
registerAbortHandler(buildingBlocks, promise, onAbort)
})
continuablePromiseMap.set(promise, continuablePromise)
}
Expand Down
Loading
Loading