Fix index.d.ts build, cleaning

Author: victortrusov

README.md

@@ -14,9 +14,8 @@ Wrapper for `react-router` that allows you to load data before switching the scr
 |  |  |  |
 | ------------ | ------- | --- |
 | react        | >= 16.8 |     |
-| react-dom    | >= 16.8 |     |
-| react-router | **5**       |  **Package version 0.x.x**  |
-| react-router | **6**       |  **Package version  1.x.x**  |
+| react-router | **^5.0.0** |  **Package version 0.x.x**  |
+| react-router | **^6.0.0** |  **Package version 1.x.x**  |
 
 This package uses `react-router` (`react-router-dom` or `react-router-native`) as main router so you should implement it in your project first.
 

examples/react-router-6/package.json

@@ -11,7 +11,7 @@
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "react-router-dom": "^6.3.0",
-    "react-router-loading": "1.0.0-beta.0"
+    "react-router-loading": "1.0.0-beta.2"
   },
   "devDependencies": {
     "@types/react": "^18.0.9",

package.json

@@ -3,9 +3,8 @@
   "private": true,
   "workspaces": {
     "packages": [
-      "packages/react-router-loading",
-      "examples/react-router-5/",
-      "examples/react-router-6/"
+      "packages/*",
+      "examples/*"
     ]
   },
   "devDependencies": {

packages/react-router-loading/lib/LoadingContext.ts

@@ -2,7 +2,7 @@ import { createContext } from 'react';
 
 // Interface
 
-interface LoadingContextActions {
+export interface LoadingContextActions {
   start: () => void;
   done: () => void;
   restart: () => void;

packages/react-router-loading/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router-loading",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "description": "Wrapper for react-router that allows you to load data before switching the screen",
   "author": "Victor Trusov",
   "repository": {
@@ -31,12 +31,12 @@
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
+    "build:types": "tsc --declaration --emitDeclarationOnly --allowSyntheticDefaultImports --esModuleInterop --isolatedModules false -jsx react-jsx --outFile dist/index.d.ts lib/index.ts",
     "preview": "vite preview",
-    "publish": "cp -fr ../../README.md . && npm publish"
+    "publish": "build && build:types && cp -fr ../../README.md . && npm publish"
   },
   "peerDependencies": {
     "react": ">=16.8",
-    "react-dom": ">=16.8",
     "react-router-dom": "^6.0.0"
   },
   "dependencies": {
@@ -45,15 +45,11 @@
   "devDependencies": {
     "@types/node": "^17.0.36",
     "@types/react": "^18.0.9",
-    "@types/react-dom": "^18.0.5",
-    "@types/react-router-dom": "^5.3.3",
     "@vitejs/plugin-react": "^1.3.2",
     "react": "^18.1.0",
-    "react-dom": "^18.1.0",
     "react-router": "^6.3.0",
     "typescript": "^4.6.3",
-    "vite": "^2.9.9",
-    "vite-plugin-dts": "^1.2.0"
+    "vite": "^2.9.9"
   },
   "files": [
     "dist"

packages/react-router-loading/vite.config.ts

@@ -1,31 +1,27 @@
 import { defineConfig } from 'vite';
 import path from 'node:path';
 import react from '@vitejs/plugin-react';
-import dts from 'vite-plugin-dts';
+
+const resolvePath = (str: string) => path.resolve(__dirname, str);
 
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [
-    react(),
-    dts({
-      insertTypesEntry: true,
-    }),
+    react()
   ],
   build: {
     lib: {
-      entry: path.resolve(__dirname, 'lib/index.ts'),
+      entry: resolvePath('lib/index.ts'),
       name: 'react-router-loading',
       formats: ['es', 'umd'],
       fileName: (format) => `react-router-loading.${format}.js`,
     },
     rollupOptions: {
-      external: ['react', 'react-dom', 'react-router', 'react-router-dom', 'topbar'],
+      external: ['react', 'react-router', 'topbar'],
       output: {
         globals: {
           react: 'React',
-          'react-dom': 'ReactDOM',
           'react-router': 'ReactRouter',
-          'react-router-dom': 'ReactRouterDOM',
           'topbar': 'topbar'
         },
       },