WIP: Add entry points compatible with Next.js App Router

package.json

@@ -28,50 +28,48 @@
  "test:e2e:ci": "turbo run test:e2e:ci --parallel"
  },
  "resolutions": {
- "@types/react": "17.0.2",
- "@types/react-dom": "17.0.2"
+ "@types/react": "17.0.68",
+ "@types/react-dom": "17.0.21"
  },
  "devDependencies": {
- "@actions/core": "^1.10.0",
- "@babel/core": "^7.9.6",
- "@babel/eslint-parser": "^7.17.0",
- "@babel/plugin-transform-runtime": "^7.9.6",
- "@babel/preset-env": "^7.9.6",
- "@babel/preset-react": "^7.9.4",
- "@next/eslint-plugin-next": "^12.0.9",
- "@testing-library/cypress": "^8.0.2",
- "@types/jest": "^27.4.1",
- "@types/node": "^17.0.21",
- "@types/react": "17.0.2",
- "@types/react-dom": "17.0.2",
- "@typescript-eslint/eslint-plugin": "^5.17.0",
- "@typescript-eslint/parser": "^5.17.0",
- "cypress": "^9.1.1",
- "eslint": "^8.12.0",
- "eslint-config-prettier": "^8.5.0",
- "eslint-plugin-cypress": "^2.11.1",
- "eslint-plugin-prettier": "^4.0.0",
- "eslint-plugin-react": "^7.29.4",
+ "@actions/core": "^1.10.1",
+ "@babel/core": "^7.23.2",
+ "@babel/eslint-parser": "^7.22.15",
+ "@babel/plugin-transform-runtime": "^7.23.2",
+ "@babel/preset-env": "^7.23.2",
+ "@babel/preset-react": "^7.22.15",
+ "@commitlint/cli": "^17.8.0",
+ "@commitlint/config-conventional": "^17.8.0",
+ "@next/eslint-plugin-next": "^12.3.4",
+ "@testing-library/cypress": "^8.0.7",
+ "@types/jest": "^27.5.2",
+ "@types/node": "^17.0.45",
+ "@types/react": "^17.0.68",
+ "@types/react-dom": "^17.0.21",
+ "@typescript-eslint/eslint-plugin": "^5.62.0",
+ "@typescript-eslint/parser": "^5.62.0",
+ "cypress": "^9.7.0",
+ "eslint": "^8.51.0",
+ "eslint-config-prettier": "^8.10.0",
+ "eslint-plugin-cypress": "^2.15.1",
+ "eslint-plugin-prettier": "^4.2.1",
+ "eslint-plugin-react": "^7.33.2",
  "faker": "^6.6.6",
- "husky": "^8.0.2",
+ "husky": "^8.0.3",
  "isomorphic-fetch": "^3.0.0",
  "jest": "^27.5.1",
  "lerna": "^4.0.0",
- "microbundle": "^0.14.2",
- "prettier": "^2.8.0",
+ "microbundle": "^0.15.1",
+ "prettier": "^2.8.8",
  "pretty-quick": "^3.1.3",
- "start-server-and-test": "^1.14.0",
- "ts-jest": "^27.1.3",
- "ts-node": "^10.7.0",
- "turbo": "^1.1.1",
- "typescript": "^4.5.5",
+ "start-server-and-test": "^1.15.5",
+ "ts-jest": "^27.1.5",
+ "ts-node": "^10.9.1",
+ "turbo": "^1.10.15",
+ "typescript": "^4.9.5",
  "uuid": "^8.3.2",
  "yaml": "^1.10.2"
  },
- "dependencies": {
- "@commitlint/cli": "^17.3.0",
- "@commitlint/config-conventional": "^17.3.0"
- },
  "engines": {
  "node": ">=16.19.0"
  }

packages/next-drupal-query/package.json

@@ -4,8 +4,9 @@
  "version": "0.4.0",
  "sideEffects": false,
  "source": "src/index.ts",
- "main": "dist/index.js",
- "module": "dist/index.esm.js",
+ "type": "module",
+ "main": "dist/index.cjs",
+ "module": "dist/index.modern.js",
  "types": "dist/index.d.ts",
  "license": "MIT",
  "publishConfig": {
@@ -16,8 +17,8 @@
  "url": "https://twitter.com/shadcn"
  },
  "scripts": {
- "prepare": "microbundle --no-compress --jsx React.createElement",
- "dev": "microbundle watch --no-compress --jsx React.createElement",
+ "prepare": "microbundle --no-compress --jsx React.createElement --format modern,cjs",
+ "dev": "microbundle watch --no-compress --jsx React.createElement --format modern,cjs",
  "test": "jest"
  },
  "keywords": [
@@ -37,12 +38,12 @@
  },
  "devDependencies": {
  "rollup-plugin-node-builtins": "^2.1.2",
- "typescript": "^4.5.5"
+ "typescript": "^4.9.5"
  },
  "dependencies": {
- "deepmerge": "^4.2.2",
- "drupal-jsonapi-params": "^2.1.0",
+ "deepmerge": "^4.3.1",
+ "drupal-jsonapi-params": "^2.3.1",
  "next": "^12.2.3 || ^13",
- "type-fest": "^2.17.0"
+ "type-fest": "^2.19.0"
  }
 }

packages/next-drupal-query/src/index.ts

@@ -1,6 +1,6 @@
 import deepmerge from "deepmerge"
 import { DrupalJsonApiParams } from "drupal-jsonapi-params"
-import { GetServerSidePropsContext, GetStaticPathsContext } from "next"
+import type { GetServerSidePropsContext, GetStaticPathsContext } from "next"
 import type { RequireAllOrNone, ConditionalKeys } from "type-fest"
 
 // Note: some generic are explicitly not typed here to force definition.

packages/next-drupal/package.json

@@ -3,10 +3,81 @@
  "description": "Helpers for Next.js + Drupal.",
  "version": "1.6.0",
  "sideEffects": false,
- "source": "src/index.ts",
- "main": "dist/index.js",
- "module": "dist/index.esm.js",
- "types": "dist/index.d.ts",
+ "source": [
+ "src/index.ts",
+ "src/client.ts",
+ "src/navigation.ts",
+ "src/preview.ts",
+ "src/query.ts",
+ "src/translation.ts",
+ "src/utils.ts"
+ ],
+ "type": "module",
+ "main": "dist/index.cjs",
+ "module": "dist/index.modern.js",
+ "exports": {
+ ".": {
+ "import": {
+ "types": "./dist/index.d.ts",
+ "default": "./dist/index.modern.js"
+ },
+ "require": {
+ "types": "./dist/index.cjs.d.ts",
+ "default": "./dist/index.cjs"
+ }
+ },
+ "./client": {
+ "import": {
+ "types": "./dist/client.d.ts",
+ "default": "./dist/client.modern.js"
+ },
+ "require": {
+ "types": "./dist/client.cjs.d.ts",
+ "default": "./dist/client.cjs"
+ }
+ },
+ "./navigation": {
+ "import": {
+ "types": "./dist/navigation.d.ts",
+ "default": "./dist/navigation.modern.js"
+ },
+ "require": {
+ "types": "./dist/navigation.cjs.d.ts",
+ "default": "./dist/navigation.cjs"
+ }
+ },
+ "./preview": {
+ "import": {
+ "types": "./dist/preview.d.ts",
+ "default": "./dist/preview.modern.js"
+ },
+ "require": {
+ "types": "./dist/preview.cjs.d.ts",
+ "default": "./dist/preview.cjs"
+ }
+ },
+ "./query": {
+ "import": {
+ "types": "./dist/query.d.ts",
+ "default": "./dist/query.modern.js"
+ },
+ "require": {
+ "types": "./dist/query.cjs.d.ts",
+ "default": "./dist/query.cjs"
+ }
+ },
+ "./translation": {
+ "import": {
+ "types": "./dist/translation.d.ts",
+ "default": "./dist/translation.modern.js"
+ },
+ "require": {
+ "types": "./dist/translation.cjs.d.ts",
+ "default": "./dist/translation.cjs"
+ }
+ }
+ },
+ "types": "dist/types.d.ts",
  "license": "MIT",
  "publishConfig": {
  "access": "public"
@@ -16,8 +87,9 @@
  "url": "https://twitter.com/shadcn"
  },
  "scripts": {
- "prepare": "microbundle --no-compress --jsx React.createElement",
- "dev": "microbundle watch --no-compress --jsx React.createElement",
+ "prepare": "microbundle --no-compress --jsx React.createElement --format modern,cjs",
+ "postprepare": "node postBuild.mjs",
+ "dev": "microbundle watch --no-compress --jsx React.createElement --format modern,cjs",
  "test": "jest",
  "prepublishOnly": "yarn prepare"
  },
@@ -38,13 +110,13 @@
  },
  "devDependencies": {
  "rollup-plugin-node-builtins": "^2.1.2",
- "typescript": "^4.5.5"
+ "typescript": "^4.9.5"
  },
  "dependencies": {
- "jsona": "^1.9.7",
+ "jsona": "^1.12.1",
  "next": "^12.2.0 || ^13",
  "node-cache": "^5.1.2",
- "qs": "^6.10.3",
+ "qs": "^6.11.2",
  "react": "^17.0.2 || ^18",
  "react-dom": "^17.0.2 || ^18"
  }

packages/next-drupal/postBuild.mjs

@@ -0,0 +1,20 @@
+import { readdir, copyFile } from "node:fs/promises"
+
+const files = await readdir("./dist")
+for (const file of files) {
+ if (file.endsWith(".modern.js")) {
+ const base = file.replace(/\.modern\.js$/, "")
+
+ // Make a duplicate of the type definitions.
+ //
+ // From the TypeScript docs:
+ //
+ // "It’s important to note that the CommonJS entrypoint and the ES module
+ // entrypoint each needs its own declaration file, even if the contents are
+ // the same between them."
+ //
+ // @see https://www.typescriptlang.org/docs/handbook/esm-node.html#packagejson-exports-imports-and-self-referencing
+ await copyFile(`./dist/${base}.d.ts`, `./dist/${base}.cjs.d.ts`)
+ }
+}
+console.log(`Created unique *.d.ts files for CommonJS build.`)