build and bump

Author: jquense

.babelrc.js

@@ -1,6 +1,6 @@
 module.exports = (api) => ({
   presets: [
-    ['env-modules', { modules: api.env() === 'esm' ? false : 'commonjs' }],
+    ['env-modules', { modules: api.env() === 'cjs' ? 'commonjs' : false }],
     ['@babel/react', { runtime: 'automatic' }],
     '@babel/preset-typescript',
   ],

.gitignore

@@ -1,4 +1,5 @@
 lib/
+cjs/
 .cache/
 www/public
 

package.json

@@ -11,26 +11,44 @@
     "url": "git+https://github.com/react-restart/ui.git"
   },
   "license": "MIT",
-  "main": "lib/cjs/index.js",
-  "module": "lib/esm/index.js",
-  "types": "lib/esm/index.d.ts",
+  "main": "cjs/index.js",
+  "module": "lib/index.js",
+  "types": "lib/index.d.ts",
   "exports": {
+    "./package.json": "./package.json",
     ".": {
-      "types": "./esm/index.d.ts",
-      "node": "./cjs/index.js",
-      "import": "./esm/index.js",
-      "require": "./cjs/index.js"
+      "node": {
+        "types": "./cjs/index.d.ts",
+        "default": "./cjs/index.js"
+      },
+      "require": {
+        "types": "./cjs/index.d.ts",
+        "default": "./cjs/index.js"
+      },
+      "import": {
+        "types": "./lib/index.d.ts",
+        "default": "./lib/index.js"
+      }
     },
     "./*": {
-      "types": "./esm/*.d.ts",
-      "node": "./cjs/*.js",
-      "import": "./esm/*.js",
-      "require": "./cjs/*.js"
+      "node": {
+        "types": "./cjs/*.d.ts",
+        "default": "./cjs/*.js"
+      },
+      "require": {
+        "types": "./cjs/*.d.ts",
+        "default": "./cjs/*.js"
+      },
+      "import": {
+        "types": "./lib/*.d.ts",
+        "default": "./lib/*.js"
+      }
     }
   },
   "sideEffects": false,
   "files": [
-    "lib"
+    "lib",
+    "cjs"
   ],
   "gitHooks": {
     "pre-commit": "lint-staged"
@@ -48,11 +66,15 @@
   ],
   "scripts": {
     "bootstrap": "yarn --network-timeout 100000 && yarn --cwd www --network-timeout 100000",
-    "build": "rimraf lib && 4c build src && yarn build:popper && yarn build:pick",
+    "build": "rimraf lib && yarn build:esm && yarn build:cjs && yarn build:popper",
+    "build:esm": "babel src --out-dir lib --delete-dir-on-start --extensions '.ts,.tsx' --ignore='**/*.d.ts' && yarn build:esm:types",
+    "build:cjs": "babel src --out-dir cjs --env-name cjs --delete-dir-on-start --extensions '.ts,.tsx'  --ignore='**/*.d.ts' && yarn build:cjs:types && echo '{\"type\": \"commonjs\"}' > cjs/package.json",
+    "build:esm:types": "tsc -p . --emitDeclarationOnly --declaration --outDir lib",
+    "build:cjs:types": "tsc -p . --emitDeclarationOnly --declaration --outDir cjs",
     "build:pick": "cherry-pick --cwd=lib --input-dir=../src --cjs-dir=cjs --esm-dir=esm",
-    "build:popper": "rollup src/popper.ts --file lib/cjs/popper.js --format cjs --name popper --plugin @rollup/plugin-node-resolve",
+    "build:popper": "rollup src/popper.ts --file cjs/popper.js --format cjs --name popper --plugin @rollup/plugin-node-resolve && rollup src/popper.ts --file lib/popper.js --format esm --name popper --plugin @rollup/plugin-node-resolve",
     "deploy-docs": "yarn --cwd www deploy",
-    "lint": "eslint src test *.ts",
+    "lint": "eslint src test",
     "prepublishOnly": "yarn build",
     "release": "rollout",
     "start": "yarn --cwd www start",
@@ -79,11 +101,11 @@
     "@babel/runtime": "^7.26.0",
     "@popperjs/core": "^2.11.8",
     "@react-aria/ssr": "^3.5.0",
-    "@restart/hooks": "^0.5.0",
+    "@restart/hooks": "^0.6.2",
     "@types/warning": "^3.0.3",
     "dequal": "^2.0.3",
     "dom-helpers": "^5.2.0",
-    "uncontrollable": "^8.0.4",
+    "uncontrollable": "^9.0.0",
     "warning": "^4.0.3"
   },
   "peerDependencies": {

src/Anchor.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-import { useEventCallback } from '@restart/hooks';
+import useEventCallback from '@restart/hooks/useEventCallback';
 import { useButtonProps } from './Button';
 
 export function isTrivialHref(href?: string) {

vitest.config.ts renamed to vitest.config.mts

@@ -1,4 +1,4 @@
-import { useCallbackRef } from '@restart/hooks';
+import useCallbackRef from '@restart/hooks/useCallbackRef';
 import useIsomorphicEffect from '@restart/hooks/useIsomorphicEffect';
 import Waypoint, { Position } from '@restart/ui/Waypoint';
 import clsx from 'clsx';

www/src/WaypointExample.tsx

@@ -2043,10 +2043,10 @@
     eslint-config-prettier "^8.1.0"
     eslint-plugin-react-hooks "^4.2.0"
 
-"@restart/hooks@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@restart/hooks/-/hooks-0.5.0.tgz#a594af7c3b64f5e65a7aca011551b0cdd93ec14e"
-  integrity sha512-wS+h6IusJCPjTkmOOrRZxIPICD/mtFA3PRZviutoM23/b7akyDGfZF/WS+nIFk27u7JDhPE2+0GBdZxjSqHZkg==
+"@restart/hooks@^0.6.2":
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/@restart/hooks/-/hooks-0.6.2.tgz#55a1f9b9bb413aaf2cbb00b0ff337f807082b72e"
+  integrity sha512-0QzYBe1raty/ULcuyTk0ZdLf+e//4n/f39hDPt5JYZW5kSbHEAgnZhLpWErCKEYSzi14oVBSbNsllnJmWlloBg==
   dependencies:
     dequal "^2.0.3"
 
@@ -10856,10 +10856,10 @@ unbox-primitive@^1.1.0:
     has-symbols "^1.1.0"
     which-boxed-primitive "^1.1.1"
 
-uncontrollable@^8.0.4:
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/uncontrollable/-/uncontrollable-8.0.4.tgz#a0a8307f638795162fafd0550f4a1efa0f8c5eb6"
-  integrity sha512-ulRWYWHvscPFc0QQXvyJjY6LIXU56f0h8pQFvhxiKk5V1fcI8gp9Ht9leVAhrVjzqMw0BgjspBINx9r6oyJUvQ==
+uncontrollable@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/uncontrollable/-/uncontrollable-9.0.0.tgz#a20495552b1c23640edd530733ed8c57bf66c103"
+  integrity sha512-wPScOFmvRkHdvebf7qNPn9Wog9B1TL8Dqcx0Vecz6HYTKFKMfGKP6MJHTjiKL8kwd8KTW3YfIUke7pmRDtkcRQ==
 
 undici-types@~5.26.4:
   version "5.26.5"