restructure to try and speed up build

haxtheweb · Jun 21, 2022 · f2de516 · f2de516 · vercel · Jun 21, 2022
1 parent 0e65469
commit f2de516
Show file tree

Hide file tree

Showing 16 changed files with 69 additions and 385 deletions.
diff --git a/api/apps/haxcms/siteToEpub.js b/api/apps/haxcms/siteToEpub.js
@@ -1,4 +1,4 @@
-import { stdPostBody, stdResponse } from "../../utilities/requestHelpers.js";
+import { stdPostBody, stdResponse } from "../../../utilities/requestHelpers.js";
 import { JSONOutlineSchema } from "./lib/JSONOutlineSchema.js";
 
 import url from "url";

diff --git a/api/apps/haxcms/siteToHtml.js b/api/apps/haxcms/siteToHtml.js
@@ -1,4 +1,4 @@
-import { stdPostBody, stdResponse } from "../../utilities/requestHelpers.js";
+import { stdPostBody, stdResponse } from "../../../utilities/requestHelpers.js";
 import { JSONOutlineSchema } from "./lib/JSONOutlineSchema.js";
 
 // site object to validate response from passed in url

diff --git a/api/package.json b/api/package.json
@@ -14,13 +14,8 @@
     "epub-gen": "0.1.0",
     "mammoth": "1.4.21",
     "busboy": "1.5.0",
-    "puppeteer-core": "13.5.2",
-    "chrome-aws-lambda": "10.1.0",
     "asciify-image": "0.1.8",
     "concat-stream": "2.0.0",
     "html-pdf": "3.0.1" 
-  },
-    "peerDependencies": {
-    "puppeteer": "^10.1.0"
   }
 }
diff --git a/api/services/media/format/docxToHtml.js b/api/services/media/format/docxToHtml.js
@@ -1,4 +1,4 @@
-import { stdResponse } from "../../../utilities/requestHelpers.js";
+import { stdResponse } from "../../../../utilities/requestHelpers.js";
 
 import df from 'mammoth';
 const { convertToHtml } = df;

diff --git a/api/services/media/format/docxToPdf.js b/api/services/media/format/docxToPdf.js
@@ -1,4 +1,4 @@
-import { stdResponse } from "../../../utilities/requestHelpers.js";
+import { stdResponse } from "../../../../utilities/requestHelpers.js";
 import df from 'mammoth';
 const { convertToHtml } = df;
 import busboy from 'busboy';
@@ -33,7 +33,7 @@ const generatePDF = (html) => {
 export default async function handler(req, res) {
   var string64 = '';
   var buffer = {
-    filename: null,
+
     data: null,
   };
 

diff --git a/api/services/media/format/htmlToMd.js b/api/services/media/format/htmlToMd.js
@@ -1,4 +1,4 @@
-import { fetch, stdPostBody, stdResponse, invalidRequest } from "../../../utilities/requestHelpers.js";
+import { fetch, stdPostBody, stdResponse, invalidRequest } from "../../../../utilities/requestHelpers.js";
 
 import * as df from 'turndown';
 const TurndownService = df.default;

diff --git a/api/services/media/format/imgToAscii.js b/api/services/media/format/imgToAscii.js
@@ -1,4 +1,4 @@
-import { stdResponse } from "../../../utilities/requestHelpers.js";
+import { stdResponse } from "../../../../utilities/requestHelpers.js";
 
 import asciify from 'asciify-image';
 import busboy from 'busboy';

diff --git a/api/services/media/format/mdToHtml.js b/api/services/media/format/mdToHtml.js
@@ -1,4 +1,4 @@
-import { fetch, stdPostBody, stdResponse, invalidRequest } from "../../../utilities/requestHelpers.js";
+import { fetch, stdPostBody, stdResponse, invalidRequest } from "../../../../utilities/requestHelpers.js";
 import * as df from 'markdown-it';
 const MarkdownIt = df.default;
 const mdClass = new MarkdownIt();

diff --git a/api/services/media/image/manipulate.js b/api/services/media/image/manipulate.js
@@ -1,4 +1,4 @@
-import { fetch, stdResponse, invalidRequest } from "../../../utilities/requestHelpers.js";
+import { fetch, stdResponse, invalidRequest } from "../../../../utilities/requestHelpers.js";
 import pkg from 'sharp';
 const sharp = pkg;
 

diff --git a/api/services/website/duckDuckGo.js b/api/services/website/duckDuckGo.js
@@ -1,7 +1,7 @@
 // duckduckgo.js
 // this is an example to fork from that uses common, simple conventions
 // for getting data, validating data, and responding in a consistent way.
-import { fetch, stdPostBody, stdResponse, invalidRequest } from "../../utilities/requestHelpers.js";
+import { fetch, stdPostBody, stdResponse, invalidRequest } from "../../../utilities/requestHelpers.js";
 
 export default async function handler(req, res) {
   // destructing GET params after ? available in this object

diff --git a/package.json b/package.json
@@ -82,8 +82,6 @@
     "epub-gen": "0.1.0",
     "mammoth": "1.4.21",
     "busboy": "1.5.0",
-    "puppeteer-core": "^10.1.0",
-    "chrome-aws-lambda": "10.1.0",
     "asciify-image": "0.1.8",
     "concat-stream": "2.0.0",
     "html-pdf": "3.0.1"

diff --git a/api/utilities/getBrowserInstance.js → utilities/getBrowserInstance.js b/api/utilities/getBrowserInstance.js → utilities/getBrowserInstance.js
diff --git a/utilities/package.json b/utilities/package.json
@@ -0,0 +1,12 @@
+{
+  "type": "module",
+  "name": "vercel-api-lrnwebcomponents",
+  "dependencies": {
+    "node-fetch": "3.2.4",
+    "puppeteer-core": "13.5.2",
+    "chrome-aws-lambda": "10.1.0"
+  },
+    "peerDependencies": {
+    "puppeteer": "^10.1.0"
+  }
+}
diff --git a/api/utilities/requestHelpers.js → utilities/requestHelpers.js b/api/utilities/requestHelpers.js → utilities/requestHelpers.js
diff --git a/api/services/website/screenshotUrl.js → utilities/screenshotUrl.js b/api/services/website/screenshotUrl.js → utilities/screenshotUrl.js
@@ -1,6 +1,8 @@
-import { getBrowserInstance } from '../../utilities/getBrowserInstance.js';
-import { stdResponse, invalidRequest, stdPostBody } from "../../utilities/requestHelpers.js";
+import { getBrowserInstance } from './getBrowserInstance.js';
+import { stdResponse, invalidRequest, stdPostBody } from "./requestHelpers.js";
 
+// this requires its own service instance and can't live with the monorepo
+// due to the size of the dependencies involved
 export default async function handler(req, res) {
   const body = stdPostBody(req);
   const urlToCapture = body.urlToCapture;