Added support for both es and cjs modules.

brajevicm · Nov 6, 2019 · 6e256af · 6e256af
1 parent 6ef2284
commit 6e256af
Show file tree

Hide file tree

Showing 27 changed files with 32 additions and 341 deletions.
diff --git a/.gitignore b/.gitignore
@@ -102,3 +102,7 @@ dist
 
 # TernJS port file
 .tern-port
+
+# Build-generated files
+es
+lib
diff --git a/handler.js b/handler.js
diff --git a/index.js b/index.js
diff --git a/link.js b/link.js
diff --git a/package.json b/package.json
@@ -1,18 +1,22 @@
 {
   "name": "next-universal-route",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Universal Next.js Route",
-  "main": "index.js",
+  "main": "./lib/index.js",
+  "module": "./es/index.js",
+  "modules.root": "./es",
+  "types": "./lib/index.d.ts",
   "author": "Miloš Brajević <[email protected]>",
   "repository": "brajevicm/next-universal-route",
   "license": "MIT",
   "scripts": {
     "lint": "tslint -c tslint.json --project tsconfig.json",
     "test": "jest --config jest.config.json && codecov",
     "test:watch": "jest --config jest.config.json --watchAll",
-    "build": "rimraf ./dist && tsc"
+    "build": " rimraf ./dist && npm run build:es && npm run build:lib",
+    "build:es": "tsc --module es2015 --target es5 --outDir es",
+    "build:lib": "tsc --module commonjs --target es5 --outDir lib"
   },
-  "typings": "./dist/index.d.ts",
   "keywords": [
     "react",
     "next",
@@ -46,8 +50,8 @@
     "typescript": "^3.6.4"
   },
   "peerDependencies": {
-    "next": "^9",
-    "react": "^16"
+    "next": ">=2",
+    "react": "^15.4.2 || ^16"
   },
   "dependencies": {
     "path-to-regexp": "^3.1.0",

diff --git a/router.js b/router.js
diff --git a/src/Link.tsx b/src/Link.tsx
diff --git a/src/NextRoute.ts b/src/NextRoute.ts
diff --git a/src/Route.ts b/src/Route.ts
diff --git a/src/Router.ts b/src/Router.ts
diff --git a/src/Routes.ts b/src/Routes.ts
diff --git a/src/getRequestHandler.ts b/src/getRequestHandler.ts
diff --git a/src/index.ts b/src/index.ts
@@ -0,0 +1,6 @@
+import { Link } from './lib/Link';
+import { Router } from './lib/Router';
+import { Route } from './lib/Route';
+import { getRequestHandler } from './lib/getRequestHandler';
+
+export { getRequestHandler, Route, Router, Link };
diff --git a/src/lib/deepClone.ts b/src/lib/deepClone.ts
diff --git a/src/lib/formatUrl.ts → src/utils/formatUrl.ts b/src/lib/formatUrl.ts → src/utils/formatUrl.ts
diff --git a/src/lib/generatePath.ts → src/utils/generatePath.ts b/src/lib/generatePath.ts → src/utils/generatePath.ts
diff --git a/src/lib/isAbsolutePath.ts → src/utils/isAbsolutePath.ts b/src/lib/isAbsolutePath.ts → src/utils/isAbsolutePath.ts
diff --git a/src/lib/isFunction.ts → src/utils/isFunction.ts b/src/lib/isFunction.ts → src/utils/isFunction.ts
diff --git a/src/lib/mapValues.ts → src/utils/mapValues.ts b/src/lib/mapValues.ts → src/utils/mapValues.ts
diff --git a/tests/Route.test.ts b/tests/Route.test.ts
@@ -1,5 +1,4 @@
-import { Routes } from './../src/Routes';
-import { Route } from '../src/Route';
+import { Route } from '../src/lib/Route';
 
 test('should construct NextRoute', () => {
   const testRoute = new Route('/', 'index');