Merge pull request #13 from CrunchyData/upgrade_node22

Upgrade to Node22

Author: sfc-gh-acrenshaw

.github/workflows/deploy.yml

@@ -23,7 +23,7 @@ jobs:
       - name: ⎔ Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 20
+          node-version: 22
 
       - name: 📥 Download deps
         uses: bahmutov/npm-install@v1
@@ -41,7 +41,7 @@ jobs:
       - name: ⎔ Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 20
+          node-version: 22
 
       - name: 📥 Download deps
         uses: bahmutov/npm-install@v1

.tool-versions

@@ -1,2 +1,2 @@
-nodejs 20.12.0
+nodejs 22.22.3
 java openjdk-17

app/lib/docs/pdf/index.server.ts

@@ -5,7 +5,7 @@ import yaml from 'js-yaml'
 import { type Root, type Text } from 'mdast'
 import { fromMarkdown } from 'mdast-util-from-markdown'
 import {
-    MdxJsxAttributeValueExpression,
+	type MdxJsxAttributeValueExpression,
 	type MdxJsxFlowElement,
 	type MdxJsxTextElement,
 	mdxJsxFromMarkdown,
@@ -16,9 +16,7 @@ import remarkFrontmatter from 'remark-frontmatter'
 import remarkGfm from 'remark-gfm'
 import { visit } from 'unist-util-visit'
 import { docAttributes } from '../attrs.server.ts'
-import path from 'path'
 import safeEval from 'safe-eval'
-import { isArray } from 'util'
 
 
 export async function parseMdxToPdf(mdx: string) {

package-lock.json

@@ -101,7 +101,7 @@
     "@types/js-yaml": "^4.0.5",
     "@types/lunr": "^2.3.4",
     "@types/morgan": "^1.9.4",
-    "@types/node": "^20.12.7",
+    "@types/node": "^22.18.12",
     "@types/react": "^18.2.6",
     "@types/react-dom": "^18.2.4",
     "@types/remark-prism": "^1.3.4",
@@ -136,6 +136,6 @@
     "vfile-matter": "^4.0.1"
   },
   "engines": {
-    "node": "20"
+    "node": "22"
   }
 }

package.json

@@ -0,0 +1,8 @@
+declare module 'safe-eval' {
+	function safeEval(
+		code: string,
+		context?: Record<string, unknown>,
+		opts?: Record<string, unknown>,
+	): unknown
+	export default safeEval
+}

safe-eval.d.ts

@@ -129,7 +129,7 @@ function buildProperties(
 					schemas.push({
 						...base,
 						type: intOrString
-							? `map[string]: int\|string`
+							? `map[string]: int|string`
 							: 'map[string]: string',
 					})
 					break

scripts/crd-builder/index.ts

@@ -97,7 +97,7 @@ function replaceParams(file: string): string {
 }
 
 function replaceRefs(file: string, filepath: string): string {
-	const regex = /\[([^\]]+)\]\(\{\{\s?<\s?(?:relref|ref)\s"([^"]+)"[^\)]+\)/gm
+	const regex = /\[([^\]]+)\]\(\{\{\s?<\s?(?:relref|ref)\s"([^"]+)"[^)]+\)/gm
 	return file.replace(regex, (match, label, to, id) => {
 		if (typeof to !== 'string') return match
 		to = to.replace(/^\//gm, '').replace('/_index.md', '').replace('.md', '')
@@ -142,7 +142,7 @@ function replaceNotices(file: string): string {
 
 function replaceIdHeadings(file: string): string {
 	return file.replace(
-		/(#+)\s([^\{|\n]+){#([^\}]+)}/gm,
+		/(#+)\s([^{|\n]+){#([^}]+)}/gm,
 		(match, size, heading, id) => {
 			const level = size.length
 			return `<h${level} id="${id}">${heading.trim()}</h${level}>`

scripts/migrate-docs.ts

@@ -2,8 +2,11 @@ import tailwindcssAspect from '@tailwindcss/aspect-ratio'
 import tailwindcssForms from '@tailwindcss/forms'
 import tailwindcssTypography from '@tailwindcss/typography'
 import type { Config } from 'tailwindcss'
-import { emerald, orange, zinc } from 'tailwindcss/colors.js'
-import { fontFamily, spacing } from 'tailwindcss/defaultTheme.js'
+import colors from 'tailwindcss/colors.js'
+import defaultTheme from 'tailwindcss/defaultTheme.js'
+
+const { emerald, orange, zinc } = colors
+const { fontFamily, spacing } = defaultTheme
 
 function withOpacityValue(variable: string) {
 	return ({ opacityValue }: { opacityValue: number }) => {