diff --git a/package.json b/package.json index 4b1c28e76..2f1f40a88 100644 --- a/package.json +++ b/package.json @@ -228,7 +228,12 @@ "side-channel": "npm:@nolyfill/side-channel@^1" }, "patchedDependencies": { - "eslint-nibble@8.1.0": "patches/eslint-nibble@8.1.0.patch" + "eslint-nibble@8.1.0": "patches/eslint-nibble@8.1.0.patch", + "@bbob/preset-html5@4.2.0": "patches/@bbob__preset-html5@4.2.0.patch", + "@bbob/core@4.2.0": "patches/@bbob__core@4.2.0.patch", + "@bbob/plugin-helper@4.2.0": "patches/@bbob__plugin-helper@4.2.0.patch", + "@bbob/preset@4.2.0": "patches/@bbob__preset@4.2.0.patch", + "@bbob/parser@4.2.0": "patches/@bbob__parser@4.2.0.patch" } } } diff --git a/patches/@bbob__core@4.2.0.patch b/patches/@bbob__core@4.2.0.patch new file mode 100644 index 000000000..b24832c9f --- /dev/null +++ b/patches/@bbob__core@4.2.0.patch @@ -0,0 +1,13 @@ +diff --git a/es/index.js b/es/index.js +index 16a08f3ae8f30b8184f5e6decefdc1f66b0f1b64..aa97d18a201b2121ab5f865c60d5de9f5913eae6 100644 +--- a/es/index.js ++++ b/es/index.js +@@ -1,6 +1,6 @@ + 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(tree, options) { + const extendedTree = tree; + extendedTree.messages = [ diff --git a/patches/@bbob__parser@4.2.0.patch b/patches/@bbob__parser@4.2.0.patch new file mode 100644 index 000000000..de49624c5 --- /dev/null +++ b/patches/@bbob__parser@4.2.0.patch @@ -0,0 +1,36 @@ +diff --git a/es/index.js b/es/index.js +index 0a57e06d66aee0c7beff10aa10e761d022b7429e..7a852c7f42b7bc839ed849932d3dfc7cb4662f31 100644 +--- a/es/index.js ++++ b/es/index.js +@@ -1,4 +1,4 @@ + export { TagNode } from '@bbob/plugin-helper'; +-export { default } from './parse'; +-export * from './parse'; +-export * from './lexer'; ++export { default } from './parse.js'; ++export * from './parse.js'; ++export * from './lexer.js'; +diff --git a/es/lexer.js b/es/lexer.js +index 902594965355f31212cd7cedad6697829e144684..2ea20da6e1bd2a307b180d0b538884239c29b0b1 100644 +--- a/es/lexer.js ++++ b/es/lexer.js +@@ -1,6 +1,6 @@ + /* eslint-disable no-plusplus,no-param-reassign */ import { OPEN_BRAKET, CLOSE_BRAKET, QUOTEMARK, BACKSLASH, SLASH, SPACE, TAB, EQ, N } from '@bbob/plugin-helper'; +-import { Token, TYPE_ATTR_NAME, TYPE_ATTR_VALUE, TYPE_NEW_LINE, TYPE_SPACE, TYPE_TAG, TYPE_WORD } from './Token'; +-import { createCharGrabber, trimChar, unquote } from './utils'; ++import { Token, TYPE_ATTR_NAME, TYPE_ATTR_VALUE, TYPE_NEW_LINE, TYPE_SPACE, TYPE_TAG, TYPE_WORD } from './Token.js'; ++import { createCharGrabber, trimChar, unquote } from './utils.js'; + // for cases + const EM = '!'; + export function createTokenOfType(type, value, r = 0, cl = 0, p = 0, e = 0) { +diff --git a/es/parse.js b/es/parse.js +index f08044bf6033d209d79c3eae3db532d95e8c860c..81d170263a11a4896b67a3b3d310e9d5673db4c4 100644 +--- a/es/parse.js ++++ b/es/parse.js +@@ -1,5 +1,5 @@ + import { CLOSE_BRAKET, OPEN_BRAKET, TagNode, isTagNode } from "@bbob/plugin-helper"; +-import { createLexer } from "./lexer"; ++import { createLexer } from "./lexer.js"; + class NodeList { + last() { + if (Array.isArray(this.n) && this.n.length > 0 && typeof this.n[this.n.length - 1] !== "undefined") { diff --git a/patches/@bbob__plugin-helper@4.2.0.patch b/patches/@bbob__plugin-helper@4.2.0.patch new file mode 100644 index 000000000..867e2eb35 --- /dev/null +++ b/patches/@bbob__plugin-helper@4.2.0.patch @@ -0,0 +1,33 @@ +diff --git a/es/TagNode.js b/es/TagNode.js +index d07d4cc7be7d9a3f9b0b82e7e20b0288be3518a3..255f7116432fe5e662004f769afd18a6a5be243d 100644 +--- a/es/TagNode.js ++++ b/es/TagNode.js +@@ -1,5 +1,5 @@ +-import { OPEN_BRAKET, CLOSE_BRAKET, SLASH } from './char'; +-import { getUniqAttr, getNodeLength, appendToNode, attrsToString, attrValue, isTagNode } from './helpers'; ++import { OPEN_BRAKET, CLOSE_BRAKET, SLASH } from './char.js'; ++import { getUniqAttr, getNodeLength, appendToNode, attrsToString, attrValue, isTagNode } from './helpers.js'; + const getTagAttrs = (tag, params)=>{ + const uniqAttr = getUniqAttr(params); + if (uniqAttr) { +diff --git a/es/helpers.js b/es/helpers.js +index fbb27792e9ca04f460cb9d991df3803b8625c615..b10a9bb0d7ff51eb5ab9471b40d0055196c3ccf4 100644 +--- a/es/helpers.js ++++ b/es/helpers.js +@@ -1,4 +1,4 @@ +-import { N } from './char'; ++import { N } from './char.js'; + function isTagNode(el) { + return typeof el === 'object' && el !== null && 'tag' in el; + } +diff --git a/es/index.js b/es/index.js +index 3cfcb823c11fa6fdc7cef636d2c2ab2299cf8137..40253efe6a03b0e0ccfc0defc59c8a45370c5c90 100644 +--- a/es/index.js ++++ b/es/index.js +@@ -1,3 +1,3 @@ +-export * from "./helpers"; +-export * from "./char"; +-export * from "./TagNode"; ++export * from "./helpers.js"; ++export * from "./char.js"; ++export * from "./TagNode.js"; diff --git a/patches/@bbob__preset-html5@4.2.0.patch b/patches/@bbob__preset-html5@4.2.0.patch new file mode 100644 index 000000000..8e07982d4 --- /dev/null +++ b/patches/@bbob__preset-html5@4.2.0.patch @@ -0,0 +1,9 @@ +diff --git a/es/index.js b/es/index.js +index 5f5546ed7af8a8072b4ed57fc2a1b930318ea033..03a4087da2750ef174ad99ea4e06b4ca0030b716 100644 +--- a/es/index.js ++++ b/es/index.js +@@ -1,3 +1,3 @@ + /* eslint-disable indent */ import { createPreset } from "@bbob/preset"; +-import defaultTags from "./defaultTags"; ++import defaultTags from "./defaultTags.js"; + export default createPreset(defaultTags); diff --git a/patches/@bbob__preset@4.2.0.patch b/patches/@bbob__preset@4.2.0.patch new file mode 100644 index 000000000..0a9e86143 --- /dev/null +++ b/patches/@bbob__preset@4.2.0.patch @@ -0,0 +1,9 @@ +diff --git a/es/index.js b/es/index.js +index 15a762cc5dc6ed026fccd76d3d655370da689929..53024b46da00d822a283ba6a51aa0800fe2fd59b 100644 +--- a/es/index.js ++++ b/es/index.js +@@ -1,2 +1,2 @@ +-export { default } from "./preset"; +-export * from "./preset"; ++export { default } from "./preset.js"; ++export * from "./preset.js"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 111f4320e..4d20a20aa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,6 +14,21 @@ overrides: side-channel: npm:@nolyfill/side-channel@^1 patchedDependencies: + '@bbob/core@4.2.0': + hash: v4tqyuhmd7ie4kskej63wpyoyy + path: patches/@bbob__core@4.2.0.patch + '@bbob/parser@4.2.0': + hash: 3jkidu2qub3svpiz24dcdrhuey + path: patches/@bbob__parser@4.2.0.patch + '@bbob/plugin-helper@4.2.0': + hash: 35vhlnm6zfsrye6wm5mvcuoqkq + path: patches/@bbob__plugin-helper@4.2.0.patch + '@bbob/preset-html5@4.2.0': + hash: 45t5oyykiv4ibbpruba4shbkca + path: patches/@bbob__preset-html5@4.2.0.patch + '@bbob/preset@4.2.0': + hash: hzdlptpstii55wqx3v2binf4i4 + path: patches/@bbob__preset@4.2.0.patch eslint-nibble@8.1.0: hash: w5z6jxwjps4t4gxnmmngw67gmm path: patches/eslint-nibble@8.1.0.patch @@ -27,7 +42,7 @@ importers: version: 4.2.0 '@bbob/preset-html5': specifier: 4.2.0 - version: 4.2.0 + version: 4.2.0(patch_hash=45t5oyykiv4ibbpruba4shbkca) '@hono/node-server': specifier: 1.14.2 version: 1.14.2(hono@4.7.10) @@ -7146,36 +7161,36 @@ snapshots: '@babel/helper-string-parser': 7.27.1 '@babel/helper-validator-identifier': 7.27.1 - '@bbob/core@4.2.0': + '@bbob/core@4.2.0(patch_hash=v4tqyuhmd7ie4kskej63wpyoyy)': dependencies: - '@bbob/parser': 4.2.0 - '@bbob/plugin-helper': 4.2.0 + '@bbob/parser': 4.2.0(patch_hash=3jkidu2qub3svpiz24dcdrhuey) + '@bbob/plugin-helper': 4.2.0(patch_hash=35vhlnm6zfsrye6wm5mvcuoqkq) '@bbob/types': 4.2.0 '@bbob/html@4.2.0': dependencies: - '@bbob/core': 4.2.0 - '@bbob/plugin-helper': 4.2.0 + '@bbob/core': 4.2.0(patch_hash=v4tqyuhmd7ie4kskej63wpyoyy) + '@bbob/plugin-helper': 4.2.0(patch_hash=35vhlnm6zfsrye6wm5mvcuoqkq) '@bbob/types': 4.2.0 - '@bbob/parser@4.2.0': + '@bbob/parser@4.2.0(patch_hash=3jkidu2qub3svpiz24dcdrhuey)': dependencies: - '@bbob/plugin-helper': 4.2.0 + '@bbob/plugin-helper': 4.2.0(patch_hash=35vhlnm6zfsrye6wm5mvcuoqkq) '@bbob/types': 4.2.0 - '@bbob/plugin-helper@4.2.0': + '@bbob/plugin-helper@4.2.0(patch_hash=35vhlnm6zfsrye6wm5mvcuoqkq)': dependencies: '@bbob/types': 4.2.0 - '@bbob/preset-html5@4.2.0': + '@bbob/preset-html5@4.2.0(patch_hash=45t5oyykiv4ibbpruba4shbkca)': dependencies: - '@bbob/plugin-helper': 4.2.0 - '@bbob/preset': 4.2.0 + '@bbob/plugin-helper': 4.2.0(patch_hash=35vhlnm6zfsrye6wm5mvcuoqkq) + '@bbob/preset': 4.2.0(patch_hash=hzdlptpstii55wqx3v2binf4i4) '@bbob/types': 4.2.0 - '@bbob/preset@4.2.0': + '@bbob/preset@4.2.0(patch_hash=hzdlptpstii55wqx3v2binf4i4)': dependencies: - '@bbob/plugin-helper': 4.2.0 + '@bbob/plugin-helper': 4.2.0(patch_hash=35vhlnm6zfsrye6wm5mvcuoqkq) '@bbob/types': 4.2.0 '@bbob/types@4.2.0': {}