@vivliostyle/cli 8.0.1 → 8.1.1

package/package.json

@@ -1,30 +1,36 @@
 {
   "name": "@vivliostyle/cli",
   "description": "Save the pdf file via headless browser and Vivliostyle.",
-  "version": "8.0.1",
+  "version": "8.1.1",
   "author": "spring_raining <harusamex.com@gmail.com>",
   "type": "module",
   "scripts": {
-    "build": "yarn clean && run-p build:*",
+    "build": "yarn clean && run-s build:*",
+    "build:vendors": "node vendors/build.js",
     "build:cli": "tsc && shx chmod +x dist/cli.js",
     "generate:schema": "run-p generate:schema:*",
     "generate:schema:pubManifest": "json2ts -i schemas/pubManifest/publication.schema.json -o src/schema/publication.schema.ts --cwd schemas/pubManifest",
     "generate:schema:vivliostyleConfig": "json2ts -i schemas/vivliostyle/vivliostyleConfig.schema.json -o src/schema/vivliostyleConfig.schema.ts --cwd schemas/vivliostyle",
     "clean": "shx rm -rf dist tmp",
     "dev": "run-p dev:*",
+    "dev:vendors": "node vendors/build.js -w",
     "dev:cli": "tsc -w --preserveWatchOutput",
     "example": "yarn --cwd example build",
-    "pretest": "yarn build && playwright-core install chromium",
+    "pretest": "playwright-core install chromium",
     "release": "release-it",
     "release:pre": "release-it --preRelease --npm.tag=next",
-    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js --coverage"
+    "test": "vitest run --coverage"
   },
   "dependencies": {
+    "@napi-rs/canvas": "0.1.41",
     "@npmcli/arborist": "^6.1.3",
+    "@vivliostyle/jsdom": "22.1.0-vivliostyle-cli.1",
     "@vivliostyle/vfm": "2.1.0",
-    "@vivliostyle/viewer": "2.25.2",
+    "@vivliostyle/viewer": "2.25.3",
     "ajv": "^8.11.2",
     "ajv-formats": "^2.1.1",
+    "archiver": "^5.3.1",
+    "bcp-47-match": "^2.0.3",
     "better-ajv-errors": "^1.2.0",
     "chalk": "^4.1.2",
     "cheerio": "^1.0.0-rc.10",
@@ -36,6 +42,7 @@
     "execa": "^5.1.1",
     "fast-glob": "3.2.12",
     "fast-xml-parser": "^4.2.4",
+    "github-slugger": "^1.4.0",
     "globby": "13.1.2",
     "hast-util-to-html": "^7.1.3",
     "hastscript": "^6.0.0",
@@ -52,20 +59,23 @@
     "prettier": "^2.3.2",
     "resolve-pkg": "^2.0.0",
     "serve-handler": "^6.1.3",
-    "shelljs": "^0.8.5",
     "slash": "4.0.0",
     "terminal-link": "^2.1.1",
     "tmp": "^0.2.1",
-    "upath": "^2.0.1",
     "uuid": "^8.3.2",
-    "vfile": "^4.2.1"
+    "vfile": "^4.2.1",
+    "w3c-xmlserializer": "^4.0.0",
+    "whatwg-mimetype": "^3.0.0"
   },
   "devDependencies": {
+    "@hyrious/esbuild-plugin-commonjs": "^0.2.2",
     "@release-it/conventional-changelog": "^5.1.1",
+    "@types/archiver": "^5.3.2",
     "@types/command-exists": "1.2.0",
     "@types/debug": "^4.1.7",
-    "@types/jest": "^29.2.4",
-    "@types/jsdom": "^16.2.13",
+    "@types/fs-extra": "^11.0.1",
+    "@types/github-slugger": "^1.3.0",
+    "@types/jsdom": "^21.1.1",
     "@types/mime-types": "^2.1.1",
     "@types/node": "^16.7.2",
     "@types/npm-package-arg": "^6.1.1",
@@ -73,20 +83,25 @@
     "@types/serve-handler": "^6.1.1",
     "@types/tmp": "^0.2.1",
     "@types/uuid": "^8.3.1",
+    "@types/w3c-xmlserializer": "^2.0.2",
+    "@types/whatwg-mimetype": "^3.0.0",
+    "@vitest/coverage-v8": "^0.33.0",
+    "esbuild": "^0.18.11",
     "file-type": "^16.5.3",
+    "fs-extra": "^11.1.1",
     "husky": "^4.3.8",
-    "jest": "^29.3.1",
-    "jsdom": "^17.0.0",
     "json-schema-to-typescript": "^10.1.4",
     "lint-staged": "^11.1.2",
+    "memfs": "^4.2.0",
     "nodemon": "^2.0.12",
     "npm-run-all": "^4.1.5",
     "prettier-plugin-organize-imports": "^2.3.3",
     "pretty-quick": "^3.1.1",
     "release-it": "^15.6.0",
     "shx": "^0.3.3",
-    "ts-jest": "^29.0.3",
-    "typescript": "^4.9.3"
+    "typescript": "^4.9.3",
+    "upath": "^2.0.1",
+    "vitest": "^0.33.0"
   },
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -107,7 +122,8 @@
   "files": [
     "dist",
     "schemas",
-    "types"
+    "types",
+    "vendors"
   ],
   "husky": {
     "hooks": {

package/types/custom.d.ts

@@ -7,3 +7,7 @@ declare type XOR<T extends any[], U extends any[] = []> = T extends []
   ? never
   : (T[0] & Without<Union<[...U, ...Tail<T>]>>) | XOR<Tail<T>, [T[0], ...U]>;
 declare type Resolved<T> = T extends Promise<infer U> ? U : never;
+
+interface ImportMeta {
+  env?: Record<string, unknown>;
+}

package/types/jsdom.d.ts

@@ -0,0 +1,14 @@
+declare module '@vivliostyle/jsdom' {
+  export * from 'jsdom';
+
+  export interface AbortablePromise<T> extends Promise<T> {
+    abort(): void;
+    response?: import('http').IncomingMessage;
+  }
+
+  export class ResourceLoader {
+    _readFile(filePath: string): AbortablePromise<Buffer>;
+    fetch(url: string, options?: FetchOptions): AbortablePromise<Buffer> | null;
+    constructor(obj?: ResourceLoaderConstructorOptions);
+  }
+}

package/vendors/README.md

@@ -0,0 +1,10 @@
+Unfortunately, some libraries do not support pure ESM and we have to bundle them in pure ESM format beforehand for the specific environment such as Vitest.
+
+## Usage
+
+```
+# build mode
+npm run build:vendors
+# watch mode
+npm run dev:vendors
+```

package/vendors/build.js

@@ -0,0 +1,27 @@
+import { commonjs } from '@hyrious/esbuild-plugin-commonjs';
+import chokidar from 'chokidar';
+import { context } from 'esbuild';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const dirname = path.dirname(fileURLToPath(import.meta.url));
+
+const ctx = await context({
+  entryPoints: [path.join(dirname, 'index.src.js')],
+  bundle: true,
+  format: 'esm',
+  outfile: path.join(dirname, 'index.js'),
+  platform: 'node',
+  plugins: [commonjs()],
+}).catch(() => process.exit(1));
+await ctx.rebuild();
+
+if (process.argv.slice(2).includes('-w')) {
+  chokidar.watch(path.join(dirname, '**')).on('all', async () => {
+    await ctx.rebuild().catch(() => {
+      /* NOOP */
+    });
+  });
+} else {
+  await ctx.dispose();
+}

package/vendors/index.d.ts

@@ -0,0 +1,4 @@
+import { copy, copySync, move, moveSync, remove, removeSync } from 'fs-extra';
+import upath from 'upath';
+
+export { archiver, copy, copySync, move, moveSync, remove, removeSync, upath };