Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
f179b3e
Initial plan
Copilot Nov 28, 2025
9775fb3
Apply Windows path fix and configure npm publication for @dportillo-i…
Copilot Nov 28, 2025
66b324b
Merge pull request #1 from dportillo-ixs/copilot/apply-windows-path-fix
dportillo-ixs Nov 28, 2025
79939b6
Initial plan
Copilot Nov 28, 2025
6fe72bc
Mark @htmldocs/render as private and remove from changeset fixed array
Copilot Nov 28, 2025
27ac879
Merge pull request #15 from dportillo-ixs/copilot/mark-render-package…
dportillo-ixs Nov 28, 2025
6e999c5
Initial plan
Copilot Nov 29, 2025
a206d9e
fix: update package names from htmldocs to htmldocs-v2 to fix npm pub…
Copilot Nov 29, 2025
723408a
Merge pull request #17 from dportillo-ixs/copilot/update-package-json…
dportillo-ixs Nov 29, 2025
46126d6
Initial plan
Copilot Nov 29, 2025
0dc4fcd
Regenerate pnpm-lock.yaml to fix htmldocs to htmldocs-v2 rename
Copilot Nov 29, 2025
520d468
Merge pull request #18 from dportillo-ixs/copilot/regenerate-pnpm-loc…
dportillo-ixs Nov 29, 2025
5bf8c3d
Initial plan
Copilot Nov 29, 2025
fd38cab
Add changeset for publishing htmldocs-v2, @htmldocs/render, and @html…
Copilot Nov 29, 2025
92811f4
Merge pull request #19 from dportillo-ixs/copilot/publish-htmldocs-pa…
dportillo-ixs Nov 29, 2025
0c86ef7
Version Packages
github-actions[bot] Nov 29, 2025
46af3bb
Merge pull request #20 from dportillo-ixs/changeset-release/canary
dportillo-ixs Nov 29, 2025
a512db0
Initial plan
Copilot Nov 29, 2025
840d56c
Fix publish workflow: mark @htmldocs/react as private and rename ESLi…
Copilot Nov 29, 2025
4a8c6c3
Merge pull request #23 from dportillo-ixs/copilot/fix-publish-workflo…
dportillo-ixs Nov 29, 2025
175d7ff
Initial plan
Copilot Nov 29, 2025
81a59a6
fix: mark @htmldocs/render as private to prevent npm publish failure
Copilot Nov 29, 2025
3174ad9
Merge pull request #25 from dportillo-ixs/copilot/fix-render-package-…
dportillo-ixs Nov 29, 2025
2c6c9de
Initial plan
Copilot Dec 2, 2025
3b98c2e
Rename @htmldocs/* packages to htmldocs-v2-* prefix for npm publishing
Copilot Dec 2, 2025
5b917cf
Merge pull request #27 from dportillo-ixs/copilot/rename-internal-pac…
dportillo-ixs Dec 2, 2025
8cc2fa3
Initial plan
Copilot Dec 2, 2025
4859b13
Merge canary branch into main to include package renaming changes
Copilot Dec 2, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion apps/examples/documents/templates/Book.tsx
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion apps/examples/documents/templates/Invoice.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion apps/examples/documents/templates/Letter.tsx
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
2 changes: 1 addition & 1 deletion apps/examples/documents/templates/Receipt.tsx
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion apps/examples/documents/templates/Resume.tsx
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
6 changes: 3 additions & 3 deletions apps/examples/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@htmldocs/examples",
"name": "htmldocs-v2-examples",
"version": "0.0.44",
"private": true,
"scripts": {
Expand All @@ -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:*",
Expand Down
2 changes: 1 addition & 1 deletion apps/examples/tsconfig.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
15 changes: 14 additions & 1 deletion packages/eslint-config/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/htmldocs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
4 changes: 2 additions & 2 deletions packages/htmldocs/public/template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/htmldocs/src/cli/commands/publish.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion packages/htmldocs/src/utils/get-document-component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions packages/htmldocs/src/utils/htmldocs-esbuild-plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/react/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
11 changes: 7 additions & 4 deletions packages/react/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/react/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "@htmldocs/typescript-config/react-library.json",
"extends": "htmldocs-v2-typescript-config/react-library.json",
"compilerOptions": {
"outDir": "dist"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/react/tsconfig.lint.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "@htmldocs/typescript-config/react-library.json",
"extends": "htmldocs-v2-typescript-config/react-library.json",
"compilerOptions": {
"outDir": "dist"
},
Expand Down
11 changes: 7 additions & 4 deletions packages/render/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/render/src/renderAsync.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion packages/render/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "@htmldocs/typescript-config/base.json",
"extends": "htmldocs-v2-typescript-config/base.json",
"ts-node": {
"compilerOptions": {
"module": "commonjs"
Expand Down
3 changes: 2 additions & 1 deletion packages/typescript-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "@htmldocs/typescript-config",
"name": "htmldocs-v2-typescript-config",
"version": "0.0.1",
"private": false,
"license": "MIT",
"publishConfig": {
"access": "public"
Expand Down
Loading