feat: use new store by default (#2641)

pmndrs · Jul 9, 2024 · 1a40452 · 1a40452
1 parent 4db874c
commit 1a40452
Show file tree

Hide file tree

Showing 11 changed files with 507 additions and 1,521 deletions.
diff --git a/package.json b/package.json
@@ -72,15 +72,14 @@
     "build:vanilla:utils": "rollup -c --config-vanilla_utils",
     "build:react": "rollup -c --config-react --client-only",
     "build:react:utils": "rollup -c --config-react_utils --client-only",
-    "build:experimental": "rollup -c --config-experimental",
     "postbuild": "pnpm patch-d-ts && pnpm copy && pnpm patch-ts3.8 && pnpm patch-old-ts && pnpm patch-esm-ts && pnpm patch-readme",
     "prettier": "prettier '*.{js,json,md}' '{src,tests,benchmarks,docs}/**/*.{ts,tsx,md,mdx}' --write",
     "eslint": "eslint --fix --no-eslintrc --c .eslintrc.json '*.{js,json,ts}' '{src,tests,benchmarks}/**/*.{ts,tsx}'",
     "test": "pnpm run '/^test:.*/'",
     "test:format": "prettier '*.{js,json,md}' '{src,tests,benchmarks,docs}/**/*.{ts,tsx,md,mdx}' --list-different",
     "test:types": "tsc --noEmit",
     "test:lint": "eslint --no-eslintrc --c .eslintrc.json '*.{js,json,ts}' '{src,tests,benchmarks}/**/*.{ts,tsx}'",
-    "test:spec": "vitest run && USE_STORE2=true vitest run",
+    "test:spec": "vitest run",
     "test-build:spec": "vitest run",
     "patch-d-ts": "node -e \"var {entries}=require('./rollup.config.js');require('shelljs').find('dist/**/*.d.ts').forEach(f=>{entries.forEach(({find,replacement})=>require('shelljs').sed('-i',new RegExp(' from \\''+find.source.slice(0,-1)+'\\';$'),' from \\''+replacement+'\\';',f));require('shelljs').sed('-i',/ from '(\\.[^']+)\\.ts';$/,' from \\'\\$1\\';',f)})\"",
     "copy": "shx cp -r dist/src/* dist/esm && shx cp -r dist/src/* dist && shx rm -rf dist/src && shx rm -rf dist/{src,tests} && downlevel-dts dist dist/ts3.8 --to=3.8 && shx cp package.json readme.md LICENSE dist && json -I -f dist/package.json -e \"this.private=false; this.devDependencies=undefined; this.optionalDependencies=undefined; this.scripts=undefined; this.prettier=undefined;\"",

diff --git a/rollup.config.js b/rollup.config.js
@@ -76,7 +76,6 @@ function createESMConfig(input, output, clientOnly) {
               'import.meta.env?.MODE':
                 '(import.meta.env ? import.meta.env.MODE : undefined)',
             }),
-        'import.meta.env?.USE_STORE2': 'false',
         delimiters: ['\\b', '\\b(?!(\\.|/))'],
         preventAssignment: true,
       }),
@@ -96,7 +95,6 @@ function createCommonJSConfig(input, output, clientOnly) {
       resolve({ extensions }),
       replace({
         'import.meta.env?.MODE': 'process.env.NODE_ENV',
-        'import.meta.env?.USE_STORE2': 'false',
         delimiters: ['\\b', '\\b(?!(\\.|/))'],
         preventAssignment: true,
       }),
@@ -134,7 +132,6 @@ function createUMDConfig(input, output, env, clientOnly) {
       resolve({ extensions }),
       replace({
         'import.meta.env?.MODE': JSON.stringify(env),
-        'import.meta.env?.USE_STORE2': 'false',
         delimiters: ['\\b', '\\b(?!(\\.|/))'],
         preventAssignment: true,
       }),
@@ -158,7 +155,6 @@ function createSystemConfig(input, output, env, clientOnly) {
       resolve({ extensions }),
       replace({
         'import.meta.env?.MODE': JSON.stringify(env),
-        'import.meta.env?.USE_STORE2': 'false',
         delimiters: ['\\b', '\\b(?!(\\.|/))'],
         preventAssignment: true,
       }),

diff --git a/src/experimental.ts b/src/experimental.ts
diff --git a/src/types.d.ts b/src/types.d.ts
@@ -1,6 +1,5 @@
 declare interface ImportMeta {
   env?: {
     MODE: string
-    USE_STORE2?: string
   }
 }
diff --git a/src/vanilla.ts b/src/vanilla.ts
@@ -1,17 +1,7 @@
 export { atom } from './vanilla/atom.ts'
 export type { Atom, WritableAtom, PrimitiveAtom } from './vanilla/atom.ts'
 
-// export { createStore, getDefaultStore } from './vanilla/store.ts'
-import * as store from './vanilla/store.ts'
-import * as store2 from './vanilla/store2.ts'
-type CreateStore = typeof store.createStore
-type GetDefaultStore = typeof store.getDefaultStore
-export const createStore: CreateStore = import.meta.env?.USE_STORE2
-  ? store2.createStore
-  : store.createStore
-export const getDefaultStore: GetDefaultStore = import.meta.env?.USE_STORE2
-  ? store2.getDefaultStore
-  : store.getDefaultStore
+export { createStore, getDefaultStore } from './vanilla/store.ts'
 
 export type {
   Getter,