Merge branch 'master' into 204-parser-has-issues-with-blanks-and-quotes-in-unique-attributes

Author: JiLiZART

.changeset/gentle-guests-doubt.md

@@ -0,0 +1,21 @@
+---
+"@bbob/cli": patch
+"@bbob/core": patch
+"@bbob/html": patch
+"@bbob/parser": patch
+"@bbob/plugin-helper": patch
+"@bbob/preset-html5": patch
+"@bbob/preset-react": patch
+"@bbob/preset-vue": patch
+"@bbob/preset": patch
+"@bbob/react": patch
+"@bbob/types": patch
+"@bbob/vue2": patch
+"@bbob/vue3": patch
+---
+
+fix: proper module resolution in all cases (Node CJS, Node ESM, bundler)
+
+Allow usages of this library in ESM scenarios (Vite SSR, pure Node using ESM) by fixing incorrect exports of the ESM output (use correct .mjs extension, separate types files for CJS and ESM output, package.json fixes)
+
+Fixes #232, #214, #135

.changeset/slimy-colts-drive.md

@@ -0,0 +1,20 @@
+---
+"@bbob/plugin-helper": patch
+"@bbob/preset-html5": patch
+"@bbob/preset-react": patch
+"@bbob/preset-vue": patch
+"@bbob/parser": patch
+"@bbob/preset": patch
+"@bbob/react": patch
+"@bbob/types": patch
+"@bbob/core": patch
+"@bbob/html": patch
+"@bbob/vue2": patch
+"@bbob/vue3": patch
+"@bbob/cli": patch
+---
+
+fixes problem with context free tags
+
+now code like `[code][codeButton]text[/codeButton][/code]` 
+will be parsed correctly to `<code>[codeButton]text[/codeButton]</code>`

.github/workflows/test.yml

@@ -40,5 +40,5 @@ jobs:
       - name: Run the coverage
         run: pnpm run cover
 
-      - name: Coveralls
-        uses: coverallsapp/github-action@v2
+#      - name: Coveralls
+#        uses: coverallsapp/github-action@v2

jest.config.js

@@ -7,6 +7,7 @@ module.exports = {
   setupFilesAfterEnv: [`${__dirname}/jest.setup.js`],
   coverageDirectory: './coverage/',
   collectCoverage: true,
+  resolver: "ts-jest-resolver",
   transform: {
     '\\.[jt]sx?$': ['@swc/jest', { ...config }],
   },

package.json

@@ -66,6 +66,8 @@
     "rollup-plugin-gzip": "3.1.0",
     "rollup-plugin-swc3": "0.11.0",
     "size-limit": "11.0.1",
+    "ts-jest-resolver": "^2.0.1",
+    "ts2mjs": "^4.0.0",
     "typescript": "5.1.6"
   },
   "publishConfig": {
@@ -80,13 +82,13 @@
   },
   "pkgTasks": {
     "build:commonjs": "@/cross-env BABEL_ENV=commonjs NODE_ENV=production @/swc ./src/ --config-file ../../.swcrc-commonjs.json --out-dir lib --strip-leading-paths",
-    "build:es": "@/cross-env BABEL_ENV=es NODE_ENV=production @/swc ./src/ --config-file ../../.swcrc.json --out-dir es --strip-leading-paths",
+    "build:es": "@/cross-env BABEL_ENV=es NODE_ENV=production @/swc ./src/ --config-file ../../.swcrc.json --out-dir es --strip-leading-paths && @/ts2mjs es --remove-source",
     "build:umd": "@/cross-env BABEL_ENV=rollup NODE_ENV=production @/rollup --config ../../rollup.config.mjs",
     "build": "npm run build:es && npm run build:commonjs && npm run build:umd",
     "test": "@/jest",
     "cover": "@/jest --coverage .",
     "lint": "@/eslint .",
-    "types": "@/tsc",
+    "types": "@/tsc && @/ts2mjs types",
     "bundlesize": "npm run build && @/cross-env NODE_ENV=production @/bundlesize .",
     "size": "npm run build && @/cross-env NODE_ENV=production @/size-limit ."
   },

packages/bbob-cli/package.json

@@ -6,16 +6,21 @@
     "bbob": "lib/cli.js"
   },
   "main": "lib/index.js",
-  "module": "es/index.js",
-  "jsnext:main": "es/index.js",
+  "module": "es/index.mjs",
+  "jsnext:main": "es/index.mjs",
   "browser": "dist/index.js",
   "browserName": "BbobCli",
   "types": "types/index.d.ts",
   "exports": {
     ".": {
-      "types": "./types/index.d.ts",
-      "import": "./es/index.js",
-      "require": "./lib/index.js",
+      "import": {
+        "types": "./types/index.d.mts",
+        "default": "./es/index.mjs"
+      },
+      "require": {
+        "types": "./types/index.d.ts",
+        "default": "./lib/index.js"
+      },
       "browser": "./dist/index.min.js",
       "umd": "./dist/index.min.js"
     }

packages/bbob-cli/src/cli.ts

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-import { run } from './index';
+import { run } from './index.js';
 
 run(process.stdin, process.stdout);

packages/bbob-core/package.json

@@ -25,16 +25,21 @@
     "@bbob/types": "*"
   },
   "main": "lib/index.js",
-  "module": "es/index.js",
-  "jsnext:main": "es/index.js",
+  "module": "es/index.mjs",
+  "jsnext:main": "es/index.mjs",
   "browser": "dist/index.js",
   "browserName": "BbobCore",
   "types": "types/index.d.ts",
   "exports": {
     ".": {
-      "types": "./types/index.d.ts",
-      "import": "./es/index.js",
-      "require": "./lib/index.js",
+      "import": {
+        "types": "./types/index.d.mts",
+        "default": "./es/index.mjs"
+      },
+      "require": {
+        "types": "./types/index.d.ts",
+        "default": "./lib/index.js"
+      },
       "browser": "./dist/index.min.js",
       "umd": "./dist/index.min.js"
     }

packages/bbob-core/src/index.ts

@@ -9,8 +9,8 @@ import type {
 } from "@bbob/types";
 
 import { parse } from '@bbob/parser';
-import { iterate, match } from './utils';
-import { C1, C2 } from './errors'
+import { iterate, match } from './utils.js';
+import { C1, C2 } from './errors.js'
 
 export function createTree<Options extends BBobCoreOptions = BBobCoreOptions>(tree: NodeContent[], options: Options) {
   const extendedTree = tree as BBobCoreTagNodeTree

packages/bbob-html/package.json

@@ -14,16 +14,21 @@
     "@bbob/types": "*"
   },
   "main": "lib/index.js",
-  "module": "es/index.js",
-  "jsnext:main": "es/index.js",
+  "module": "es/index.mjs",
+  "jsnext:main": "es/index.mjs",
   "browser": "dist/index.js",
   "browserName": "BbobHtml",
   "types": "types/index.d.ts",
   "exports": {
     ".": {
-      "types": "./types/index.d.ts",
-      "import": "./es/index.js",
-      "require": "./lib/index.js",
+      "import": {
+        "types": "./types/index.d.mts",
+        "default": "./es/index.mjs"
+      },
+      "require": {
+        "types": "./types/index.d.ts",
+        "default": "./lib/index.js"
+      },
       "browser": "./dist/index.min.js",
       "umd": "./dist/index.min.js"
     }