Merge branch 'v3' into remove-deprecated-hooks-and-co

.changeset/tame-news-live.md

@@ -0,0 +1,7 @@
+---
+"eslint-config-custom": major
+"usehooks-ts": major
+"www": major
+---
+
+Move the full workspace into ES Module

README.md

@@ -18,6 +18,7 @@
 ![npm bundle size](https://img.shields.io/bundlephobia/minzip/usehooks-ts)
 ![npm](https://img.shields.io/npm/v/usehooks-ts)<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
 [![All Contributors](https://img.shields.io/badge/all_contributors-234-orange.svg?style=flat-square)](#contributors-)
+
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 <br />

apps/www/next.config.mjs → apps/www/next.config.js

@@ -1,4 +1,4 @@
-import './env.mjs'
+import './env.js'
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {}

apps/www/package.json

@@ -2,10 +2,11 @@
   "name": "www",
   "version": "0.2.2",
   "private": true,
+  "type": "module",
   "scripts": {
     "dev": "next dev",
     "build": "pnpm generate && next build && pnpm generate-sitemap",
-    "generate-sitemap": "rimraf public/sitemap.xml public/robots.txt && next-sitemap --config ./next-sitemap.config.mjs",
+    "generate-sitemap": "rimraf public/sitemap.xml public/robots.txt && next-sitemap --config ./next-sitemap.config.js",
     "start": "next start",
     "lint": "next lint && tsc --noEmit",
     "clean": "rimraf *.tsbuildinfo .next generated .turbo",

apps/www/tsconfig.json

@@ -28,8 +28,7 @@
     "**/*.ts",
     "**/*.tsx",
     ".next/types/**/*.ts",
-    "**/*.js",
-    "**/*.mjs"
+    "**/*.js"
   ],
   "exclude": ["node_modules"]
 }

package.json

@@ -5,6 +5,7 @@
   "author": "Julien CARON <juliencaron@protonmail.com>",
   "homepage": "https://usehooks-ts.com",
   "module": "true",
+  "type": "module",
   "keywords": [
     "typescript",
     "react",
@@ -19,10 +20,10 @@
     "clean": "rimraf .turbo && turbo run clean",
     "format": "prettier --write \"**/*.{json,md,mdx,css,scss,yaml,yml}\"",
     "lint": "turbo run lint",
-    "update-testing-issue": "zx ./scripts/updateTestingIssue.mjs",
-    "update-readme": "zx ./scripts/updateReadme.mjs",
-    "copy-hooks": "rimraf -rf ./apps/www/generated && zx ./scripts/copyHooks.mjs",
-    "gen-hook": "turbo gen hook && pnpm format",
+    "update-testing-issue": "zx ./scripts/updateTestingIssue.js",
+    "update-readme": "zx ./scripts/updateReadme.js",
+    "copy-hooks": "rimraf ./apps/www/generated && zx ./scripts/copyHooks.js",
+    "gen-hook": "turbo gen hook --config \"turbo/generators/config.cts\" && pnpm format",
     "changeset": "npx changeset",
     "changeset-version": "npx changeset version",
     "changeset-publish": "npx changeset publish"
@@ -32,7 +33,9 @@
   },
   "devDependencies": {
     "@changesets/cli": "^2.27.1",
+    "@turbo/gen": "^1.12.4",
     "all-contributors-cli": "^6.26.1",
+    "date-fns": "^3.3.1",
     "eslint": "^8.56.0",
     "prettier": "^3.2.5",
     "rimraf": "^5.0.5",

packages/eslint-config-custom/index.cjs

@@ -0,0 +1,3 @@
+const eslintrc = require('./.eslintrc.cjs')
+
+module.exports = eslintrc

packages/eslint-config-custom/package.json

@@ -3,9 +3,10 @@
   "private": true,
   "version": "1.2.0",
   "description": "Base configuration for Eslint",
-  "main": "index.js",
+  "main": "index.cjs",
   "author": "Julien CARON <juliencaron@protonmail.com>",
   "license": "MIT",
+  "type": "module",
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^7.0.2",
     "@typescript-eslint/parser": "^7.0.2",

packages/usehooks-ts/README.md

@@ -18,6 +18,7 @@
 ![npm bundle size](https://img.shields.io/bundlephobia/minzip/usehooks-ts)
 ![npm](https://img.shields.io/npm/v/usehooks-ts)<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
 [![All Contributors](https://img.shields.io/badge/all_contributors-234-orange.svg?style=flat-square)](#contributors-)
+
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 <br />

packages/usehooks-ts/package.json

@@ -11,34 +11,33 @@
     "hooks"
   ],
   "license": "MIT",
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
+  "type": "module",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs",
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.js",
       "types": "./dist/index.d.ts"
     }
   },
   "sideEffects": false,
   "scripts": {
-    "build": "tsup && rm ./dist/index.d.mts",
+    "build": "tsup && rimraf ./dist/index.d.cts",
     "dev": "tsup --watch",
     "test": "vitest run",
     "test:watch": "vitest",
-    "clean": "rimraf -rf ./dist .turbo *.tsbuildinfo",
+    "clean": "rimraf dist .turbo *.tsbuildinfo",
     "lint": "eslint './src/**/*.{ts,tsx}' && tsc --noEmit"
   },
   "devDependencies": {
     "@juggle/resize-observer": "^3.4.0",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^14.2.1",
-    "@turbo/gen": "^1.12.4",
     "@types/lodash.debounce": "^4.0.9",
     "@types/node": "^20.11.19",
     "@types/react": "18.2.57",
-    "date-fns": "^3.3.1",
     "eslint-config-custom": "workspace:*",
     "eslint-plugin-jsdoc": "^48.1.0",
     "eslint-plugin-tree-shaking": "^1.12.1",

scripts/copyHooks.mjs → scripts/copyHooks.js

@@ -2,7 +2,7 @@
 
 import { path, fs } from 'zx'
 
-import { isHookFile } from './utils.mjs'
+import { isHookFile } from './utils.js'
 
 const hooksDir = path.resolve('./packages/usehooks-ts/src')
 const outputDir = path.resolve('./apps/www/generated')

scripts/updateReadme.mjs → scripts/updateReadme.js

@@ -2,7 +2,7 @@
 
 import { path, fs } from 'zx'
 
-import { camelToKebabCase, isDemoFile, isHookFile } from './utils.mjs'
+import { camelToKebabCase, isDemoFile, isHookFile } from './utils.js'
 
 ////////////////////////////////////////////////////////////////////////
 // 1. Imperative script that updates the hook list in the README file.

scripts/updateTestingIssue.mjs → scripts/updateTestingIssue.js

@@ -2,7 +2,7 @@
 
 import { path, fs, $ } from 'zx'
 
-import { isHookFile, isTestFile } from './utils.mjs'
+import { isHookFile, isTestFile } from './utils.js'
 
 const GITHUB_REPO = `juliencrn/usehooks-ts`
 const GITHUB_ISSUE_PATH = `${GITHUB_REPO}/issues/423`

packages/usehooks-ts/turbo/generators/config.ts → turbo/generators/config.cts

@@ -1,7 +1,9 @@
 import type { PlopTypes } from '@turbo/gen'
 import { format } from 'date-fns'
+import path from 'path'
 
 export default function generator(plop: PlopTypes.NodePlopAPI): void {
+  const usehooksSrcPath = path.resolve('packages/usehooks-ts/src')
   plop.setGenerator('hook', {
     description: 'Create a post',
     prompts: [
@@ -15,14 +17,14 @@ export default function generator(plop: PlopTypes.NodePlopAPI): void {
       // Create the hook file itself
       {
         type: 'add',
-        path: 'src/{{camelCase name}}/{{camelCase name}}.ts',
+        path: usehooksSrcPath + '/{{camelCase name}}/{{camelCase name}}.ts',
         templateFile: 'templates/hook/hook.ts.hbs',
       },
 
       // Create the test file
       {
         type: 'add',
-        path: 'src/{{camelCase name}}/{{camelCase name}}.test.ts',
+        path: usehooksSrcPath + '/{{camelCase name}}/{{camelCase name}}.test.ts',
         templateFile: 'templates/hook/hook.test.ts.hbs',
       },
 
@@ -32,28 +34,28 @@ export default function generator(plop: PlopTypes.NodePlopAPI): void {
           date: format(new Date(), 'yyyy-MM-dd'),
         },
         type: 'add',
-        path: 'src/{{camelCase name}}/{{camelCase name}}.md',
+        path: usehooksSrcPath + '/{{camelCase name}}/{{camelCase name}}.md',
         templateFile: 'templates/hook/hook.mdx.hbs',
       },
 
       // Create the demo react component file
       {
         type: 'add',
-        path: 'src/{{camelCase name}}/{{camelCase name}}.demo.tsx',
+        path: usehooksSrcPath + '/{{camelCase name}}/{{camelCase name}}.demo.tsx',
         templateFile: 'templates/hook/hook.demo.tsx.hbs',
       },
 
       // Create the hook's index file
       {
         type: 'add',
-        path: 'src/{{camelCase name}}/index.ts',
+        path: usehooksSrcPath + '/{{camelCase name}}/index.ts',
         templateFile: 'templates/hook/index.ts.hbs',
       },
 
       // Update the global hooks index file
       {
         type: 'append',
-        path: 'src/index.ts',
+        path: usehooksSrcPath + '/index.ts',
         templateFile: 'templates/index.ts.hbs',
       },
     ],