summaryrefslogtreecommitdiff
path: root/packages/integrations/markdoc/src
diff options
context:
space:
mode:
authorGravatar Ben Holmes <hey@bholmes.dev> 2023-07-07 16:50:06 -0400
committerGravatar GitHub <noreply@github.com> 2023-07-07 16:50:06 -0400
commit8df6a423c5088a68cc409b5415b09aff0c10a0f1 (patch)
tree2e2e2a8d5ab59538eb9432f237e6e2bcdc6864ed /packages/integrations/markdoc/src
parent6fd9f4a1601424f054985611a716123c272429c3 (diff)
downloadastro-8df6a423c5088a68cc409b5415b09aff0c10a0f1.tar.gz
astro-8df6a423c5088a68cc409b5415b09aff0c10a0f1.tar.zst
astro-8df6a423c5088a68cc409b5415b09aff0c10a0f1.zip
Fix: Hyphens breaking Markdoc tags (#7599)
* fix: handle hyphens in tag names * test: add hyphen in test suite * chore: changeset
Diffstat (limited to 'packages/integrations/markdoc/src')
-rw-r--r--packages/integrations/markdoc/src/content-entry-type.ts13
1 files changed, 10 insertions, 3 deletions
diff --git a/packages/integrations/markdoc/src/content-entry-type.ts b/packages/integrations/markdoc/src/content-entry-type.ts
index 2bae5402c..348c8a882 100644
--- a/packages/integrations/markdoc/src/content-entry-type.ts
+++ b/packages/integrations/markdoc/src/content-entry-type.ts
@@ -225,8 +225,8 @@ function getStringifiedImports(
let stringifiedComponentImports = '';
for (const [key, config] of Object.entries(componentConfigMap)) {
const importName = config.namedExport
- ? `{ ${config.namedExport} as ${componentNamePrefix + key} }`
- : componentNamePrefix + key;
+ ? `{ ${config.namedExport} as ${componentNamePrefix + toImportName(key)} }`
+ : componentNamePrefix + toImportName(key);
const resolvedPath =
config.type === 'local' ? new URL(config.path, root).pathname : config.path;
@@ -235,6 +235,11 @@ function getStringifiedImports(
return stringifiedComponentImports;
}
+function toImportName(unsafeName: string) {
+ // TODO: more checks that name is a safe JS variable name
+ return unsafeName.replace('-', '_');
+}
+
/**
* Get a stringified map from tag / node name to component import name.
* This uses the same `componentNamePrefix` used by `getStringifiedImports()`.
@@ -247,7 +252,9 @@ function getStringifiedMap(
) {
let stringifiedComponentMap = '{';
for (const key in componentConfigMap) {
- stringifiedComponentMap += `${key}: ${componentNamePrefix + key},\n`;
+ stringifiedComponentMap += `${JSON.stringify(key)}: ${
+ componentNamePrefix + toImportName(key)
+ },\n`;
}
stringifiedComponentMap += '}';
return stringifiedComponentMap;