diff --git a/.github/labeler.yml b/.github/labeler.yml index db16026fbdd..cc81cd4e699 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -10,8 +10,6 @@ - 'packages/eslint-plugin-router/**/*' 'package: history': - 'packages/history/**/*' -'package: react-cross-context': - - 'packages/react-cross-context/**/*' 'package: react-router': - 'packages/react-router/**/*' 'package: react-router-with-query': @@ -32,8 +30,6 @@ - 'packages/router-vite-plugin/**/*' 'package: server-functions-plugin': - 'packages/server-functions-plugin/**/*' -'package: solid-cross-context': - - 'packages/solid-cross-context/**/*' 'package: solid-router': - 'packages/solid-router/**/*' 'package: start': diff --git a/package.json b/package.json index e6976896fc2..2ad958c63f1 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,6 @@ "use-sync-external-store": "1.2.2", "@tanstack/history": "workspace:*", "@tanstack/router-core": "workspace:*", - "@tanstack/react-cross-context": "workspace:*", "@tanstack/react-router": "workspace:*", "@tanstack/router-cli": "workspace:*", "@tanstack/router-devtools": "workspace:*", diff --git a/packages/react-cross-context/eslint.config.js b/packages/react-cross-context/eslint.config.js deleted file mode 100644 index 8ce6ad05fcd..00000000000 --- a/packages/react-cross-context/eslint.config.js +++ /dev/null @@ -1,5 +0,0 @@ -// @ts-check - -import rootConfig from '../../eslint.config.js' - -export default [...rootConfig] diff --git a/packages/react-cross-context/package.json b/packages/react-cross-context/package.json deleted file mode 100644 index c51eba82e91..00000000000 --- a/packages/react-cross-context/package.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "name": "@tanstack/react-cross-context", - "version": "1.99.0", - "description": "Modern and scalable routing for React applications", - "author": "Tanner Linsley", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/TanStack/router.git", - "directory": "packages/react-cross-context" - }, - "homepage": "https://tanstack.com/router", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - }, - "scripts": { - "clean": "rimraf ./dist && rimraf ./coverage", - "test:eslint": "eslint ./src", - "test:types": "pnpm run \"/^test:types:ts[0-9]{2}$/\"", - "test:types:ts52": "node ../../node_modules/typescript52/lib/tsc.js", - "test:types:ts53": "node ../../node_modules/typescript53/lib/tsc.js", - "test:types:ts54": "node ../../node_modules/typescript54/lib/tsc.js", - "test:types:ts55": "node ../../node_modules/typescript55/lib/tsc.js", - "test:types:ts56": "node ../../node_modules/typescript56/lib/tsc.js", - "test:types:ts57": "tsc", - "test:build": "publint --strict && attw --ignore-rules no-resolution --pack .", - "build": "vite build" - }, - "type": "module", - "types": "dist/esm/index.d.ts", - "main": "dist/cjs/index.cjs", - "module": "dist/esm/index.js", - "exports": { - ".": { - "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" - }, - "require": { - "types": "./dist/cjs/index.d.cts", - "default": "./dist/cjs/index.cjs" - } - }, - "./package.json": "./package.json" - }, - "sideEffects": false, - "files": [ - "dist", - "src" - ], - "devDependencies": { - "@vitejs/plugin-react": "^4.3.4", - "react": "^19.0.0", - "react-dom": "^19.0.0" - }, - "peerDependencies": { - "react": ">=18.0.0 || >=19.0.0", - "react-dom": ">=18.0.0 || >=19.0.0" - } -} diff --git a/packages/react-cross-context/src/Context.ts b/packages/react-cross-context/src/Context.ts deleted file mode 100644 index bac325db173..00000000000 --- a/packages/react-cross-context/src/Context.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { createContext } from 'react' - -class Context { - cache = new Map() - - private static instance: Context | undefined - - public static create(): Context { - if (!Context.instance) { - Context.instance = new Context() - } - - return Context.instance - } - - private createContext(key: string, initialValue: T) { - const context = createContext(initialValue) - - this.cache.set(key, context) - - return context - } - - get(key: string, initialValue?: T) { - return this.cache.get(key) || this.createContext(key, initialValue) - } -} - -const context = Context.create() - -export default context diff --git a/packages/react-cross-context/src/index.ts b/packages/react-cross-context/src/index.ts deleted file mode 100644 index cd372404e0d..00000000000 --- a/packages/react-cross-context/src/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import Context from './Context' - -export { Context } diff --git a/packages/react-cross-context/tsconfig.json b/packages/react-cross-context/tsconfig.json deleted file mode 100644 index 2f40bc97159..00000000000 --- a/packages/react-cross-context/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "jsx": "react-jsx" - }, - "include": ["src", "vite.config.ts"] -} diff --git a/packages/react-cross-context/vite.config.ts b/packages/react-cross-context/vite.config.ts deleted file mode 100644 index fd79635ec6e..00000000000 --- a/packages/react-cross-context/vite.config.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { defineConfig, mergeConfig } from 'vitest/config' -import { tanstackViteConfig } from '@tanstack/config/vite' -import react from '@vitejs/plugin-react' -import type { UserConfig } from 'vitest/config' - -const config = defineConfig({ - plugins: [react()] as UserConfig['plugins'], -}) - -export default mergeConfig( - config, - tanstackViteConfig({ - entry: './src/index.ts', - srcDir: './src', - }), -) diff --git a/packages/solid-cross-context/eslint.config.js b/packages/solid-cross-context/eslint.config.js deleted file mode 100644 index 8ce6ad05fcd..00000000000 --- a/packages/solid-cross-context/eslint.config.js +++ /dev/null @@ -1,5 +0,0 @@ -// @ts-check - -import rootConfig from '../../eslint.config.js' - -export default [...rootConfig] diff --git a/packages/solid-cross-context/package.json b/packages/solid-cross-context/package.json deleted file mode 100644 index 643561fe51b..00000000000 --- a/packages/solid-cross-context/package.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "name": "@tanstack/solid-cross-context", - "version": "1.111.0", - "description": "Modern and scalable routing for React applications", - "author": "Tanner Linsley", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/TanStack/router.git", - "directory": "packages/solid-cross-context" - }, - "homepage": "https://tanstack.com/router", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - }, - "scripts": { - "clean": "rimraf ./dist && rimraf ./coverage", - "test:eslint": "eslint ./src", - "test:types": "pnpm run \"/^test:types:ts[0-9]{2}$/\"", - "test:types:ts52": "node ../../node_modules/typescript52/lib/tsc.js", - "test:types:ts53": "node ../../node_modules/typescript53/lib/tsc.js", - "test:types:ts54": "node ../../node_modules/typescript54/lib/tsc.js", - "test:types:ts55": "node ../../node_modules/typescript55/lib/tsc.js", - "test:types:ts56": "node ../../node_modules/typescript56/lib/tsc.js", - "test:types:ts57": "tsc", - "test:build": "publint --strict && attw --ignore-rules no-resolution --pack .", - "build": "vite build" - }, - "type": "module", - "types": "dist/esm/index.d.ts", - "main": "dist/cjs/index.cjs", - "module": "dist/esm/index.js", - "exports": { - ".": { - "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" - }, - "require": { - "types": "./dist/cjs/index.d.cts", - "default": "./dist/cjs/index.cjs" - } - }, - "./package.json": "./package.json" - }, - "sideEffects": false, - "files": [ - "dist", - "src" - ], - "devDependencies": { - "vite-plugin-solid": "^2.0.0", - "solid-js": "^1.0.0" - } -} diff --git a/packages/solid-cross-context/src/Context.ts b/packages/solid-cross-context/src/Context.ts deleted file mode 100644 index e5c0d7681d5..00000000000 --- a/packages/solid-cross-context/src/Context.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { createContext } from 'solid-js' - -class Context { - cache = new Map() - - private static instance: Context | undefined - - public static create(): Context { - if (!Context.instance) { - Context.instance = new Context() - } - - return Context.instance - } - - private createContext(key: string, initialValue: T) { - const context = createContext(initialValue) - - this.cache.set(key, context) - - return context - } - - get(key: string, initialValue?: T) { - return this.cache.get(key) || this.createContext(key, initialValue) - } -} - -const context = Context.create() - -export default context diff --git a/packages/solid-cross-context/src/index.ts b/packages/solid-cross-context/src/index.ts deleted file mode 100644 index cd372404e0d..00000000000 --- a/packages/solid-cross-context/src/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import Context from './Context' - -export { Context } diff --git a/packages/solid-cross-context/tsconfig.json b/packages/solid-cross-context/tsconfig.json deleted file mode 100644 index 1b802b64d18..00000000000 --- a/packages/solid-cross-context/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "jsx": "preserve", - "jsxImportSource": "solid-js" - }, - "include": ["src", "vite.config.ts"] -} diff --git a/packages/solid-cross-context/vite.config.ts b/packages/solid-cross-context/vite.config.ts deleted file mode 100644 index cebdd86ee42..00000000000 --- a/packages/solid-cross-context/vite.config.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { defineConfig, mergeConfig } from 'vitest/config' -import { tanstackViteConfig } from '@tanstack/config/vite' -import solid from 'vite-plugin-solid' -import type { UserConfig } from 'vitest/config' - -const config = defineConfig({ - plugins: [solid()] as UserConfig['plugins'], - build: { - rollupOptions: { - external: ['solid-js'], - }, - }, -}) - -export default mergeConfig( - config, - tanstackViteConfig({ - entry: './src/index.ts', - srcDir: './src', - }), -) diff --git a/packages/start-client/package.json b/packages/start-client/package.json index 3b9e58c9abb..b4f65d2f352 100644 --- a/packages/start-client/package.json +++ b/packages/start-client/package.json @@ -63,7 +63,6 @@ "node": ">=12" }, "dependencies": { - "@tanstack/react-cross-context": "workspace:^", "@tanstack/react-router": "workspace:^", "cookie-es": "^1.2.2", "jsesc": "^3.1.0", diff --git a/packages/start-server/package.json b/packages/start-server/package.json index aa4fd9179e0..6f1cab38098 100644 --- a/packages/start-server/package.json +++ b/packages/start-server/package.json @@ -62,7 +62,6 @@ "node": ">=12" }, "dependencies": { - "@tanstack/react-cross-context": "workspace:^", "@tanstack/react-router": "workspace:^", "@tanstack/start-client": "workspace:^", "h3": "1.13.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 96ed9f024d3..02c486af531 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,7 +15,6 @@ overrides: '@tanstack/react-query': 5.66.0 '@tanstack/history': workspace:* '@tanstack/router-core': workspace:* - '@tanstack/react-cross-context': workspace:* '@tanstack/react-router': workspace:* '@tanstack/router-cli': workspace:* '@tanstack/router-devtools': workspace:* @@ -4831,18 +4830,6 @@ importers: packages/history: {} - packages/react-cross-context: - devDependencies: - '@vitejs/plugin-react': - specifier: ^4.3.4 - version: 4.3.4(vite@6.1.0(@types/node@22.13.4)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0)) - react: - specifier: ^19.0.0 - version: 19.0.0 - react-dom: - specifier: ^19.0.0 - version: 19.0.0(react@19.0.0) - packages/react-router: dependencies: '@tanstack/history': @@ -5243,9 +5230,6 @@ importers: packages/start-client: dependencies: - '@tanstack/react-cross-context': - specifier: workspace:* - version: link:../react-cross-context '@tanstack/react-router': specifier: workspace:* version: link:../react-router @@ -5393,9 +5377,6 @@ importers: packages/start-server: dependencies: - '@tanstack/react-cross-context': - specifier: workspace:* - version: link:../react-cross-context '@tanstack/react-router': specifier: workspace:* version: link:../react-router diff --git a/scripts/publish.js b/scripts/publish.js index 2aa957d4755..92cbd057264 100644 --- a/scripts/publish.js +++ b/scripts/publish.js @@ -64,14 +64,6 @@ await publish({ name: '@tanstack/router-vite-plugin', packageDir: 'packages/router-vite-plugin', }, - { - name: '@tanstack/react-cross-context', - packageDir: 'packages/react-cross-context', - }, - { - name: '@tanstack/solid-cross-context', - packageDir: 'packages/solid-cross-context', - }, { name: '@tanstack/directive-functions-plugin', packageDir: 'packages/directive-functions-plugin',