Merge pull request #27 from dportillo-ixs/copilot/rename-internal-packages

dportillo-ixs · web-flow · commit 5b917cf4e2c9 · 2025-12-01T17:53:19.000-07:00
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -2,7 +2,7 @@
 /** @type {import("eslint").Linter.Config} */
 module.exports = {
   ignorePatterns: ["apps/**", "packages/**"],
-  extends: ["@htmldocs/eslint-config/library.js"],
+  extends: ["htmldocs-v2-eslint-config/library.js"],
   parser: "@typescript-eslint/parser",
   parserOptions: {
     project: true,
diff --git a/apps/examples/documents/templates/Book.tsx b/apps/examples/documents/templates/Book.tsx
@@ -1,4 +1,4 @@
-import { Document, Footer } from "@htmldocs/react"
+import { Document, Footer } from "htmldocs-v2-react"
 import MarkdownIt from 'markdown-it'
 import fs from 'node:fs'
 import path from "path"
diff --git a/apps/examples/documents/templates/Invoice.tsx b/apps/examples/documents/templates/Invoice.tsx
@@ -1,4 +1,4 @@
-import { Document, Head, Page, Spacer } from "@htmldocs/react";
+import { Document, Head, Page, Spacer } from "htmldocs-v2-react";
 import clsx from "clsx";
 import { createIntl, createIntlCache } from "@formatjs/intl";
 import "~/index.css";
diff --git a/apps/examples/documents/templates/Letter.tsx b/apps/examples/documents/templates/Letter.tsx
@@ -1,4 +1,4 @@
-import { Document, Head, Page, Spacer } from "@htmldocs/react";
+import { Document, Head, Page, Spacer } from "htmldocs-v2-react";
 import { FaPhone, FaEnvelope, FaGlobe } from "react-icons/fa";
 import "~/index.css";
 
diff --git a/apps/examples/documents/templates/Receipt.tsx b/apps/examples/documents/templates/Receipt.tsx
@@ -1,4 +1,4 @@
-import { Document, Footer, Head, MarginBox, Page } from "@htmldocs/react"
+import { Document, Footer, Head, MarginBox, Page } from "htmldocs-v2-react"
 import "~/index.css"
 
 interface BillingAddress {
diff --git a/apps/examples/documents/templates/Resume.tsx b/apps/examples/documents/templates/Resume.tsx
@@ -1,4 +1,4 @@
-import { Document, Head, Page, Spacer } from "@htmldocs/react";
+import { Document, Head, Page, Spacer } from "htmldocs-v2-react";
 import { FaPhone, FaEnvelope, FaGithub, FaLinkedin, FaMapMarkerAlt } from "react-icons/fa";
 import "~/index.css";
 
diff --git a/apps/examples/package.json b/apps/examples/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@htmldocs/examples",
+  "name": "htmldocs-v2-examples",
   "version": "0.0.44",
   "private": true,
   "scripts": {
@@ -8,8 +8,8 @@
   },
   "dependencies": {
     "@formatjs/intl": "^2.10.4",
-    "@htmldocs/react": "workspace:*",
-    "@htmldocs/render": "workspace:*",
+    "htmldocs-v2-react": "workspace:*",
+    "htmldocs-v2-render": "workspace:*",
     "@react-email/components": "0.0.18",
     "clsx": "^2.1.1",
     "htmldocs-v2": "workspace:*",
diff --git a/apps/examples/tsconfig.json b/apps/examples/tsconfig.json
@@ -1,5 +1,5 @@
 {
-    "extends": "@htmldocs/typescript-config/react-library.json",
+    "extends": "htmldocs-v2-typescript-config/react-library.json",
     "compilerOptions": {
       "lib": ["es2022", "dom"],
       "outDir": "dist",
diff --git a/package.json b/package.json
@@ -12,8 +12,8 @@
     "test": "turbo test"
   },
   "devDependencies": {
-    "@htmldocs/eslint-config": "workspace:*",
-    "@htmldocs/typescript-config": "workspace:*",
+    "htmldocs-v2-eslint-config": "workspace:*",
+    "htmldocs-v2-typescript-config": "workspace:*",
     "prettier": "^3.2.5",
     "turbo": "latest",
     "vitest": "^1.3.1",
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -1,11 +1,24 @@
 {
-  "name": "@htmldocs/eslint-config",
+  "name": "htmldocs-v2-eslint-config",
   "version": "0.0.1",
+  "private": false,
+  "publishConfig": {
+    "access": "public"
+  },
+  "main": "library.js",
   "files": [
     "library.js",
     "next.js",
     "react-internal.js"
   ],
+  "exports": {
+    "./library.js": "./library.js",
+    "./library": "./library.js",
+    "./next.js": "./next.js",
+    "./next": "./next.js",
+    "./react-internal.js": "./react-internal.js",
+    "./react-internal": "./react-internal.js"
+  },
   "devDependencies": {
     "@vercel/style-guide": "^5.2.0",
     "eslint-config-turbo": "^1.12.4",
diff --git a/packages/htmldocs/package.json b/packages/htmldocs/package.json
@@ -53,7 +53,7 @@
     "@babel/core": "^7.24.6",
     "@babel/parser": "^7.24.5",
     "@babel/preset-typescript": "^7.24.6",
-    "@htmldocs/render": "workspace:*",
+    "htmldocs-v2-render": "workspace:*",
     "@next/bundle-analyzer": "^15.1.6",
     "@phosphor-icons/react": "^2.1.5",
     "@radix-ui/react-collapsible": "^1.0.3",
diff --git a/packages/htmldocs/public/template/documents/templates/Book.tsx b/packages/htmldocs/public/template/documents/templates/Book.tsx
@@ -1,4 +1,4 @@
-import { Document, Footer } from "@htmldocs/react"
+import { Document, Footer } from "htmldocs-v2-react"
 import MarkdownIt from 'markdown-it'
 import fs from 'node:fs'
 import path from "path"
diff --git a/packages/htmldocs/public/template/documents/templates/Invoice.tsx b/packages/htmldocs/public/template/documents/templates/Invoice.tsx
@@ -1,4 +1,4 @@
-import { Document, Head, Page, Spacer } from "@htmldocs/react";
+import { Document, Head, Page, Spacer } from "htmldocs-v2-react";
 import clsx from "clsx";
 import { createIntl, createIntlCache } from "@formatjs/intl";
 import "~/index.css";
diff --git a/packages/htmldocs/public/template/documents/templates/Letter.tsx b/packages/htmldocs/public/template/documents/templates/Letter.tsx
@@ -1,4 +1,4 @@
-import { Document, Head, Page, Spacer } from "@htmldocs/react";
+import { Document, Head, Page, Spacer } from "htmldocs-v2-react";
 import { FaPhone, FaEnvelope, FaGlobe } from "react-icons/fa";
 import "~/index.css";
 
diff --git a/packages/htmldocs/public/template/documents/templates/Receipt.tsx b/packages/htmldocs/public/template/documents/templates/Receipt.tsx
@@ -1,4 +1,4 @@
-import { Document, Footer, Head, MarginBox, Page } from "@htmldocs/react"
+import { Document, Footer, Head, MarginBox, Page } from "htmldocs-v2-react"
 import "~/index.css"
 
 interface BillingAddress {
diff --git a/packages/htmldocs/public/template/documents/templates/Resume.tsx b/packages/htmldocs/public/template/documents/templates/Resume.tsx
@@ -1,4 +1,4 @@
-import { Document, Head, Page, Spacer } from "@htmldocs/react";
+import { Document, Head, Page, Spacer } from "htmldocs-v2-react";
 import { FaPhone, FaEnvelope, FaGithub, FaLinkedin, FaMapMarkerAlt } from "react-icons/fa";
 import "~/index.css";
 
diff --git a/packages/htmldocs/public/template/package.json b/packages/htmldocs/public/template/package.json
@@ -8,8 +8,8 @@
   },
   "dependencies": {
     "@formatjs/intl": "^2.10.4",
-    "@htmldocs/react": "workspace:0.3.0",
-    "@htmldocs/render": "workspace:0.3.0",
+    "htmldocs-v2-react": "workspace:0.3.0",
+    "htmldocs-v2-render": "workspace:0.3.0",
     "@react-email/components": "0.0.18",
     "clsx": "^2.1.1",
     "htmldocs-v2": "workspace:0.3.0",
diff --git a/packages/htmldocs/src/app/actions/render-document-by-path.tsx b/packages/htmldocs/src/app/actions/render-document-by-path.tsx
@@ -3,7 +3,7 @@
 import React from 'react';
 import fs from 'node:fs';
 import { getDocumentComponent } from '../../utils/get-document-component';
-import { ErrorObject, improveErrorWithSourceMap } from '@htmldocs/render';
+import { ErrorObject, improveErrorWithSourceMap } from 'htmldocs-v2-render';
 import logger from '../lib/logger';
 import chalk from 'chalk';
 import path from 'node:path';
diff --git a/packages/htmldocs/src/cli/commands/publish.ts b/packages/htmldocs/src/cli/commands/publish.ts
@@ -13,7 +13,7 @@ import {
   createFakeContext,
   executeBuiltCode,
   extractOutputFiles,
-} from "@htmldocs/render";
+} from "htmldocs-v2-render";
 import ora from "ora";
 import { closeOraOnSIGINT } from "../utils/close-ora-on-sigint";
 import logger from "~/lib/logger";
diff --git a/packages/htmldocs/src/utils/get-document-component.tsx b/packages/htmldocs/src/utils/get-document-component.tsx
@@ -10,7 +10,7 @@ import {
   extractOutputFiles,
   improveErrorWithSourceMap,
   renderAsync,
-} from "@htmldocs/render";
+} from "htmldocs-v2-render";
 import { htmldocsPlugin } from "./htmldocs-esbuild-plugin";
 import postCssPlugin from "esbuild-style-plugin";
 import { RawSourceMap } from "source-map-js";
diff --git a/packages/htmldocs/src/utils/htmldocs-esbuild-plugin.ts b/packages/htmldocs/src/utils/htmldocs-esbuild-plugin.ts
@@ -58,14 +58,14 @@ export const htmldocsPlugin = (documentTemplates: string[], isBuild: boolean) =>
           resolveDir: args.resolveDir,
           namespace: args.namespace,
         };
-        let result = await b.resolve("@htmldocs/render", options);
+        let result = await b.resolve("htmldocs-v2-render", options);
         if (result.errors.length === 0) {
           return result;
         }
 
         if (result.errors.length > 0 && result.errors[0]) {
           result.errors[0].text =
-            "Failed trying to import `renderAsync` from `@htmldocs/render` to be able to render your document template.\n Maybe you don't have `@htmldocs/render` installed?";
+            "Failed trying to import `renderAsync` from `htmldocs-v2-render` to be able to render your document template.\n Maybe you don't have `htmldocs-v2-render` installed?";
         }
         return result;
       }
diff --git a/packages/react/.eslintrc.cjs b/packages/react/.eslintrc.cjs
@@ -1,7 +1,7 @@
 /** @type {import("eslint").Linter.Config} */
 module.exports = {
   root: true,
-  extends: ["@htmldocs/eslint-config/react-internal.js"],
+  extends: ["htmldocs-v2-eslint-config/react-internal.js"],
   parser: "@typescript-eslint/parser",
   parserOptions: {
     project: "./tsconfig.lint.json",
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,7 +1,10 @@
 {
-  "name": "@htmldocs/react",
+  "name": "htmldocs-v2-react",
   "version": "0.3.0",
-  "private": true,
+  "private": false,
+  "publishConfig": {
+    "access": "public"
+  },
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -28,8 +31,8 @@
     "build": "tsup index.ts --format esm,cjs --dts --external react"
   },
   "devDependencies": {
-    "@htmldocs/eslint-config": "workspace:*",
-    "@htmldocs/typescript-config": "workspace:*",
+    "htmldocs-v2-eslint-config": "workspace:*",
+    "htmldocs-v2-typescript-config": "workspace:*",
     "@types/eslint": "^8.56.5",
     "@types/node": "^20.11.24",
     "@types/react": "^18.2.61",
diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@htmldocs/typescript-config/react-library.json",
+  "extends": "htmldocs-v2-typescript-config/react-library.json",
   "compilerOptions": {
     "outDir": "dist"
   },
diff --git a/packages/react/tsconfig.lint.json b/packages/react/tsconfig.lint.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@htmldocs/typescript-config/react-library.json",
+  "extends": "htmldocs-v2-typescript-config/react-library.json",
   "compilerOptions": {
     "outDir": "dist"
   },
diff --git a/packages/render/package.json b/packages/render/package.json
@@ -1,7 +1,10 @@
 {
-  "name": "@htmldocs/render",
+  "name": "htmldocs-v2-render",
   "version": "0.3.0",
-  "private": true,
+  "private": false,
+  "publishConfig": {
+    "access": "public"
+  },
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -33,8 +36,8 @@
     "build:css": "sass --no-source-map ./src/css/index.scss ./src/css/index.css"
   },
   "devDependencies": {
-    "@htmldocs/eslint-config": "workspace:*",
-    "@htmldocs/typescript-config": "workspace:*",
+    "htmldocs-v2-eslint-config": "workspace:*",
+    "htmldocs-v2-typescript-config": "workspace:*",
     "@types/eslint": "^8.56.5",
     "@types/node": "^20.11.24",
     "@types/react": "^18.2.61",
diff --git a/packages/render/src/renderAsync.ts b/packages/render/src/renderAsync.ts
@@ -136,7 +136,7 @@ export const renderAsync = async (
           ${documentCss ? `<style>${documentCss}</style>` : ""}
           <style>${cssText}</style>
           ${extractedHeadContents}
-          <script src="https://unpkg.com/@htmldocs/render@0.1.7/dist/paged.polyfill.js"></script>
+          <script src="https://unpkg.com/htmldocs-v2-render@0.3.0/dist/paged.polyfill.js"></script>
           <script type="text/javascript">
             // Hide content initially
             // document.querySelector("html").style.visibility = "hidden";
diff --git a/packages/render/tsconfig.json b/packages/render/tsconfig.json
@@ -1,5 +1,5 @@
 {
-    "extends": "@htmldocs/typescript-config/base.json",
+    "extends": "htmldocs-v2-typescript-config/base.json",
     "ts-node": {
       "compilerOptions": {
         "module": "commonjs"
diff --git a/packages/typescript-config/package.json b/packages/typescript-config/package.json
@@ -1,6 +1,7 @@
 {
-  "name": "@htmldocs/typescript-config",
+  "name": "htmldocs-v2-typescript-config",
   "version": "0.0.1",
+  "private": false,
   "license": "MIT",
   "publishConfig": {
     "access": "public"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Document, Footer } from "@htmldocs/react"`
	`1`	`+import { Document, Footer } from "htmldocs-v2-react"`
`2`	`2`	`import MarkdownIt from 'markdown-it'`
`3`	`3`	`import fs from 'node:fs'`
`4`	`4`	`import path from "path"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Document, Head, Page, Spacer } from "@htmldocs/react";`
	`1`	`+import { Document, Head, Page, Spacer } from "htmldocs-v2-react";`
`2`	`2`	`import clsx from "clsx";`
`3`	`3`	`import { createIntl, createIntlCache } from "@formatjs/intl";`
`4`	`4`	`import "~/index.css";`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Document, Footer, Head, MarginBox, Page } from "@htmldocs/react"`
	`1`	`+import { Document, Footer, Head, MarginBox, Page } from "htmldocs-v2-react"`
`2`	`2`	`import "~/index.css"`
`3`	`3`
`4`	`4`	`interface BillingAddress {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "extends": "@htmldocs/typescript-config/react-library.json",`
	`2`	`+ "extends": "htmldocs-v2-typescript-config/react-library.json",`
`3`	`3`	`"compilerOptions": {`
`4`	`4`	`"lib": ["es2022", "dom"],`
`5`	`5`	`"outDir": "dist",`