Merge pull request #154 from JoshuaKGoldberg/fix-cjs

fix: add back CJS support, with a test

.github/workflows/lint.yml

@@ -4,6 +4,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/prepare
+      - run: pnpm build
       - run: pnpm lint
 
 name: Lint

.github/workflows/test-cjs.yml

@@ -0,0 +1,16 @@
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/prepare
+      - run: pnpm build
+      - run: pnpm run test:cjs
+
+name: Test CommonJS
+
+on:
+  pull_request: ~
+  push:
+    branches:
+      - main

package.json

@@ -29,6 +29,10 @@
   "type": "module",
   "exports": {
     ".": {
+      "types": {
+        "import": "./lib/index.d.ts",
+        "require": "./lib/index.d.cts"
+      },
       "import": "./lib/index.js",
       "require": "./lib/index.cjs"
     }
@@ -52,14 +56,15 @@
     "prepare": "husky install",
     "should-semantic-release": "should-semantic-release --verbose",
     "test": "vitest",
+    "test:cjs": "node ./src/e2e.cjs",
     "tsc": "tsc"
   },
   "lint-staged": {
     "*": "prettier --ignore-unknown --write"
   },
   "dependencies": {
-    "@sindresorhus/is": "^6.0.0",
-    "char-regex": "^2.0.0",
+    "@sindresorhus/is": "^4.6.0",
+    "char-regex": "^1.0.2",
     "emojilib": "^2.4.0",
     "skin-tone": "^3.0.0"
   },

src/e2e.cjs

@@ -0,0 +1,5 @@
+const { strict: assert } = require('node:assert')
+
+const emoji = require('../lib/index.cjs')
+
+assert.equal(emoji.emojify(':wave:'), '👋')

src/emojify.ts

@@ -1,4 +1,4 @@
-import { assert, default as is } from '@sindresorhus/is'
+import is from '@sindresorhus/is'
 
 import { findByName } from './findByName.js'
 import { asFunction, normalizeName } from './utils.js'
@@ -21,9 +21,9 @@ export const emojify = (
   const fallbackFunction =
     fallback === undefined ? fallback : asFunction(fallback)
 
-  assert.string(input)
-  assert.any([is.undefined, is.function], fallbackFunction)
-  assert.function(format)
+  is.assert.string(input)
+  is.assert.any([is.default.undefined, is.default.function_], fallbackFunction)
+  is.assert.function_(format)
 
   return input.replace(/:[\w\-+]+:/g, part => {
     const found = findByName(part)

src/replace.ts

@@ -18,7 +18,7 @@ export const replace = (
   const replace = asFunction(replacement)
 
   assert.string(input)
-  assert.function(replace)
+  assert.function_(replace)
   assert.boolean(preserveSpaces)
 
   const characters = input.match(charRegexMatcher)

vitest.config.ts

@@ -6,7 +6,7 @@ export default defineConfig({
     coverage: {
       all: true,
       branches: 100,
-      exclude: ['lib', 'src/*.d.ts', 'src/index.ts'],
+      exclude: ['lib', 'src/*.d.ts', 'src/e2e.cjs', 'src/index.ts'],
       functions: 100,
       include: ['src'],
       lines: 100,