feat: add support node next typings; BREAKING_CHANGE: remove all deprecated exports from 1.*.* version

js2me · js2me · commit e65d9985dd5a · 2025-04-16T08:41:19.000+03:00
diff --git a/package.json b/package.json
@@ -36,8 +36,10 @@
     "type": "git",
     "url": "git://github.com/js2me/mobx-wouter"
   },
+  "type": "module",
   "dependencies": {
-    "mobx-location-history": "^2.0.10"
+    "mobx-location-history": "^2.0.11",
+    "yummies": "^3.1.3"
   },
   "peerDependencies": {
     "mobx": "^6.12.4",
@@ -59,8 +61,7 @@
     "jsdom": "^25.0.1",
     "rimraf": "^6.0.1",
     "typescript": "^5.7.3",
-    "vitest": "^2.1.8",
-    "yummies": "^3.1.3"
+    "vitest": "^2.1.8"
   },
   "packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/hoc/index.ts b/src/hoc/index.ts
@@ -1,2 +1,2 @@
-export * from './with-page-view-model';
-export * from './with-lazy-page-view-model';
+export * from './with-page-view-model.js';
+export * from './with-lazy-page-view-model.js';
diff --git a/src/hoc/with-lazy-page-view-model.test.tsx b/src/hoc/with-lazy-page-view-model.test.tsx
@@ -2,10 +2,10 @@ import { act, render, screen } from '@testing-library/react';
 import { describe, expect, test } from 'vitest';
 import { createCounter } from 'yummies/complex/counter';
 
-import { PageViewModelBaseMock } from '../page-view-model/page-view-model.base.test';
+import { PageViewModelBaseMock } from '../page-view-model/page-view-model.base.test.js';
 
-import { withLazyPageViewModel } from './with-lazy-page-view-model';
-import { PageViewModelProps } from './with-page-view-model';
+import { withLazyPageViewModel } from './with-lazy-page-view-model.js';
+import { PageViewModelProps } from './with-page-view-model.js';
 
 const createIdGenerator = (prefix?: string) => {
   const counter = createCounter();
diff --git a/src/hoc/with-lazy-page-view-model.tsx b/src/hoc/with-lazy-page-view-model.tsx
@@ -6,9 +6,9 @@ import {
 import { LoadableMixin } from 'mobx-view-model/lib/react-simple-loadable';
 import { ComponentProps, ComponentType } from 'react';
 
-import { AnyPageViewModel, PageViewModel } from '../page-view-model';
+import { AnyPageViewModel, PageViewModel } from '../page-view-model/index.js';
 
-import { ComponentWithPageViewModel } from './with-page-view-model';
+import { ComponentWithPageViewModel } from './with-page-view-model.js';
 
 export type ComponentWithLazyPageViewModel<
   TViewModel extends AnyPageViewModel,
diff --git a/src/hoc/with-page-view-model.test.tsx b/src/hoc/with-page-view-model.test.tsx
@@ -2,9 +2,12 @@ import { act, render, screen } from '@testing-library/react';
 import { describe, expect, test } from 'vitest';
 import { createCounter } from 'yummies/complex/counter';
 
-import { PageViewModelBaseMock } from '../page-view-model/page-view-model.base.test';
+import { PageViewModelBaseMock } from '../page-view-model/page-view-model.base.test.js';
 
-import { PageViewModelProps, withPageViewModel } from './with-page-view-model';
+import {
+  PageViewModelProps,
+  withPageViewModel,
+} from './with-page-view-model.js';
 
 const createIdGenerator = (prefix?: string) => {
   const counter = createCounter();
diff --git a/src/hoc/with-page-view-model.tsx b/src/hoc/with-page-view-model.tsx
@@ -5,10 +5,10 @@ import {
   ViewModelProps,
   withViewModel,
 } from 'mobx-view-model';
-import { AnyObject, Class, RenameKey } from 'mobx-view-model/utils/types';
 import { ComponentType, ReactNode } from 'react';
+import type { AnyObject, Class, RenameKey } from 'yummies/utils/types';
 
-import type { AnyPageViewModel } from '../page-view-model';
+import type { AnyPageViewModel } from '../page-view-model/index.js';
 
 export type PageViewModelProps<TPageVM extends AnyPageViewModel> =
   ViewModelProps<TPageVM>;
diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1,4 @@
 export * from 'mobx-location-history';
-export * from './router';
-export * from './page-view-model';
-export * from './hoc';
+export * from './router/index.js';
+export * from './page-view-model/index.js';
+export * from './hoc/index.js';
diff --git a/src/page-view-model/index.ts b/src/page-view-model/index.ts
@@ -1,10 +1,3 @@
-import { PageViewModelBase } from './page-view-model.base';
-
-export * from './page-view-model';
-export * from './page-view-model.base';
-export * from './page-view-model.types';
-
-/**
- * @deprecated Will be removed in 2.0.0 releases. Please use {@link PageViewModelBase} instead
- */
-export const PageViewModelImpl = PageViewModelBase;
+export * from './page-view-model.js';
+export * from './page-view-model.base.js';
+export * from './page-view-model.types.js';
diff --git a/src/page-view-model/page-view-model.base.test.ts b/src/page-view-model/page-view-model.base.test.ts
@@ -2,8 +2,8 @@ import { AnyViewModel } from 'mobx-view-model';
 import { describe, expect, test } from 'vitest';
 import { EmptyObject } from 'yummies/utils/types';
 
-import { PageViewModelBase } from './page-view-model.base';
-import { AnyPathParams } from './page-view-model.types';
+import { PageViewModelBase } from './page-view-model.base.js';
+import { AnyPathParams } from './page-view-model.types.js';
 
 export class PageViewModelBaseMock<
   Params extends AnyPathParams = EmptyObject,
diff --git a/src/page-view-model/page-view-model.base.ts b/src/page-view-model/page-view-model.base.ts
@@ -1,8 +1,8 @@
 import { AnyViewModel, ViewModelBase } from 'mobx-view-model';
-import { EmptyObject } from 'mobx-view-model/utils/types';
+import type { EmptyObject } from 'yummies/utils/types';
 
-import { PageViewModel } from './page-view-model';
-import { AnyPathParams } from './page-view-model.types';
+import { PageViewModel } from './page-view-model.js';
+import { AnyPathParams } from './page-view-model.types.js';
 
 export class PageViewModelBase<
     Params extends AnyPathParams = EmptyObject,
diff --git a/src/page-view-model/page-view-model.ts b/src/page-view-model/page-view-model.ts
@@ -1,7 +1,7 @@
 import { AnyViewModel, ViewModel } from 'mobx-view-model';
-import { EmptyObject } from 'mobx-view-model/utils/types';
+import type { EmptyObject } from 'yummies/utils/types';
 
-import { AnyPathParams } from './page-view-model.types';
+import { AnyPathParams } from './page-view-model.types.js';
 
 export interface PageViewModel<
   Params extends AnyPathParams = EmptyObject,
diff --git a/src/page-view-model/page-view-model.types.ts b/src/page-view-model/page-view-model.types.ts
@@ -1,4 +1,4 @@
-import { PageViewModel } from './page-view-model';
+import { PageViewModel } from './page-view-model.js';
 
 export type AnyPageViewModel = PageViewModel<any, any>;
 
diff --git a/src/router/index.ts b/src/router/index.ts
@@ -1,2 +1,2 @@
-export * from './router.types';
-export * from './router';
+export * from './router.types.js';
+export * from './router.js';
diff --git a/src/router/router.test.ts b/src/router/router.test.ts
@@ -1,12 +1,12 @@
 import { MobxHistory } from 'mobx-location-history';
 import { beforeEach, describe, expect, test, vi } from 'vitest';
 
-import { MobxRouter } from './router';
+import { MobxRouter } from './router.js';
 import {
   RouterNavigateParams,
   RouterToConfig,
   RouterType,
-} from './router.types';
+} from './router.types.js';
 
 export class HistoryMock extends MobxHistory {
   spies = {
diff --git a/src/router/router.ts b/src/router/router.ts
@@ -16,7 +16,7 @@ import {
   RouterPath,
   RouterToConfig,
   RouterType,
-} from './router.types';
+} from './router.types.js';
 
 export class MobxRouter implements IMobxRouter {
   history: IMobxHistory;
diff --git a/src/router/router.types.ts b/src/router/router.types.ts
@@ -3,7 +3,6 @@ import {
   IMobxLocation,
   IQueryParams,
 } from 'mobx-location-history';
-import { AnyObject } from 'mobx-view-model/utils/types';
 
 export interface IMobxRouter {
   history: IMobxHistory;
@@ -59,7 +58,7 @@ export interface RouterPath {
 export type RouterToConfig =
   | string
   | RouterPath
-  | { pathname: string; search?: AnyObject };
+  | { pathname: string; search?: Record<string, any> };
 
 export type RouterType = 'browser' | 'hash';
 
diff --git a/tsconfig.json b/tsconfig.json
@@ -13,8 +13,8 @@
     "allowSyntheticDefaultImports": true,
     "strict": true,
     "forceConsistentCasingInFileNames": true,
-    "module": "ESNext",
-    "moduleResolution": "Node",
+    "module": "NodeNext",
+    "moduleResolution": "nodenext",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "typeRoots": [
diff --git a/tsconfig.test.json b/tsconfig.test.json
@@ -13,8 +13,8 @@
     "allowSyntheticDefaultImports": true,
     "strict": true,
     "forceConsistentCasingInFileNames": true,
-    "module": "ESNext",
-    "moduleResolution": "Node",
+    "module": "NodeNext",
+    "moduleResolution": "nodenext",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "typeRoots": [
