Merge 60ee91e into 5e4387c

.releaserc.json

@@ -1,6 +1,12 @@
 {
   "plugins": [
-    "@semantic-release/commit-analyzer",
+    [
+      "@semantic-release/commit-analyzer",
+      {
+        "preset": "angular",
+        "releaseRules": [{ "scope": "no-release", "release": false }]
+      }
+    ],
     "@semantic-release/release-notes-generator",
     ["@semantic-release/changelog", { "changelogFile": "CHANGELOG.md" }],
     ["@semantic-release/npm", { "pkgRoot": "dist" }],

package.json

@@ -2,7 +2,9 @@
   "name": "@nrsk/shikigami",
   "version": "1.1.2",
   "description": "Opinionated syntax highlighting with shiki for markdown-it.",
+  "packageManager": "npm@8.10.0",
   "sideEffects": false,
+  "type": "module",
   "main": "./index.cjs",
   "module": "./index.mjs",
   "types": "./index.d.ts",
@@ -20,19 +22,16 @@
     "*.mjs*"
   ],
   "engines": {
-    "node": ">=14.17.0"
+    "node": "^14.16.0 || ^16.10.0 || ^18.0.0"
   },
   "scripts": {
-    "build": "npm run build:types && npm run build:rollup",
-    "build:types": "tsc -p tsconfig.types.json",
-    "build:rollup": "node --require tsm scripts/compile.ts",
-    "fmt:prettier": "prettier --write \"**/*.{js,ts,json}\"",
+    "build": "tsup",
     "fmt:lint": "eslint --fix --ext .js,.ts .",
-    "postbuild": "rimraf dist/types",
-    "postversion": "node --require tsm ../scripts/release.ts restore",
+    "fmt:prettier": "prettier --write \"**/*.{js,ts,json}\"",
+    "postversion": "tsx ../scripts/release.ts restore",
     "prebuild": "rimraf dist",
     "prepare": "is-ci || husky install",
-    "prerelease": "node --require tsm scripts/release.ts prepare",
+    "prerelease": "tsx scripts/release.ts prepare",
     "release": "npx semantic-release",
     "release:dry": "npx semantic-release --dry-run",
     "test": "jest",
@@ -67,29 +66,28 @@
     "shiki": "^0.10.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.0.2",
+    "@commitlint/cli": "^17.1.2",
     "@nrsk/config-conventional": "^1.0.0",
-    "@rollup/plugin-typescript": "^8.3.3",
     "@semantic-release/changelog": "^6.0.1",
     "@semantic-release/git": "^10.0.1",
+    "@types/is-ci": "^3.0.0",
     "@types/jest": "^28.1.1",
     "@types/markdown-it": "^12.2.3",
-    "@typescript-eslint/eslint-plugin": "^5.27.1",
-    "@typescript-eslint/parser": "^5.27.1",
-    "eslint": "^8.17.0",
+    "@typescript-eslint/eslint-plugin": "^5.40.0",
+    "@typescript-eslint/parser": "^5.40.0",
+    "eslint": "^8.25.0",
     "eslint-config-prettier": "^8.5.0",
     "husky": "^8.0.1",
     "is-ci": "^3.0.1",
     "jest": "^28.1.1",
-    "lint-staged": "^13.0.1",
-    "prettier": "^2.6.2",
+    "lint-staged": "^13.0.3",
+    "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
-    "rollup": "^2.75.6",
-    "rollup-plugin-dts": "^4.2.2",
-    "semantic-release": "^19.0.3",
+    "semantic-release": "^19.0.5",
     "ts-jest": "^28.0.4",
-    "tsm": "^2.2.1",
-    "typescript": "^4.7.3"
+    "tsup": "^6.2.3",
+    "tsx": "^3.10.1",
+    "typescript": "^4.8.4"
   },
   "commitlint": {
     "extends": [

scripts/release.ts

@@ -56,6 +56,7 @@ async function main() {
 
           // Copy necessary files.
           await copyFile(`${cwd}/package.json`, `${cwd}/dist/package.json`)
+          await copyFile(`${cwd}/package-lock.json`, `${cwd}/dist/package-lock.json`)
           await copyFile(`${cwd}/CHANGELOG.md`, `${cwd}/dist/CHANGELOG.md`)
           await copyFile(`${cwd}/README.md`, `${cwd}/dist/README.md`)
           await copyFile(`${cwd}/LICENSE`, `${cwd}/dist/LICENSE`)
@@ -81,6 +82,7 @@ async function main() {
         try {
           // Copy back.
           await copyFile(`${cwd}/package.json`, resolve(cwd, '..', 'package.json'))
+          await copyFile(`${cwd}/package-lock.json`, resolve(cwd, '..', 'package-lock.json'))
 
           return {
             kind: 'success',

src/utils.ts

@@ -30,7 +30,7 @@ export function merge<T extends AnyObject, U extends AnyObject>(target: T, sourc
     })
   }
 
-  return output as U
+  return output as unknown as U
 }
 
 export function groupBy<T, K>(elements: Array<T>, getter: (element: T) => K): Map<K, Array<T>> {

tsconfig.json

@@ -11,6 +11,5 @@
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true
   },
-  "include": ["src", "scripts"],
-  "exclude": ["dist", "node_modules", "**/*.spec.ts", "**/__tests__/**/*.ts"]
+  "include": ["scripts", "src"]
 }

tsup.config.ts

@@ -0,0 +1,30 @@
+import isCI from 'is-ci'
+import { defineConfig, type Options } from 'tsup'
+
+const entry = 'src/index.ts'
+
+const sharedConfig = defineConfig({
+  splitting: false,
+  sourcemap: true,
+  format: ['esm', 'cjs'],
+  treeshake: true,
+  minify: isCI,
+  bundle: true
+})
+
+const mainConfig = defineConfig({
+  ...sharedConfig,
+  entry: [entry],
+  dts: false
+}) as Options
+
+const dtsConfig = defineConfig({
+  ...sharedConfig,
+  entry: [entry],
+  dts: {
+    entry,
+    only: true
+  }
+}) as Options
+
+export default defineConfig([mainConfig, dtsConfig])