nuxt-og-image 6.7.0 → 6.7.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/chunks/tw4.cjs +2 -2
- package/dist/chunks/tw4.mjs +2 -2
- package/dist/chunks/uno.cjs +2 -2
- package/dist/chunks/uno.mjs +2 -2
- package/dist/cli.cjs +1 -1
- package/dist/cli.mjs +1 -1
- package/dist/module.cjs +2 -2
- package/dist/module.json +1 -1
- package/dist/module.mjs +2 -2
- package/dist/runtime/server/og-image/bindings/takumi/node-dev.d.ts +2 -1
- package/dist/runtime/server/og-image/bindings/takumi/node-dev.js +3 -7
- package/dist/runtime/server/og-image/bindings/takumi/node.d.ts +2 -1
- package/dist/runtime/server/og-image/bindings/takumi/node.js +2 -1
- package/dist/runtime/server/og-image/bindings/takumi/resource-urls.d.ts +2 -0
- package/dist/runtime/server/og-image/bindings/takumi/resource-urls.js +91 -0
- package/dist/runtime/server/og-image/bindings/takumi/wasm.d.ts +2 -1
- package/dist/runtime/server/og-image/bindings/takumi/wasm.js +2 -1
- package/dist/runtime/server/og-image/takumi/nodes.d.ts +2 -1
- package/dist/runtime/server/og-image/takumi/nodes.js +16 -7
- package/dist/shared/{nuxt-og-image.yDJBWXBt.cjs → nuxt-og-image.BCK8Adm4.cjs} +2 -2
- package/dist/shared/{nuxt-og-image.RI9DgjgV.cjs → nuxt-og-image.DQkJQHaN.cjs} +1 -1
- package/dist/shared/{nuxt-og-image.DM30kcDz.mjs → nuxt-og-image.LgUGeaz-.mjs} +1 -1
- package/dist/shared/{nuxt-og-image.CPSxZhVO.mjs → nuxt-og-image.Pfj5JkJd.mjs} +1 -1
- package/package.json +33 -33
package/dist/chunks/tw4.cjs
CHANGED
|
@@ -4,7 +4,7 @@ const promises = require('node:fs/promises');
|
|
|
4
4
|
const node_url = require('node:url');
|
|
5
5
|
const exsolve = require('exsolve');
|
|
6
6
|
const pathe = require('pathe');
|
|
7
|
-
const module$1 = require('../shared/nuxt-og-image.
|
|
7
|
+
const module$1 = require('../shared/nuxt-og-image.BCK8Adm4.cjs');
|
|
8
8
|
require('node:crypto');
|
|
9
9
|
require('node:fs');
|
|
10
10
|
require('@nuxt/kit');
|
|
@@ -14,7 +14,7 @@ require('ohash');
|
|
|
14
14
|
require('pkg-types');
|
|
15
15
|
require('std-env');
|
|
16
16
|
require('oxc-walker');
|
|
17
|
-
require('../shared/nuxt-og-image.
|
|
17
|
+
require('../shared/nuxt-og-image.DQkJQHaN.cjs');
|
|
18
18
|
require('magicast');
|
|
19
19
|
require('magicast/helpers');
|
|
20
20
|
require('../../dist/runtime/logger.js');
|
package/dist/chunks/tw4.mjs
CHANGED
|
@@ -2,7 +2,7 @@ import { readFile } from 'node:fs/promises';
|
|
|
2
2
|
import { pathToFileURL } from 'node:url';
|
|
3
3
|
import { resolveModulePath } from 'exsolve';
|
|
4
4
|
import { dirname, join } from 'pathe';
|
|
5
|
-
import { e as extractVariantBaseClasses, r as resolveVariantPrefixes, h as resolveExtractedVars, i as resolveVarsDeep, s as simplifyCss, p as postProcessStyles, l as loadLightningCss, a as extractCssVars, c as extractUniversalVars, d as extractPerClassVars, g as extractVarsFromCss, f as extractClassStyles } from '../shared/nuxt-og-image.
|
|
5
|
+
import { e as extractVariantBaseClasses, r as resolveVariantPrefixes, h as resolveExtractedVars, i as resolveVarsDeep, s as simplifyCss, p as postProcessStyles, l as loadLightningCss, a as extractCssVars, c as extractUniversalVars, d as extractPerClassVars, g as extractVarsFromCss, f as extractClassStyles } from '../shared/nuxt-og-image.Pfj5JkJd.mjs';
|
|
6
6
|
import 'node:crypto';
|
|
7
7
|
import 'node:fs';
|
|
8
8
|
import '@nuxt/kit';
|
|
@@ -12,7 +12,7 @@ import 'ohash';
|
|
|
12
12
|
import 'pkg-types';
|
|
13
13
|
import 'std-env';
|
|
14
14
|
import 'oxc-walker';
|
|
15
|
-
import '../shared/nuxt-og-image.
|
|
15
|
+
import '../shared/nuxt-og-image.LgUGeaz-.mjs';
|
|
16
16
|
import 'magicast';
|
|
17
17
|
import 'magicast/helpers';
|
|
18
18
|
import '../../dist/runtime/logger.js';
|
package/dist/chunks/uno.cjs
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
const promises = require('node:fs/promises');
|
|
4
4
|
const defu = require('defu');
|
|
5
5
|
const logger_js = require('../../dist/runtime/logger.js');
|
|
6
|
-
const module$1 = require('../shared/nuxt-og-image.
|
|
6
|
+
const module$1 = require('../shared/nuxt-og-image.BCK8Adm4.cjs');
|
|
7
7
|
require('node:crypto');
|
|
8
8
|
require('node:fs');
|
|
9
9
|
require('node:url');
|
|
@@ -14,7 +14,7 @@ require('pathe');
|
|
|
14
14
|
require('pkg-types');
|
|
15
15
|
require('std-env');
|
|
16
16
|
require('oxc-walker');
|
|
17
|
-
require('../shared/nuxt-og-image.
|
|
17
|
+
require('../shared/nuxt-og-image.DQkJQHaN.cjs');
|
|
18
18
|
require('magicast');
|
|
19
19
|
require('magicast/helpers');
|
|
20
20
|
require('nypm');
|
package/dist/chunks/uno.mjs
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { readFile } from 'node:fs/promises';
|
|
2
2
|
import { defu } from 'defu';
|
|
3
3
|
import { logger } from '../../dist/runtime/logger.js';
|
|
4
|
-
import { e as extractVariantBaseClasses, s as simplifyCss, a as extractCssVars, b as extractPropertyInitialValues, c as extractUniversalVars, d as extractPerClassVars, f as extractClassStyles, p as postProcessStyles, r as resolveVariantPrefixes, g as extractVarsFromCss, h as resolveExtractedVars } from '../shared/nuxt-og-image.
|
|
4
|
+
import { e as extractVariantBaseClasses, s as simplifyCss, a as extractCssVars, b as extractPropertyInitialValues, c as extractUniversalVars, d as extractPerClassVars, f as extractClassStyles, p as postProcessStyles, r as resolveVariantPrefixes, g as extractVarsFromCss, h as resolveExtractedVars } from '../shared/nuxt-og-image.Pfj5JkJd.mjs';
|
|
5
5
|
import 'node:crypto';
|
|
6
6
|
import 'node:fs';
|
|
7
7
|
import 'node:url';
|
|
@@ -12,7 +12,7 @@ import 'pathe';
|
|
|
12
12
|
import 'pkg-types';
|
|
13
13
|
import 'std-env';
|
|
14
14
|
import 'oxc-walker';
|
|
15
|
-
import '../shared/nuxt-og-image.
|
|
15
|
+
import '../shared/nuxt-og-image.LgUGeaz-.mjs';
|
|
16
16
|
import 'magicast';
|
|
17
17
|
import 'magicast/helpers';
|
|
18
18
|
import 'nypm';
|
package/dist/cli.cjs
CHANGED
|
@@ -10,7 +10,7 @@ const nypm = require('nypm');
|
|
|
10
10
|
const oxcWalker = require('oxc-walker');
|
|
11
11
|
const pathe = require('pathe');
|
|
12
12
|
const ultrahtml = require('ultrahtml');
|
|
13
|
-
const dependencies = require('./shared/nuxt-og-image.
|
|
13
|
+
const dependencies = require('./shared/nuxt-og-image.DQkJQHaN.cjs');
|
|
14
14
|
require('magicast');
|
|
15
15
|
require('magicast/helpers');
|
|
16
16
|
require('../dist/runtime/logger.js');
|
package/dist/cli.mjs
CHANGED
|
@@ -8,7 +8,7 @@ import { detectPackageManager, removeDependency, addDependency } from 'nypm';
|
|
|
8
8
|
import { parseAndWalk } from 'oxc-walker';
|
|
9
9
|
import { dirname, resolve, join, relative, basename } from 'pathe';
|
|
10
10
|
import { parse, walkSync, ELEMENT_NODE } from 'ultrahtml';
|
|
11
|
-
import { m as migrateDefaultsComponent, a as migrateFontsConfig, T as TAKUMI_CORE_INSTALL_SPEC, b as TAKUMI_WASM_INSTALL_SPEC } from './shared/nuxt-og-image.
|
|
11
|
+
import { m as migrateDefaultsComponent, a as migrateFontsConfig, T as TAKUMI_CORE_INSTALL_SPEC, b as TAKUMI_WASM_INSTALL_SPEC } from './shared/nuxt-og-image.LgUGeaz-.mjs';
|
|
12
12
|
import 'magicast';
|
|
13
13
|
import 'magicast/helpers';
|
|
14
14
|
import '../dist/runtime/logger.js';
|
package/dist/module.cjs
CHANGED
|
@@ -11,8 +11,8 @@ require('ohash');
|
|
|
11
11
|
require('pathe');
|
|
12
12
|
require('pkg-types');
|
|
13
13
|
require('std-env');
|
|
14
|
-
const module$1 = require('./shared/nuxt-og-image.
|
|
15
|
-
require('./shared/nuxt-og-image.
|
|
14
|
+
const module$1 = require('./shared/nuxt-og-image.BCK8Adm4.cjs');
|
|
15
|
+
require('./shared/nuxt-og-image.DQkJQHaN.cjs');
|
|
16
16
|
require('nuxtseo-shared/kit');
|
|
17
17
|
require('../dist/runtime/logger.js');
|
|
18
18
|
require('oxc-walker');
|
package/dist/module.json
CHANGED
package/dist/module.mjs
CHANGED
|
@@ -9,8 +9,8 @@ import 'ohash';
|
|
|
9
9
|
import 'pathe';
|
|
10
10
|
import 'pkg-types';
|
|
11
11
|
import 'std-env';
|
|
12
|
-
export { m as default } from './shared/nuxt-og-image.
|
|
13
|
-
import './shared/nuxt-og-image.
|
|
12
|
+
export { m as default } from './shared/nuxt-og-image.Pfj5JkJd.mjs';
|
|
13
|
+
import './shared/nuxt-og-image.LgUGeaz-.mjs';
|
|
14
14
|
import 'nuxtseo-shared/kit';
|
|
15
15
|
import '../dist/runtime/logger.js';
|
|
16
16
|
import 'oxc-walker';
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
declare function extractResourceUrls(nodes: any): Promise<string[]>;
|
|
1
2
|
declare const _default: {
|
|
2
3
|
initWasmPromise: Promise<void>;
|
|
3
4
|
Renderer: typeof import("@takumi-rs/core").Renderer;
|
|
4
|
-
extractResourceUrls: typeof
|
|
5
|
+
extractResourceUrls: typeof extractResourceUrls;
|
|
5
6
|
};
|
|
6
7
|
export default _default;
|
|
@@ -1,19 +1,15 @@
|
|
|
1
1
|
import { Worker } from "node:worker_threads";
|
|
2
|
+
import { extractResourceUrls as extractTakumiResourceUrls } from "./resource-urls.js";
|
|
2
3
|
const workerCode = `
|
|
3
4
|
const { createRequire } = require('node:module')
|
|
4
5
|
const _require = createRequire(process.cwd() + '/')
|
|
5
6
|
const { parentPort } = require('node:worker_threads')
|
|
6
|
-
const { Renderer
|
|
7
|
+
const { Renderer } = _require('@takumi-rs/core')
|
|
7
8
|
|
|
8
9
|
let renderer = new Renderer()
|
|
9
10
|
|
|
10
11
|
parentPort.on('message', async ({ id, type, newFonts, nodes, options }) => {
|
|
11
12
|
try {
|
|
12
|
-
if (type === 'extractResourceUrls') {
|
|
13
|
-
const urls = extractResourceUrls(nodes)
|
|
14
|
-
parentPort.postMessage({ id, urls })
|
|
15
|
-
return
|
|
16
|
-
}
|
|
17
13
|
const fontWarnings = []
|
|
18
14
|
for (const font of (newFonts || [])) {
|
|
19
15
|
try {
|
|
@@ -115,7 +111,7 @@ function postToWorker(msg, timeoutMs = 3e4) {
|
|
|
115
111
|
});
|
|
116
112
|
}
|
|
117
113
|
function extractResourceUrls(nodes) {
|
|
118
|
-
return
|
|
114
|
+
return Promise.resolve(extractTakumiResourceUrls(nodes));
|
|
119
115
|
}
|
|
120
116
|
class RendererWorkerProxy {
|
|
121
117
|
allFonts = [];
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
function isWhitespace(char) {
|
|
2
|
+
return char === " " || char === "\n" || char === " " || char === "\r" || char === "\f";
|
|
3
|
+
}
|
|
4
|
+
function findUrlFunction(value, start) {
|
|
5
|
+
for (let i = start; i <= value.length - 4; i++) {
|
|
6
|
+
if ((value[i] === "u" || value[i] === "U") && (value[i + 1] === "r" || value[i + 1] === "R") && (value[i + 2] === "l" || value[i + 2] === "L") && value[i + 3] === "(") {
|
|
7
|
+
return i;
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
return -1;
|
|
11
|
+
}
|
|
12
|
+
function readQuotedUrl(value, start, quote) {
|
|
13
|
+
let i = start + 1;
|
|
14
|
+
while (i < value.length) {
|
|
15
|
+
const char = value[i];
|
|
16
|
+
if (char === "\\") {
|
|
17
|
+
i += 2;
|
|
18
|
+
continue;
|
|
19
|
+
}
|
|
20
|
+
if (char === quote) {
|
|
21
|
+
const url = value.slice(start + 1, i);
|
|
22
|
+
i++;
|
|
23
|
+
while (isWhitespace(value[i]))
|
|
24
|
+
i++;
|
|
25
|
+
return value[i] === ")" ? { end: i + 1, url } : null;
|
|
26
|
+
}
|
|
27
|
+
i++;
|
|
28
|
+
}
|
|
29
|
+
return null;
|
|
30
|
+
}
|
|
31
|
+
function readUnquotedUrl(value, start) {
|
|
32
|
+
const end = value.indexOf(")", start);
|
|
33
|
+
return end === -1 ? null : { end: end + 1, url: value.slice(start, end) };
|
|
34
|
+
}
|
|
35
|
+
function collectCssUrls(value, urls) {
|
|
36
|
+
let index = 0;
|
|
37
|
+
while (index < value.length) {
|
|
38
|
+
const start = findUrlFunction(value, index);
|
|
39
|
+
if (start === -1)
|
|
40
|
+
return;
|
|
41
|
+
let urlStart = start + 4;
|
|
42
|
+
while (isWhitespace(value[urlStart]))
|
|
43
|
+
urlStart++;
|
|
44
|
+
const quote = value[urlStart];
|
|
45
|
+
const result = quote === "'" || quote === '"' ? readQuotedUrl(value, urlStart, quote) : readUnquotedUrl(value, urlStart);
|
|
46
|
+
if (!result) {
|
|
47
|
+
index = start + 4;
|
|
48
|
+
continue;
|
|
49
|
+
}
|
|
50
|
+
const url = result.url.trim();
|
|
51
|
+
if (isFetchableResourceUrl(url))
|
|
52
|
+
urls.add(url);
|
|
53
|
+
index = result.end;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
function isFetchableResourceUrl(value) {
|
|
57
|
+
return typeof value === "string" && (value.startsWith("/") || /^https?:\/\//i.test(value));
|
|
58
|
+
}
|
|
59
|
+
function collectUrlsFromValue(value, urls) {
|
|
60
|
+
if (typeof value !== "string") {
|
|
61
|
+
if (Array.isArray(value)) {
|
|
62
|
+
for (const item of value)
|
|
63
|
+
collectUrlsFromValue(item, urls);
|
|
64
|
+
}
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
collectCssUrls(value, urls);
|
|
68
|
+
}
|
|
69
|
+
function collectStyleUrls(style, urls) {
|
|
70
|
+
if (!style || typeof style !== "object")
|
|
71
|
+
return;
|
|
72
|
+
for (const value of Object.values(style))
|
|
73
|
+
collectUrlsFromValue(value, urls);
|
|
74
|
+
}
|
|
75
|
+
function collectNodeUrls(node, urls) {
|
|
76
|
+
collectStyleUrls(node.style, urls);
|
|
77
|
+
collectStyleUrls(node.preset, urls);
|
|
78
|
+
collectUrlsFromValue(node.tw, urls);
|
|
79
|
+
if (node.type === "image" && isFetchableResourceUrl(node.src))
|
|
80
|
+
urls.add(node.src);
|
|
81
|
+
if (node.type === "container") {
|
|
82
|
+
for (const child of node.children || [])
|
|
83
|
+
collectNodeUrls(child, urls);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
export function extractResourceUrls(nodes) {
|
|
87
|
+
const urls = /* @__PURE__ */ new Set();
|
|
88
|
+
for (const node of Array.isArray(nodes) ? nodes : [nodes])
|
|
89
|
+
collectNodeUrls(node, urls);
|
|
90
|
+
return [...urls];
|
|
91
|
+
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Renderer } from '@takumi-rs/wasm/no-bundler';
|
|
2
|
+
import { extractResourceUrls } from './resource-urls.js';
|
|
2
3
|
declare const _default: {
|
|
3
4
|
initWasmPromise: Promise<import("@takumi-rs/wasm").InitOutput>;
|
|
4
5
|
Renderer: typeof Renderer;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import init, {
|
|
1
|
+
import init, { Renderer } from "@takumi-rs/wasm/no-bundler";
|
|
2
|
+
import { extractResourceUrls } from "./resource-urls.js";
|
|
2
3
|
const wasmBinary = import("@takumi-rs/wasm/takumi_wasm_bg.wasm?module").then((m) => m.default || m);
|
|
3
4
|
export default {
|
|
4
5
|
initWasmPromise: wasmBinary.then((wasm) => init({ module_or_path: wasm })),
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import type { Node } from '@takumi-rs/helpers';
|
|
2
|
-
import type { OgImageRenderEventContext } from '../../../types.js';
|
|
2
|
+
import type { OgImageRenderEventContext, VNode } from '../../../types.js';
|
|
3
3
|
export declare function createTakumiNodes(ctx: OgImageRenderEventContext): Promise<Node>;
|
|
4
|
+
export declare function vnodeToTakumiNode(vnode: VNode, inheritedFontSize: number, inheritedColor?: string): Promise<Node>;
|
|
@@ -43,8 +43,13 @@ function extractFontSize(props, style) {
|
|
|
43
43
|
}
|
|
44
44
|
return void 0;
|
|
45
45
|
}
|
|
46
|
-
|
|
46
|
+
function extractColor(style) {
|
|
47
|
+
const color = style?.color;
|
|
48
|
+
return typeof color === "string" && color ? color : void 0;
|
|
49
|
+
}
|
|
50
|
+
export async function vnodeToTakumiNode(vnode, inheritedFontSize, inheritedColor) {
|
|
47
51
|
const { style, children, class: cls, tw, src, ...rest } = vnode.props;
|
|
52
|
+
const nodeColor = extractColor(style) ?? inheritedColor;
|
|
48
53
|
const baseMetadata = {
|
|
49
54
|
tw: tw || cls || void 0,
|
|
50
55
|
style
|
|
@@ -56,7 +61,7 @@ async function vnodeToTakumiNode(vnode, inheritedFontSize) {
|
|
|
56
61
|
return {
|
|
57
62
|
...baseMetadata,
|
|
58
63
|
type: "image",
|
|
59
|
-
src: vnodeToHtmlString(vnode),
|
|
64
|
+
src: vnodeToHtmlString(vnode, nodeColor),
|
|
60
65
|
// When em/rem + explicit parent font size → resolve to px.
|
|
61
66
|
// When em/rem + default font size → leave undefined (takumi handles natively).
|
|
62
67
|
// Otherwise → use standard resolution chain (numeric attrs → style → viewBox).
|
|
@@ -99,7 +104,7 @@ async function vnodeToTakumiNode(vnode, inheritedFontSize) {
|
|
|
99
104
|
const takumiChildren = [];
|
|
100
105
|
for (const child of children) {
|
|
101
106
|
if (child && typeof child === "object")
|
|
102
|
-
takumiChildren.push(await vnodeToTakumiNode(child, childFontSize));
|
|
107
|
+
takumiChildren.push(await vnodeToTakumiNode(child, childFontSize, nodeColor));
|
|
103
108
|
else if (typeof child === "string" && child.trim())
|
|
104
109
|
takumiChildren.push({ type: "text", text: child.trim() });
|
|
105
110
|
}
|
|
@@ -114,9 +119,13 @@ async function vnodeToTakumiNode(vnode, inheritedFontSize) {
|
|
|
114
119
|
type: "container"
|
|
115
120
|
};
|
|
116
121
|
}
|
|
117
|
-
function
|
|
122
|
+
function resolveCurrentColor(value, color) {
|
|
123
|
+
return color && typeof value === "string" && value.toLowerCase() === "currentcolor" ? color : value;
|
|
124
|
+
}
|
|
125
|
+
function vnodeToHtmlString(vnode, inheritedColor) {
|
|
118
126
|
const { style, children, ...attrs } = vnode.props;
|
|
119
127
|
const attrParts = [];
|
|
128
|
+
const nodeColor = extractColor(style) ?? inheritedColor;
|
|
120
129
|
const kebabCase = (str) => str.replace(RE_UPPERCASE, (m) => `-${m.toLowerCase()}`);
|
|
121
130
|
if (vnode.type === "svg") {
|
|
122
131
|
if (!attrs.xmlns)
|
|
@@ -138,7 +147,7 @@ function vnodeToHtmlString(vnode) {
|
|
|
138
147
|
return val;
|
|
139
148
|
};
|
|
140
149
|
if (style && typeof style === "object") {
|
|
141
|
-
const styleStr = Object.entries(style).filter(([_, v]) => v !== void 0 && v !== null && v !== "").map(([k, v]) => `${kebabCase(k)}:${resolveValue(v)}`).join(";");
|
|
150
|
+
const styleStr = Object.entries(style).filter(([_, v]) => v !== void 0 && v !== null && v !== "").map(([k, v]) => `${kebabCase(k)}:${resolveValue(resolveCurrentColor(v, nodeColor))}`).join(";");
|
|
142
151
|
if (styleStr)
|
|
143
152
|
attrParts.push(`style="${styleStr.replace(RE_DQUOTE, """)}"`);
|
|
144
153
|
} else if (typeof style === "string") {
|
|
@@ -148,14 +157,14 @@ function vnodeToHtmlString(vnode) {
|
|
|
148
157
|
if (key === "tw" || key === "class" || val == null)
|
|
149
158
|
continue;
|
|
150
159
|
const finalKey = SVG_CAMEL_ATTR_VALUES.has(key) ? key : kebabCase(key);
|
|
151
|
-
attrParts.push(`${finalKey}="${String(resolveValue(val)).replace(RE_DQUOTE, """)}"`);
|
|
160
|
+
attrParts.push(`${finalKey}="${String(resolveValue(resolveCurrentColor(val, nodeColor))).replace(RE_DQUOTE, """)}"`);
|
|
152
161
|
}
|
|
153
162
|
const open = attrParts.length ? `<${vnode.type} ${attrParts.join(" ")}>` : `<${vnode.type}>`;
|
|
154
163
|
const inner = Array.isArray(children) ? children.map((c) => {
|
|
155
164
|
if (typeof c === "string")
|
|
156
165
|
return c.replace(RE_AMP, "&").replace(RE_LT, "<").replace(RE_GT, ">");
|
|
157
166
|
if (c && typeof c === "object")
|
|
158
|
-
return vnodeToHtmlString(c);
|
|
167
|
+
return vnodeToHtmlString(c, nodeColor);
|
|
159
168
|
return "";
|
|
160
169
|
}).join("") : typeof children === "string" ? children.replace(RE_AMP, "&").replace(RE_LT, "<").replace(RE_GT, ">") : "";
|
|
161
170
|
return `${open}${inner}</${vnode.type}>`;
|
|
@@ -12,7 +12,7 @@ const pathe = require('pathe');
|
|
|
12
12
|
const pkgTypes = require('pkg-types');
|
|
13
13
|
const stdEnv = require('std-env');
|
|
14
14
|
const oxcWalker = require('oxc-walker');
|
|
15
|
-
const dependencies = require('./nuxt-og-image.
|
|
15
|
+
const dependencies = require('./nuxt-og-image.DQkJQHaN.cjs');
|
|
16
16
|
const devtools = require('nuxtseo-shared/devtools');
|
|
17
17
|
const unstorage = require('unstorage');
|
|
18
18
|
const fsDriver = require('unstorage/drivers/fs-lite');
|
|
@@ -4317,7 +4317,7 @@ const module$1 = kit.defineNuxtModule({
|
|
|
4317
4317
|
await onUpgrade(nuxt, options, previousVersion);
|
|
4318
4318
|
},
|
|
4319
4319
|
async setup(config, nuxt) {
|
|
4320
|
-
const _resolver = kit.createResolver((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/nuxt-og-image.
|
|
4320
|
+
const _resolver = kit.createResolver((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/nuxt-og-image.BCK8Adm4.cjs', document.baseURI).href)));
|
|
4321
4321
|
const fixSharedPath = (p) => {
|
|
4322
4322
|
return p.replace(/\/shared\/runtime(\/|$)/, "/runtime$1").replace(/\/shared\/client(\/|$)/, "/client$1").replace(/\/shared\/devtools(\/|$)/, "/devtools$1");
|
|
4323
4323
|
};
|
|
@@ -464,7 +464,7 @@ async function ensureDependencies(dep, nuxt = kit.useNuxt()) {
|
|
|
464
464
|
}));
|
|
465
465
|
}
|
|
466
466
|
|
|
467
|
-
const TAKUMI_INSTALL_TAG = "
|
|
467
|
+
const TAKUMI_INSTALL_TAG = "rc";
|
|
468
468
|
const TAKUMI_CORE_PACKAGE = "@takumi-rs/core";
|
|
469
469
|
const TAKUMI_WASM_PACKAGE = "@takumi-rs/wasm";
|
|
470
470
|
const TAKUMI_CORE_INSTALL_SPEC = `${TAKUMI_CORE_PACKAGE}@${TAKUMI_INSTALL_TAG}`;
|
|
@@ -462,7 +462,7 @@ async function ensureDependencies(dep, nuxt = useNuxt()) {
|
|
|
462
462
|
}));
|
|
463
463
|
}
|
|
464
464
|
|
|
465
|
-
const TAKUMI_INSTALL_TAG = "
|
|
465
|
+
const TAKUMI_INSTALL_TAG = "rc";
|
|
466
466
|
const TAKUMI_CORE_PACKAGE = "@takumi-rs/core";
|
|
467
467
|
const TAKUMI_WASM_PACKAGE = "@takumi-rs/wasm";
|
|
468
468
|
const TAKUMI_CORE_INSTALL_SPEC = `${TAKUMI_CORE_PACKAGE}@${TAKUMI_INSTALL_TAG}`;
|
|
@@ -11,7 +11,7 @@ import { join, dirname, relative, isAbsolute, resolve, basename } from 'pathe';
|
|
|
11
11
|
import { readPackageJSON } from 'pkg-types';
|
|
12
12
|
import { isCI, isAgent } from 'std-env';
|
|
13
13
|
import { parseAndWalk } from 'oxc-walker';
|
|
14
|
-
import { c as applyNitroPresetCompatibility, r as resolveOgImagePreset, R as RE_LEGACY_SUFFIX, g as getPresetNitroPresetCompatibility, d as getRecommendedBinding, e as getMissingDependencies, f as RE_RENDERER_SUFFIX, h as RE_WHITESPACE, p as promptFontsMigration, i as getRendererFromFilename, v as validateProviderSetup, j as getInstalledProviders, T as TAKUMI_CORE_INSTALL_SPEC, k as canPromptInteractively, P as PROVIDER_DEPENDENCIES, l as getRecommendedBindingFromPreset, n as getMissingDependencyInstallSpecs, o as ensureProviderDependencies, q as getProviderDependencyInstallSpecs, s as hasResolvableDependency, t as getRegisteredBaseNames, u as ensureDependencies, w as checkLocalChrome, x as promptForRendererSelection, y as isUndefinedOrTruthy } from './nuxt-og-image.
|
|
14
|
+
import { c as applyNitroPresetCompatibility, r as resolveOgImagePreset, R as RE_LEGACY_SUFFIX, g as getPresetNitroPresetCompatibility, d as getRecommendedBinding, e as getMissingDependencies, f as RE_RENDERER_SUFFIX, h as RE_WHITESPACE, p as promptFontsMigration, i as getRendererFromFilename, v as validateProviderSetup, j as getInstalledProviders, T as TAKUMI_CORE_INSTALL_SPEC, k as canPromptInteractively, P as PROVIDER_DEPENDENCIES, l as getRecommendedBindingFromPreset, n as getMissingDependencyInstallSpecs, o as ensureProviderDependencies, q as getProviderDependencyInstallSpecs, s as hasResolvableDependency, t as getRegisteredBaseNames, u as ensureDependencies, w as checkLocalChrome, x as promptForRendererSelection, y as isUndefinedOrTruthy } from './nuxt-og-image.LgUGeaz-.mjs';
|
|
15
15
|
import { setupDevToolsUI as setupDevToolsUI$1, setupDevToolsRpc } from 'nuxtseo-shared/devtools';
|
|
16
16
|
import { createStorage } from 'unstorage';
|
|
17
17
|
import fsDriver from 'unstorage/drivers/fs-lite';
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nuxt-og-image",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "6.7.
|
|
4
|
+
"version": "6.7.2",
|
|
5
5
|
"description": "Enlightened OG Image generation for Nuxt.",
|
|
6
6
|
"author": {
|
|
7
7
|
"website": "https://harlanzw.com",
|
|
@@ -50,8 +50,8 @@
|
|
|
50
50
|
"peerDependencies": {
|
|
51
51
|
"@resvg/resvg-js": "^2.6.0",
|
|
52
52
|
"@resvg/resvg-wasm": "^2.6.0",
|
|
53
|
-
"@takumi-rs/core": "^1.0.0-beta.3 || ^2.0.0-
|
|
54
|
-
"@takumi-rs/wasm": "^1.0.0-beta.3 || ^2.0.0-
|
|
53
|
+
"@takumi-rs/core": "^1.0.0-beta.3 || ^2.0.0-rc.5",
|
|
54
|
+
"@takumi-rs/wasm": "^1.0.0-beta.3 || ^2.0.0-rc.5",
|
|
55
55
|
"@unhead/vue": "^2.0.5 || ^3.0.0",
|
|
56
56
|
"fontless": "^0.2.0",
|
|
57
57
|
"nitropack": "^2.13.4",
|
|
@@ -104,9 +104,9 @@
|
|
|
104
104
|
"dependencies": {
|
|
105
105
|
"@clack/prompts": "^1.6.0",
|
|
106
106
|
"@nuxt/kit": "^4.4.8",
|
|
107
|
-
"@unocss/config": "^66.7.
|
|
108
|
-
"@unocss/core": "^66.7.
|
|
109
|
-
"@vue/compiler-sfc": "^3.5.
|
|
107
|
+
"@unocss/config": "^66.7.4",
|
|
108
|
+
"@unocss/core": "^66.7.4",
|
|
109
|
+
"@vue/compiler-sfc": "^3.5.39",
|
|
110
110
|
"chrome-launcher": "^1.2.1",
|
|
111
111
|
"consola": "^3.4.2",
|
|
112
112
|
"culori": "^4.0.2",
|
|
@@ -117,12 +117,12 @@
|
|
|
117
117
|
"magic-string": "^0.30.21",
|
|
118
118
|
"magicast": "^0.5.3",
|
|
119
119
|
"mocked-exports": "^0.1.1",
|
|
120
|
-
"nuxt-site-config": "^4.1.
|
|
121
|
-
"nuxtseo-shared": "^5.3.
|
|
122
|
-
"nypm": "^0.6.
|
|
120
|
+
"nuxt-site-config": "^4.1.1",
|
|
121
|
+
"nuxtseo-shared": "^5.3.2",
|
|
122
|
+
"nypm": "^0.6.8",
|
|
123
123
|
"ofetch": "^1.5.1",
|
|
124
124
|
"ohash": "^2.0.11",
|
|
125
|
-
"oxc-parser": "^0.
|
|
125
|
+
"oxc-parser": "^0.138.0",
|
|
126
126
|
"oxc-walker": "^1.0.0",
|
|
127
127
|
"pathe": "^2.0.3",
|
|
128
128
|
"pkg-types": "^2.3.1",
|
|
@@ -133,10 +133,10 @@
|
|
|
133
133
|
"tinyglobby": "^0.2.17",
|
|
134
134
|
"ufo": "^1.6.4",
|
|
135
135
|
"ultrahtml": "^1.6.0",
|
|
136
|
-
"unplugin": "^3.
|
|
136
|
+
"unplugin": "^3.3.0"
|
|
137
137
|
},
|
|
138
138
|
"devDependencies": {
|
|
139
|
-
"@antfu/eslint-config": "^9.
|
|
139
|
+
"@antfu/eslint-config": "^9.1.0",
|
|
140
140
|
"@fontsource/noto-sans-sc": "^5.2.9",
|
|
141
141
|
"@iconify-json/carbon": "^1.2.23",
|
|
142
142
|
"@iconify-json/logos": "^1.2.11",
|
|
@@ -144,12 +144,12 @@
|
|
|
144
144
|
"@iconify-json/ri": "^1.2.10",
|
|
145
145
|
"@iconify-json/tabler": "^1.2.35",
|
|
146
146
|
"@iconify/types": "^2.0.0",
|
|
147
|
-
"@img/sharp-linux-x64": "^0.35.
|
|
147
|
+
"@img/sharp-linux-x64": "^0.35.3",
|
|
148
148
|
"@nuxt/content": "^3.14.0",
|
|
149
149
|
"@nuxt/devtools": "4.0.0-alpha.7",
|
|
150
150
|
"@nuxt/devtools-kit": "4.0.0-alpha.7",
|
|
151
151
|
"@nuxt/fonts": "^0.14.0",
|
|
152
|
-
"@nuxt/icon": "^2.2.
|
|
152
|
+
"@nuxt/icon": "^2.2.5",
|
|
153
153
|
"@nuxt/image": "^2.0.0",
|
|
154
154
|
"@nuxt/module-builder": "^1.0.2",
|
|
155
155
|
"@nuxt/test-utils": "^4.0.3",
|
|
@@ -160,23 +160,23 @@
|
|
|
160
160
|
"@nuxtjs/tailwindcss": "7.0.0-beta.1",
|
|
161
161
|
"@resvg/resvg-js": "^2.6.2",
|
|
162
162
|
"@resvg/resvg-wasm": "^2.6.2",
|
|
163
|
-
"@tailwindcss/vite": "^4.3.
|
|
164
|
-
"@takumi-rs/core": "^2.0.0-
|
|
163
|
+
"@tailwindcss/vite": "^4.3.2",
|
|
164
|
+
"@takumi-rs/core": "^2.0.0-rc.5",
|
|
165
165
|
"@takumi-rs/core-v1": "npm:@takumi-rs/core@1.8.7",
|
|
166
|
-
"@takumi-rs/helpers": "^2.0.0-
|
|
166
|
+
"@takumi-rs/helpers": "^2.0.0-rc.5",
|
|
167
167
|
"@takumi-rs/helpers-v1": "npm:@takumi-rs/helpers@1.8.7",
|
|
168
|
-
"@takumi-rs/wasm": "^2.0.0-
|
|
168
|
+
"@takumi-rs/wasm": "^2.0.0-rc.5",
|
|
169
169
|
"@takumi-rs/wasm-v1": "npm:@takumi-rs/wasm@1.8.7",
|
|
170
|
-
"@unocss/nuxt": "^66.7.
|
|
171
|
-
"@unocss/preset-icons": "^66.7.
|
|
172
|
-
"@unocss/preset-wind": "^66.7.
|
|
173
|
-
"@unocss/preset-wind4": "^66.7.
|
|
170
|
+
"@unocss/nuxt": "^66.7.4",
|
|
171
|
+
"@unocss/preset-icons": "^66.7.4",
|
|
172
|
+
"@unocss/preset-wind": "^66.7.4",
|
|
173
|
+
"@unocss/preset-wind4": "^66.7.4",
|
|
174
174
|
"@vitejs/plugin-vue": "^6.0.7",
|
|
175
|
-
"@vue/compiler-core": "^3.5.
|
|
175
|
+
"@vue/compiler-core": "^3.5.39",
|
|
176
176
|
"@vueuse/nuxt": "^14.3.0",
|
|
177
177
|
"birpc": "^4.0.0",
|
|
178
178
|
"bumpp": "^11.1.0",
|
|
179
|
-
"eslint": "^10.
|
|
179
|
+
"eslint": "^10.6.0",
|
|
180
180
|
"eslint-plugin-harlanzw": "^0.17.0",
|
|
181
181
|
"fontless": "^0.2.1",
|
|
182
182
|
"get-image-colors": "^4.0.1",
|
|
@@ -187,22 +187,22 @@
|
|
|
187
187
|
"lightningcss": "^1.32.0",
|
|
188
188
|
"nitropack": "^2.13.4",
|
|
189
189
|
"nuxt": "^4.4.8",
|
|
190
|
-
"nuxtseo-layer-devtools": "^5.3.
|
|
191
|
-
"playwright": "^1.61.
|
|
192
|
-
"playwright-core": "^1.61.
|
|
190
|
+
"nuxtseo-layer-devtools": "^5.3.2",
|
|
191
|
+
"playwright": "^1.61.1",
|
|
192
|
+
"playwright-core": "^1.61.1",
|
|
193
193
|
"sass": "^1.101.0",
|
|
194
194
|
"satori": "^0.26.0",
|
|
195
|
-
"sharp": "^0.35.
|
|
195
|
+
"sharp": "^0.35.3",
|
|
196
196
|
"sirv": "^3.0.2",
|
|
197
|
-
"tailwindcss": "^4.3.
|
|
197
|
+
"tailwindcss": "^4.3.2",
|
|
198
198
|
"typescript": "^6.0.3",
|
|
199
199
|
"unbuild": "^3.6.1",
|
|
200
200
|
"unifont": "^0.7.4",
|
|
201
|
-
"unocss": "^66.7.
|
|
201
|
+
"unocss": "^66.7.4",
|
|
202
202
|
"vitest": "^4.1.9",
|
|
203
|
-
"vue": "^3.5.
|
|
204
|
-
"vue-tsc": "^3.3.
|
|
205
|
-
"wrangler": "^4.
|
|
203
|
+
"vue": "^3.5.39",
|
|
204
|
+
"vue-tsc": "^3.3.6",
|
|
205
|
+
"wrangler": "^4.106.0",
|
|
206
206
|
"yoga-wasm-web": "^0.3.3",
|
|
207
207
|
"zod": "^4.4.3"
|
|
208
208
|
},
|