upgrade packages

dividab · May 19, 2024 · 6f64b94 · 6f64b94
1 parent 850a27b
commit 6f64b94
Show file tree

Hide file tree

Showing 8 changed files with 3,020 additions and 4,996 deletions.
diff --git a/package.json b/package.json
@@ -8,33 +8,33 @@
     "@storybook/addon-actions": "^6.3.7",
     "@storybook/addon-links": "^6.3.7",
     "@storybook/react": "^6.3.7",
+    "@testing-library/react": "^12.0.7",
     "@types/enzyme": "^3.10.9",
     "@types/enzyme-adapter-react-16": "^1.0.6",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.12.12",
     "@typescript-eslint/eslint-plugin": "^6.9.0",
     "@typescript-eslint/parser": "^6.9.0",
     "confusing-browser-globals": "^1.0.11",
+    "copy-webpack-plugin": "^12.0.2",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.6",
     "eslint": "^8.52.0",
     "eslint-config-divid": "^0.7.1",
     "eslint-plugin-functional": "^4.2.0",
     "eslint-plugin-import": "^2.29.0",
+    "file-loader": "^6.2.0",
+    "html-webpack-plugin": "^5.6.0",
     "husky": "^0.14.3",
     "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "lerna": "^3.22.1",
     "lint-staged": "^10.5.4",
     "node-polyfill-webpack-plugin": "^3.0.0",
-    "html-webpack-plugin": "^5.6.0",
-    "copy-webpack-plugin": "^12.0.2",
-    "file-loader": "^6.2.0",
-    "@testing-library/react": "^12.0.7",
-    "jest-environment-jsdom": "^29.7.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "ts-jest": "^29.1.2",
     "ts-loader": "^9.5.1",
     "typescript": "^5.4.5",

diff --git a/packages/abstract-document/package.json b/packages/abstract-document/package.json
@@ -16,9 +16,9 @@
   ],
   "dependencies": {
     "abstract-image": "^7.2.3",
-    "base64-js": "^1.2.0",
+    "base64-js": "^1.5.1",
     "docx": "^6.0.3",
-    "fast-xml-parser": "^4.1.2",
+    "fast-xml-parser": "^4.4.0",
     "mustache": "^4.2.0",
     "pdfkit": "^0.15.0",
     "remark-parse": "^6.0.3",
@@ -28,14 +28,13 @@
     "unified": "^6.1.6"
   },
   "devDependencies": {
-    "@types/base64-js": "^1.2.5",
-    "@types/blob-stream": "^0.1.30",
+    "@types/base64-js": "^1.3.2",
     "@types/isomorphic-fetch": "^0.0.34",
-    "@types/mustache": "^4.2.1",
-    "@types/pdfkit": "^0.7.31",
-    "@types/react": "^16.9.0",
-    "@types/react-dom": "^16.9.0",
-    "diff-js-xml": "^1.0.6",
+    "@types/mustache": "^4.2.5",
+    "@types/pdfkit": "^0.13.4",
+    "@types/react": "^18.3.2",
+    "@types/react-dom": "^18.3.0",
+    "diff-js-xml": "^1.0.8",
     "jszip": "^3.10.1",
     "pdf2json": "2.0.1"
   },

diff --git a/packages/abstract-document/src/abstract-document-xml/parse-xml/parse-xml.ts b/packages/abstract-document/src/abstract-document-xml/parse-xml/parse-xml.ts
@@ -1,4 +1,4 @@
-import { X2jOptions, X2jOptionsOptional, XMLParser } from "fast-xml-parser";
+import { X2jOptions, XMLParser } from "fast-xml-parser";
 import Mustache from "mustache";
 import { xsd } from "../xsd-template";
 import { errorToReadableText, validateXml } from "./validation";
@@ -60,7 +60,7 @@ export function parseMustacheXml(
   return { type: "Ok", xml: parseXml(mustacheResolvedXml, options) };
 }
 
-export function parseXml(text: string, options?: X2jOptionsOptional): ReadonlyArray<XmlElement> {
+export function parseXml(text: string, options?: Partial<X2jOptions>): ReadonlyArray<XmlElement> {
   const parser = new XMLParser(options);
   // Unescape HTML entity
   parser.addEntity("#x2F", "/");

diff --git a/packages/abstract-image/package.json b/packages/abstract-image/package.json
@@ -15,14 +15,14 @@
     "README.md"
   ],
   "dependencies": {
-    "base64-js": "^1.2.0",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0"
+    "base64-js": "^1.5.1",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@types/base64-js": "^1.2.5",
-    "@types/react": "^16.9.0",
-    "@types/react-dom": "^16.9.0"
+    "@types/base64-js": "^1.3.2",
+    "@types/react": "^18.3.2",
+    "@types/react-dom": "^18.3.0"
   },
   "gitHead": "7e0da1a8b4bec02d732e9037371df58fc2d68761"
 }
diff --git a/packages/abstract-visuals-example/package.json b/packages/abstract-visuals-example/package.json
@@ -16,17 +16,17 @@
     "README.md"
   ],
   "dependencies": {
-    "@babel/polyfill": "^7.0.0",
+    "@babel/polyfill": "^7.12.1",
     "abstract-chart": "^7.2.3",
     "abstract-document": "^10.0.4",
     "abstract-image": "^7.2.3",
-    "base64-js": "^1.2.0",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0"
+    "base64-js": "^1.5.1",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@types/base64-js": "^1.2.5",
-    "@types/react": "^16.9.0",
-    "@types/react-dom": "^16.9.0"
+    "@types/base64-js": "^1.3.2",
+    "@types/react": "^18.3.2",
+    "@types/react-dom": "^18.3.0"
   }
 }
diff --git a/packages/abstract-visuals-example/src/app/abstract-document-example.tsx b/packages/abstract-visuals-example/src/app/abstract-document-example.tsx
@@ -17,11 +17,10 @@ import {
   TocSeparator,
 } from "../../../../packages/abstract-document/src/abstract-document-jsx";
 import { AbstractDocExporters } from "../../../../packages/abstract-document/src";
-import PFSquareSansProBold from "../assets/PFSquareSansPro-Bold-subset.otf";
-import PFSquareSansProItalic from "../assets/PFSquareSansPro-Italic-subset.otf";
-import PFSquareSansProRegular from "../assets/PFSquareSansPro-Regular-subset.otf";
+// import PFSquareSansProBold from "../assets/PFSquareSansPro-Bold-subset.otf";
+// import PFSquareSansProItalic from "../assets/PFSquareSansPro-Italic-subset.otf";
+// import PFSquareSansProRegular from "../assets/PFSquareSansPro-Regular-subset.otf";
 import {
-  Font,
   LayoutFoundation,
   LayoutFoundationColor,
   TableCellStyle,
@@ -103,17 +102,17 @@ const headerRows = [
     <TableRow>
       <TableCell style={headerstyle}>
         <Paragraph>
-          <TextRun text="Header 1" />
+          <TextRun text="Header 1" style={{ type: "TextStyle" }} />
         </Paragraph>
       </TableCell>
       <TableCell style={headerstyle}>
         <Paragraph>
-          <TextRun text="Header 2" />
+          <TextRun text="Header 2" style={{ type: "TextStyle" }} />
         </Paragraph>
       </TableCell>
       <TableCell style={headerstyle}>
         <Paragraph>
-          <TextRun text="Header 3" />
+          <TextRun text="Header 3" style={{ type: "TextStyle" }} />
         </Paragraph>
       </TableCell>
     </TableRow>
@@ -122,17 +121,17 @@ const headerRows = [
     <TableRow>
       <TableCell style={headerstyle}>
         <Paragraph>
-          <TextRun text="Header 4" />
+          <TextRun text="Header 4" style={{ type: "TextStyle" }} />
         </Paragraph>
       </TableCell>
       <TableCell style={headerstyle}>
         <Paragraph>
-          <TextRun text="Header 5" />
+          <TextRun text="Header 5" style={{ type: "TextStyle" }} />
         </Paragraph>
       </TableCell>
       <TableCell style={headerstyle}>
         <Paragraph>
-          <TextRun text="Header 6" />
+          <TextRun text="Header 6" style={{ type: "TextStyle" }} />
         </Paragraph>
       </TableCell>
     </TableRow>
@@ -152,17 +151,9 @@ export function AbstractDocumentExample(): JSX.Element {
       noTopBottomMargin: false,
     },
   });
-  console.log("PFSquareSansProBold", PFSquareSansProBold);
-
-  // const font = Font.create({
-  //   bold: new Uint8Array(PFSquareSansProBold),
-  //   boldItalic: new Uint8Array(PFSquareSansProBold),
-  //   italic: new Uint8Array(PFSquareSansProItalic),
-  //   normal: new Uint8Array(PFSquareSansProRegular),
-  // });
 
   const doc = render(
-    <AbstractDoc fonts={{}}>
+    <AbstractDoc>
       <Section page={page}>
         <Paragraph>
           <HyperLink text="Go to chapter1" target="#chapter1" />