From 5347c2d33f332a981f26447a46e94ba8a7a00f72 Mon Sep 17 00:00:00 2001
From: Vitaly Puzrin <vitaly@rcopen.com>
Date: Wed, 22 Nov 2023 04:49:05 +0200
Subject: [PATCH] Fix cjs build and package entries

---
 .eslintrc.yml                                   |  2 --
 package.json                                    | 14 +++++++++++++-
 support/{rollup.config.js => rollup.config.mjs} | 10 +++++-----
 3 files changed, 18 insertions(+), 8 deletions(-)
 rename support/{rollup.config.js => rollup.config.mjs} (85%)

diff --git a/.eslintrc.yml b/.eslintrc.yml
index 25cfeec..2658bb8 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -18,9 +18,7 @@ ignorePatterns:
   - demo/
   - dist/
   - node_modules
-  - support/demo_template/sample.js
   - benchmark/extra/
-  - rollup.config.js
 
 rules:
   accessor-pairs:         2
diff --git a/package.json b/package.json
index e3aad17..ae0a61e 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,18 @@
   ],
   "repository": "markdown-it/markdown-it",
   "license": "MIT",
+  "main": "dist/markdown-it.js",
+  "module": "index.mjs",
+  "exports": {
+    ".": {
+      "import": "./index.mjs",
+      "require": "./dist/markdown-it.js"
+    },
+    "./*": {
+      "require": "./*",
+      "import": "./*"
+    }
+  },
   "bin": {
     "markdown-it": "bin/markdown-it.mjs"
   },
@@ -23,7 +35,7 @@
     "gh-doc": "npm run doc && gh-pages -d apidoc -f",
     "demo": "npm run lint && node support/build_demo.mjs",
     "gh-demo": "npm run demo && gh-pages -d demo -f -b master -r git@github.com:markdown-it/markdown-it.github.io.git",
-    "browserify": "rollup -c support/rollup.config.js",
+    "browserify": "rollup -c support/rollup.config.mjs",
     "benchmark-deps": "npm install --prefix benchmark/extra/ -g marked@0.3.6 commonmark@0.26.0 markdown-it/markdown-it.git#2.2.1",
     "specsplit": "support/specsplit.mjs good -o test/fixtures/commonmark/good.txt && support/specsplit.mjs bad -o test/fixtures/commonmark/bad.txt && support/specsplit.mjs",
     "todo": "grep 'TODO' -n -r ./lib 2>/dev/null",
diff --git a/support/rollup.config.js b/support/rollup.config.mjs
similarity index 85%
rename from support/rollup.config.js
rename to support/rollup.config.mjs
index 3cca2ac..1caa32b 100644
--- a/support/rollup.config.js
+++ b/support/rollup.config.mjs
@@ -1,11 +1,12 @@
 import nodeResolve from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
-import json from '@rollup/plugin-json';
-import pkg from '../package.json';
 import terser from '@rollup/plugin-terser';
+import { readFileSync } from 'fs';
+
+const pkg = JSON.parse(readFileSync(new URL('../package.json', import.meta.url)));
 
 export default {
-  input: 'index.js',
+  input: 'index.mjs',
   output: [
     {
       file: 'dist/markdown-it.js',
@@ -32,7 +33,7 @@ export default {
       plugins: [
         terser({
           format: {
-            ascii_only: true,
+            ascii_only: true
           }
         })
       ]
@@ -41,7 +42,6 @@ export default {
   plugins: [
     nodeResolve({ preferBuiltins: true }),
     commonjs(),
-    json({ namedExports: false }),
     {
       banner() {
         return `/*! ${pkg.name} ${pkg.version} https://github.com/${pkg.repository} @license ${pkg.license} */`;