@bleedingdev/modern-js-plugin-tanstack 3.9.0-ultramodern.5 → 3.9.0-ultramodern.6

package/dist/cjs/runtime/register.js

@@ -30,10 +30,8 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     tanstackRouterProviderFactory: ()=>tanstackRouterProviderFactory
 });
-const router_provider_namespaceObject = require("@modern-js/runtime-extensions/router-provider");
 const external_plugin_js_namespaceObject = require("./plugin.js");
 const tanstackRouterProviderFactory = (userConfig)=>(0, external_plugin_js_namespaceObject.tanstackRouterPlugin)(userConfig);
-(0, router_provider_namespaceObject.registerRouterProvider)('tanstack', tanstackRouterProviderFactory);
 exports.tanstackRouterProviderFactory = __webpack_exports__.tanstackRouterProviderFactory;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "tanstackRouterProviderFactory"

package/dist/esm/runtime/register.mjs

@@ -1,5 +1,3 @@
-import { registerRouterProvider } from "@modern-js/runtime-extensions/router-provider";
 import { tanstackRouterPlugin } from "./plugin.mjs";
 const tanstackRouterProviderFactory = (userConfig)=>tanstackRouterPlugin(userConfig);
-registerRouterProvider('tanstack', tanstackRouterProviderFactory);
 export { tanstackRouterProviderFactory };

package/dist/esm-node/runtime/register.mjs

@@ -1,6 +1,4 @@
 import "node:module";
-import { registerRouterProvider } from "@modern-js/runtime-extensions/router-provider";
 import { tanstackRouterPlugin } from "./plugin.mjs";
 const tanstackRouterProviderFactory = (userConfig)=>tanstackRouterPlugin(userConfig);
-registerRouterProvider('tanstack', tanstackRouterProviderFactory);
 export { tanstackRouterProviderFactory };

package/dist/types/runtime/register.d.ts

@@ -1,10 +1,2 @@
-/**
- * Registers TanStack in the @modern-js/runtime compatibility registry.
- * Runtime entries bind the exported local factory into their own provider
- * realm; registration remains for older runtime wrappers and mixed cohorts.
- *
- * This module is intentionally side-effectful (see `sideEffects` in
- * package.json).
- */
 import { type RouterProviderFactory } from '@modern-js/runtime-extensions/router-provider';
 export declare const tanstackRouterProviderFactory: RouterProviderFactory;

package/package.json

@@ -18,7 +18,7 @@
     "modern.js",
     "tanstack-router"
   ],
-  "version": "3.9.0-ultramodern.5",
+  "version": "3.9.0-ultramodern.6",
   "engines": {
     "node": ">=20"
   },
@@ -94,19 +94,19 @@
     }
   },
   "dependencies": {
-    "@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.9.0-ultramodern.5",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.5",
-    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.0-ultramodern.5",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.5",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.5",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.5",
+    "@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.9.0-ultramodern.6",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.6",
+    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.0-ultramodern.6",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.6",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.6",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.6",
     "@swc/helpers": "^0.5.23",
     "@tanstack/react-router": "1.170.33",
     "@tanstack/router-core": "1.171.28"
   },
   "peerDependencies": {
-    "@modern-js/app-tools": "3.9.0-ultramodern.5",
-    "@modern-js/runtime": "3.9.0-ultramodern.5",
+    "@modern-js/app-tools": "3.9.0-ultramodern.6",
+    "@modern-js/runtime": "3.9.0-ultramodern.6",
     "react": "^19.2.8",
     "react-dom": "^19.2.8",
     "react-server-dom-rspack": "0.1.0"
@@ -117,9 +117,9 @@
     }
   },
   "devDependencies": {
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.5",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.9.0-ultramodern.5",
-    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.9.0-ultramodern.5",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.6",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.9.0-ultramodern.6",
+    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.9.0-ultramodern.6",
     "@rslib/core": "1.0.0",
     "@scripts/rstest-config": "2.66.0",
     "@tanstack/history": "1.162.2",

package/rstest.config.mts

@@ -1,4 +1,3 @@
-import path from 'node:path';
 import type { ProjectConfig } from '@rstest/core';
 import { withTestPreset } from '@scripts/rstest-config';
 
@@ -42,20 +41,6 @@ export default {
       ],
       extends: commonConfig,
     }),
-    withTestPreset({
-      name: 'plugin-tanstack-router-compatibility',
-      testEnvironment: 'node',
-      include: ['tests/router/routerCompatibility.test.ts'],
-      resolve: {
-        alias: {
-          '@modern-js/runtime/router/internal': path.resolve(
-            __dirname,
-            'tests/router/fixtures/legacyRuntimeRouter.ts',
-          ),
-        },
-      },
-      extends: commonConfig,
-    }),
     withTestPreset({
       name: 'plugin-tanstack-client',
       testEnvironment: 'happy-dom',

package/src/runtime/register.ts

@@ -1,15 +1,6 @@
-/**
- * Registers TanStack in the @modern-js/runtime compatibility registry.
- * Runtime entries bind the exported local factory into their own provider
- * realm; registration remains for older runtime wrappers and mixed cohorts.
- *
- * This module is intentionally side-effectful (see `sideEffects` in
- * package.json).
- */
 import {
   type RouterProviderFactory,
   type RouterProviderPlugin,
-  registerRouterProvider,
 } from '@modern-js/runtime-extensions/router-provider';
 import { tanstackRouterPlugin } from './plugin';
 
@@ -22,5 +13,3 @@ import { tanstackRouterPlugin } from './plugin';
 export const tanstackRouterProviderFactory: RouterProviderFactory =
   userConfig =>
     tanstackRouterPlugin(userConfig) as unknown as RouterProviderPlugin;
-
-registerRouterProvider('tanstack', tanstackRouterProviderFactory);

package/tests/realm-isolation.test.ts

@@ -2,11 +2,6 @@ import type { RouterProviderFactory } from '@modern-js/runtime-extensions/router
 import { rstest } from '@rstest/core';
 import type { RouterExtendsHooks } from '../src/runtime/hooks';
 
-const REGISTRY_SLOT: unique symbol = Symbol.for(
-  '@modern-js/runtime:router-providers:v3',
-);
-const host = globalThis as { [REGISTRY_SLOT]?: unknown };
-
 type RuntimeContextModule = typeof import('@modern-js/runtime/context');
 type RouterModule = typeof import('../src/runtime/router');
 
@@ -71,7 +66,6 @@ function setupRouterWrapper(vertical: Vertical) {
 
 describe('TanStack provider runtime-realm isolation', () => {
   beforeEach(() => {
-    delete host[REGISTRY_SLOT];
     rstest.resetModules();
     (
       globalThis as typeof globalThis & {
@@ -81,7 +75,6 @@ describe('TanStack provider runtime-realm isolation', () => {
   });
 
   afterEach(() => {
-    delete host[REGISTRY_SLOT];
     rstest.resetModules();
   });
 
@@ -104,15 +97,6 @@ describe('TanStack provider runtime-realm isolation', () => {
       expect(routerB.useMatches).toBe(verticalB.useMatches);
       expect(routerB.Link).not.toBe(verticalA.Link);
       expect(routerB.useMatches).not.toBe(verticalA.useMatches);
-
-      // Mixed-version callers that do not supply a realm still see the shared
-      // keep-first fallback, but production wrappers no longer consume it.
-      expect(verticalB.providers.resolveRouterProvider('tanstack')).toBe(
-        verticalA.factory,
-      );
-      expect(warnSpy).toHaveBeenCalledWith(
-        expect.stringMatching(/keeping the first registration/),
-      );
     } finally {
       warnSpy.mockRestore();
     }

package/tests/router/fixtures/legacyRuntimeRouter.ts

@@ -1,10 +0,0 @@
-let invocationCount = 0;
-
-export const routerPlugin = (
-  _userConfig: Record<string, unknown> = {},
-): { name?: string; setup?: (...args: unknown[]) => unknown } => {
-  invocationCount += 1;
-  throw new Error('The legacy global router wrapper must not be invoked.');
-};
-
-export const getLegacyRouterPluginInvocationCount = () => invocationCount;

package/tests/router/register.test.ts

@@ -1,8 +0,0 @@
-import { resolveRouterProvider } from '@modern-js/runtime-extensions/router-provider';
-import '../../src/runtime/register';
-
-describe("'@modern-js/plugin-tanstack/runtime' import side effects", () => {
-  it('registers the tanstack router provider', () => {
-    expect(typeof resolveRouterProvider('tanstack')).toBe('function');
-  });
-});

package/tests/router/routerCompatibility.test.ts

@@ -1,262 +0,0 @@
-import { execFileSync } from 'node:child_process';
-import {
-  mkdirSync,
-  mkdtempSync,
-  readFileSync,
-  rmSync,
-  writeFileSync,
-} from 'node:fs';
-import { tmpdir } from 'node:os';
-import path from 'node:path';
-
-const REGISTRY_SLOT: unique symbol = Symbol.for(
-  '@modern-js/runtime:router-providers:v3',
-);
-const registryHost = globalThis as { [REGISTRY_SLOT]?: unknown };
-const webpackHost = globalThis as typeof globalThis & {
-  __webpack_require__?: { u: (chunkId: unknown) => string };
-};
-const installWebpackRequire = () => {
-  webpackHost.__webpack_require__ = { u: chunkId => String(chunkId) };
-};
-
-type LegacyRuntimeRouterModule = {
-  getLegacyRouterPluginInvocationCount: () => number;
-  routerPlugin: (...args: unknown[]) => unknown;
-};
-
-type CompatibilityGraph = {
-  factory: (...args: any[]) => any;
-  Link: unknown;
-  hooks: Record<string, unknown>;
-  legacyRuntimeRouter: LegacyRuntimeRouterModule;
-  resolveRouterProvider: (
-    framework?: string,
-  ) => (...args: unknown[]) => unknown;
-  routerPlugin: (...args: any[]) => any;
-};
-
-async function loadCompatibilityGraph(): Promise<CompatibilityGraph> {
-  rstest.resetModules();
-  installWebpackRequire();
-
-  const legacyRuntimeRouter = (await import(
-    '@modern-js/runtime/router/internal'
-  )) as unknown as LegacyRuntimeRouterModule;
-  const { routerPlugin } = await import('../../src/runtime/router');
-  const { tanstackRouterProviderFactory } = await import(
-    '../../src/runtime/register'
-  );
-  const { resolveRouterProvider } = await import(
-    '@modern-js/runtime-extensions/router-provider'
-  );
-  const { routerProviderRegistryHooks } = await import(
-    '../../src/runtime/hooks'
-  );
-  const { Link } = await import('../../src/runtime/prefetchLink');
-
-  return {
-    factory: tanstackRouterProviderFactory,
-    Link,
-    hooks: routerProviderRegistryHooks,
-    legacyRuntimeRouter,
-    resolveRouterProvider,
-    routerPlugin,
-  };
-}
-
-function initializeRouter(graph: CompatibilityGraph) {
-  const beforeRender: ((context: any, interrupt: () => void) => unknown)[] = [];
-  const plugin = graph.routerPlugin({ framework: 'tanstack' });
-  plugin.setup({
-    getHooks: () => graph.hooks,
-    getRuntimeConfig: () => ({ router: { framework: 'tanstack' } }),
-    onAfterCreateRouter: () => undefined,
-    onBeforeRender: (
-      callback: (context: any, interrupt: () => void) => unknown,
-    ) => beforeRender.push(callback),
-    wrapRoot: () => undefined,
-  });
-  const context: any = {};
-  for (const callback of beforeRender) callback(context, () => {});
-  return context.router as { Link: unknown };
-}
-
-function resolveTsgoBin(): string {
-  const packageJsonPath = require.resolve(
-    '@typescript/native-preview/package.json',
-  );
-  const packageDirectory = path.dirname(packageJsonPath);
-  const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8')) as {
-    bin?: string | { tsgo?: string };
-  };
-  const binEntry =
-    typeof packageJson.bin === 'string'
-      ? packageJson.bin
-      : packageJson.bin?.tsgo;
-
-  return path.resolve(packageDirectory, binEntry ?? 'bin/tsgo.js');
-}
-
-function runTsgo(tsgoBin: string, configPath: string): void {
-  try {
-    execFileSync(process.execPath, [tsgoBin, '-p', configPath], {
-      stdio: 'pipe',
-    });
-  } catch (error) {
-    const result = error as { stderr?: Buffer; stdout?: Buffer };
-    throw new Error(
-      `TS-Go compatibility check failed:\n${String(result.stdout ?? '')}${String(
-        result.stderr ?? '',
-      )}`,
-    );
-  }
-}
-
-installWebpackRequire();
-
-describe('runtime router compatibility', () => {
-  beforeEach(() => {
-    delete registryHost[REGISTRY_SLOT];
-    rstest.resetModules();
-    installWebpackRequire();
-  });
-
-  afterEach(() => {
-    delete registryHost[REGISTRY_SLOT];
-  });
-
-  it('uses the app-local factory instead of the legacy global wrapper', async () => {
-    const graph = await loadCompatibilityGraph();
-
-    expect('createRouterPlugin' in graph.legacyRuntimeRouter).toBe(false);
-    expect(initializeRouter(graph).Link).toBe(graph.Link);
-    expect(
-      graph.legacyRuntimeRouter.getLegacyRouterPluginInvocationCount(),
-    ).toBe(0);
-  });
-
-  it('keeps independently evaluated legacy module graphs app-local', async () => {
-    const graphA = await loadCompatibilityGraph();
-    const graphB = await loadCompatibilityGraph();
-
-    expect(graphB.factory).not.toBe(graphA.factory);
-    expect(graphB.routerPlugin).not.toBe(graphA.routerPlugin);
-    expect(graphB.resolveRouterProvider('tanstack')).toBe(graphA.factory);
-    expect(initializeRouter(graphA).Link).toBe(graphA.Link);
-    expect(initializeRouter(graphB).Link).toBe(graphB.Link);
-    expect(
-      graphA.legacyRuntimeRouter.getLegacyRouterPluginInvocationCount(),
-    ).toBe(0);
-    expect(
-      graphB.legacyRuntimeRouter.getLegacyRouterPluginInvocationCount(),
-    ).toBe(0);
-  });
-
-  it('emits declarations compatible with the oldest runtime router shape', () => {
-    const packageRoot = path.resolve(__dirname, '../..');
-    const sourcePath = path.join(packageRoot, 'src/runtime/router.ts');
-    const legacyFixturePath = path.join(
-      __dirname,
-      'fixtures/legacyRuntimeRouter.ts',
-    );
-    const tempRoot = mkdtempSync(
-      path.join(tmpdir(), 'plugin-tanstack-router-compatibility-'),
-    );
-    const sourceRoot = path.join(tempRoot, 'src');
-    const emittedRoot = path.join(tempRoot, 'types');
-    const tsgoBin = resolveTsgoBin();
-
-    try {
-      mkdirSync(sourceRoot, { recursive: true });
-      writeFileSync(
-        path.join(sourceRoot, 'router.ts'),
-        readFileSync(sourcePath, 'utf8'),
-      );
-      writeFileSync(
-        path.join(sourceRoot, 'register.ts'),
-        [
-          'export declare const tanstackRouterProviderFactory:',
-          '  (userConfig?: Record<string, unknown>) => { name?: string };',
-        ].join('\n'),
-      );
-      writeFileSync(
-        path.join(tempRoot, 'currentRuntimeRouter.d.ts'),
-        [
-          'export type RouterPluginFactory =',
-          '  (userConfig?: Record<string, unknown>) => { name?: string };',
-          'export declare const routerPlugin: RouterPluginFactory;',
-          'export declare const createRouterPlugin:',
-          '  (providers: readonly unknown[]) => RouterPluginFactory;',
-        ].join('\n'),
-      );
-      writeFileSync(
-        path.join(tempRoot, 'emit.json'),
-        JSON.stringify(
-          {
-            compilerOptions: {
-              declaration: true,
-              emitDeclarationOnly: true,
-              module: 'Preserve',
-              moduleResolution: 'Bundler',
-              noCheck: true,
-              outDir: emittedRoot,
-              paths: {
-                '@modern-js/runtime/router/internal': [
-                  './currentRuntimeRouter.d.ts',
-                ],
-              },
-              rootDir: sourceRoot,
-              skipLibCheck: false,
-              strict: true,
-              target: 'ESNext',
-              types: [],
-            },
-            files: [path.join(sourceRoot, 'router.ts')],
-          },
-          null,
-          2,
-        ),
-      );
-
-      runTsgo(tsgoBin, path.join(tempRoot, 'emit.json'));
-
-      const declarationPath = path.join(emittedRoot, 'router.d.ts');
-      writeFileSync(
-        path.join(tempRoot, 'legacyRuntimeRouter.ts'),
-        readFileSync(legacyFixturePath, 'utf8'),
-      );
-      writeFileSync(
-        path.join(tempRoot, 'compatibility.json'),
-        JSON.stringify(
-          {
-            compilerOptions: {
-              module: 'Preserve',
-              moduleResolution: 'Bundler',
-              noEmit: true,
-              paths: {
-                '@modern-js/runtime/router/internal': [
-                  './legacyRuntimeRouter.ts',
-                ],
-              },
-              skipLibCheck: false,
-              strict: true,
-              target: 'ESNext',
-              types: [],
-            },
-            files: [
-              declarationPath,
-              path.join(tempRoot, 'legacyRuntimeRouter.ts'),
-            ],
-          },
-          null,
-          2,
-        ),
-      );
-
-      runTsgo(tsgoBin, path.join(tempRoot, 'compatibility.json'));
-    } finally {
-      rmSync(tempRoot, { force: true, recursive: true });
-    }
-  });
-});