chore: Extract fs helpers into shared internal-helpers package

withastro · Jun 24, 2024 · 906ebe9 · 906ebe9
1 parent ae3b096
commit 906ebe9
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/.changeset/lovely-parents-attend.md b/.changeset/lovely-parents-attend.md
@@ -0,0 +1,6 @@
+---
+'@astrojs/vercel': patch
+'@astrojs/internal-helpers': patch
+---
+
+Extracts fs helpers into shared internal-helpers module
diff --git a/packages/integrations/vercel/src/lib/nft.ts b/packages/integrations/vercel/src/lib/nft.ts
@@ -1,7 +1,7 @@
 import { relative as relativePath } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import type { AstroIntegrationLogger } from 'astro';
-import { copyFilesToFunction } from './fs.js';
+import { copyFilesToFolder } from '@astrojs/internal-helpers/fs';
 
 export async function copyDependenciesToFunction(
 	{
@@ -72,7 +72,7 @@ export async function copyDependenciesToFunction(
 		}
 	}
 
-	const commonAncestor = await copyFilesToFunction(
+	const commonAncestor = await copyFilesToFolder(
 		[...result.fileList].map((file) => new URL(file, base)).concat(includeFiles),
 		outDir,
 		excludeFiles

diff --git a/packages/integrations/vercel/src/serverless/adapter.ts b/packages/integrations/vercel/src/serverless/adapter.ts
@@ -16,7 +16,7 @@ import {
 	getAstroImageConfig,
 	getDefaultImageConfig,
 } from '../image/shared.js';
-import { removeDir, writeJson } from '../lib/fs.js';
+import { removeDir, writeJson } from '@astrojs/internal-helpers/fs';
 import { copyDependenciesToFunction } from '../lib/nft.js';
 import { escapeRegex, getRedirects } from '../lib/redirects.js';
 import {

diff --git a/packages/integrations/vercel/src/static/adapter.ts b/packages/integrations/vercel/src/static/adapter.ts
@@ -6,7 +6,7 @@ import {
 	getAstroImageConfig,
 	getDefaultImageConfig,
 } from '../image/shared.js';
-import { emptyDir, writeJson } from '../lib/fs.js';
+import { emptyDir, writeJson } from '@astrojs/internal-helpers/fs';
 import { isServerLikeOutput } from '../lib/prerender.js';
 import { getRedirects } from '../lib/redirects.js';
 import {

diff --git a/packages/internal-helpers/package.json b/packages/internal-helpers/package.json
@@ -12,12 +12,16 @@
   },
   "bugs": "https://github.com/withastro/astro/issues",
   "exports": {
-    "./path": "./dist/path.js"
+    "./path": "./dist/path.js",
+    "./fs": "./dist/fs.js"
   },
   "typesVersions": {
     "*": {
       "path": [
         "./dist/path.d.ts"
+      ],
+      "fs": [
+        "./dist/fs.d.ts"
       ]
     }
   },

diff --git a/packages/integrations/vercel/src/lib/fs.ts → packages/internal-helpers/src/fs.ts b/packages/integrations/vercel/src/lib/fs.ts → packages/internal-helpers/src/fs.ts
@@ -40,15 +40,15 @@ export async function getFilesFromFolder(dir: URL) {
  * @param {URL[]} [exclude] A list of files to exclude (absolute path).
  * @returns {Promise<string>} The common ancestor of the copied files.
  */
-export async function copyFilesToFunction(
+export async function copyFilesToFolder(
 	files: URL[],
 	outDir: URL,
 	exclude: URL[] = []
 ): Promise<string> {
 	const excludeList = exclude.map(fileURLToPath);
 	const fileList = files.map(fileURLToPath).filter((f) => !excludeList.includes(f));
 
-	if (files.length === 0) throw new Error('[@astrojs/vercel] No files found to copy');
+	if (files.length === 0) throw new Error('No files found to copy');
 
 	let commonAncestor = nodePath.dirname(fileList[0]);
 	for (const file of fileList.slice(1)) {
@@ -87,7 +87,3 @@ export async function copyFilesToFunction(
 
 	return commonAncestor;
 }
-
-export async function writeFile(path: PathLike, content: string) {
-	await fs.writeFile(path, content, { encoding: 'utf-8' });
-}