[hygiene] Prettier 3 upgrade

Author: jamesgpearce

build/common.mjs

@@ -329,7 +329,9 @@ export const compileModule = async (
       'fs',
       'fs/promises',
       'path',
-      'prettier',
+      'prettier/standalone',
+      'prettier/plugins/estree',
+      'prettier/plugins/typescript',
       'react',
       'react-dom',
       'url',
@@ -475,7 +477,7 @@ export const compileDocsAndAssets = async (api = true, pages = true) => {
   await makeDir(TMP_DIR);
   await esbuild.build({
     entryPoints: ['site/build.ts'],
-    external: ['tinydocs', 'react', 'yjs', 'prettier'],
+    external: ['tinydocs', 'react', 'yjs', '@prettier/sync'],
     target: 'esnext',
     bundle: true,
     outfile: './tmp/build.js',

cspell.json

@@ -42,6 +42,7 @@
     "editablevalueview",
     "erwinkn",
     "esbuild",
+    "estree",
     "etting",
     "evenr",
     "fdfontes",

package.json

@@ -212,11 +212,12 @@
   },
   "devDependencies": {
     "@automerge/automerge": "^2.1.0-alpha.6",
-    "@babel/cli": "^7.22.10",
-    "@babel/core": "^7.22.11",
-    "@babel/preset-env": "^7.22.14",
-    "@babel/preset-react": "^7.22.5",
-    "@babel/preset-typescript": "^7.22.11",
+    "@babel/cli": "^7.22.15",
+    "@babel/core": "^7.22.15",
+    "@babel/preset-env": "^7.22.15",
+    "@babel/preset-react": "^7.22.15",
+    "@babel/preset-typescript": "^7.22.15",
+    "@prettier/sync": "^0.3.0",
     "@rollup/plugin-image": "^3.0.2",
     "@rollup/plugin-replace": "^5.0.2",
     "@rollup/plugin-terser": "^0.4.3",
@@ -227,14 +228,14 @@
     "@types/jest": "^29.5.4",
     "@types/jest-environment-puppeteer": "^5.0.3",
     "@types/less": "^3.0.4",
-    "@types/node": "^20.5.7",
+    "@types/node": "^20.5.9",
     "@types/puppeteer": "^5.4.7",
     "@types/react": "^18.2.21",
     "@types/react-dom": "^18.2.7",
-    "@types/react-test-renderer": "^18.0.0",
+    "@types/react-test-renderer": "^18.0.1",
     "@types/tmp": "^0.2.3",
-    "@typescript-eslint/eslint-plugin": "^6.5.0",
-    "@typescript-eslint/parser": "^6.5.0",
+    "@typescript-eslint/eslint-plugin": "^6.6.0",
+    "@typescript-eslint/parser": "^6.6.0",
     "@vlcn.io/crsqlite-wasm": "^0.14.0",
     "asciichart": "^1.5.25",
     "automerge-repo": "^0.1.0",
@@ -244,7 +245,7 @@
     "babel-preset-minify": "^0.5.2",
     "buffer-replace": "^1.0.0",
     "country-flag-emoji-json": "^2.0.0",
-    "cspell": "^7.2.0",
+    "cspell": "^7.3.2",
     "esbuild": "^0.19.2",
     "eslint": "^8.48.0",
     "eslint-config-prettier": "^9.0.0",
@@ -263,7 +264,7 @@
     "jest-fetch-mock": "^3.0.3",
     "jest-puppeteer": "^9.0.0",
     "less": "^4.2.0",
-    "prettier": "^2.8.8",
+    "prettier": "^3.0.3",
     "puppeteer": "^21.1.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -272,20 +273,20 @@
     "rollup-plugin-esbuild": "^5.0.0",
     "rollup-plugin-gzip": "^3.1.0",
     "rollup-plugin-preserve-shebang": "^1.0.1",
-    "rollup-plugin-prettier": "^3.0.0",
+    "rollup-plugin-prettier": "^4.0.0",
     "sqlite3": "^5.1.6",
     "tinybase": "file:./",
     "tinydocs": "^0.1.32",
     "tmp": "^0.2.1",
-    "ts-unused-exports": "^10.0.0",
+    "ts-unused-exports": "^10.0.1",
     "typescript": "5.2.2",
     "yjs": "^13.6.7"
   },
   "peerDependencies": {
     "@sqlite.org/sqlite-wasm": "^3.42.0-build4",
     "@vlcn.io/crsqlite-wasm": "^0.14.0",
     "automerge-repo": "^0.1.0",
-    "prettier": ">2.8.8",
+    "prettier": "^3.0.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "sqlite3": "^5.1.6",

site/ui/ExecutablePen.tsx

@@ -1,6 +1,6 @@
 import {NoPropComponent, useBaseUrl, usePageNode} from 'tinydocs';
 import React from 'react';
-import prettier from 'prettier';
+import prettier from '@prettier/sync';
 
 const SCRIPTS_REGEX = /<script.*?<\/script>/gms;
 const SRC_REGEX = /(?<=src=['"]).*?(?=['"])/gms;

src/tools.ts

@@ -7,16 +7,20 @@ import {
   Tools,
   createTools as createToolsDecl,
 } from './types/tools.d';
-import {arrayEvery, arrayLength, arrayMap} from './common/array';
+import {arrayEvery, arrayLength, arrayMap, arrayPush} from './common/array';
 import {formatJsDoc, length} from './tools/common/code';
 import {objFreeze, objIsEmpty} from './common/obj';
 import {collForEach} from './common/coll';
 import {getCreateFunction} from './common/definable';
 import {getStoreApi as getStoreApiImpl} from './tools/api/api';
 import {jsonParse} from './common/json';
+import {promiseAll} from './common/other';
 
 type CellMeta = [string, IdMap<number>, [number, Cell?], number];
 
+const PRETTIER = 'prettier/';
+const PRETTIER_PLUGINS = PRETTIER + 'plugins/';
+
 const prettierConfig = {
   parser: 'typescript',
   singleQuote: true,
@@ -130,17 +134,29 @@ export const createTools = getCreateFunction((store: Store): Tools => {
     module: string,
   ): Promise<[string, string, string, string]> => {
     const extensions = ['d.ts', 'ts', 'd.ts', 'tsx'];
-    let format: (str: string, _config: any) => string;
+    const plugins: any[] = [];
+    let format: (str: string, _config: any) => Promise<string>;
     try {
-      format = (await import('prettier')).format;
+      format = (await import(PRETTIER + 'standalone')).format;
+      arrayPush(
+        plugins,
+        await import(PRETTIER_PLUGINS + 'estree'),
+        await import(PRETTIER_PLUGINS + 'typescript'),
+      );
     } catch (e) {
-      format = (str) => str;
+      format = async (str) => str;
     }
-    return arrayMap(getStoreApi(module), (file, f) =>
-      formatJsDoc(
-        format(file, {...prettierConfig, filepath: `_.${extensions[f]}`}),
+    return (await promiseAll(
+      arrayMap(getStoreApi(module), async (file, f) =>
+        formatJsDoc(
+          await format(file, {
+            ...prettierConfig,
+            plugins,
+            filepath: `_.${extensions[f]}`,
+          }),
+        ),
       ),
-    ) as [string, string, string, string];
+    )) as [string, string, string, string];
   };
 
   const getStore = (): Store => store;