@sveltejs/adapter-netlify 2.0.0 → 2.0.2

package/index.js

@@ -1,8 +1,16 @@
-import { appendFileSync, existsSync, readFileSync, writeFileSync } from 'fs';
+import {
+	appendFileSync,
+	existsSync,
+	readFileSync,
+	writeFileSync,
+	unlinkSync,
+	createReadStream
+} from 'fs';
 import { dirname, join, resolve, posix } from 'path';
 import { fileURLToPath } from 'url';
 import esbuild from 'esbuild';
 import toml from '@iarna/toml';
+import { createInterface } from 'readline';
 
 /**
  * @typedef {{
@@ -39,15 +47,55 @@ export default function ({ split = false, edge = edge_set_in_env_var } = {}) {
 		name: '@sveltejs/adapter-netlify',
 
 		async adapt(builder) {
+			if (!builder.routes) {
+				throw new Error(
+					'@sveltejs/adapter-netlify >=2.x (possibly installed through @sveltejs/adapter-auto) requires @sveltejs/kit version 1.5 or higher. ' +
+						'Either downgrade the adapter or upgrade @sveltejs/kit'
+				);
+			}
+
 			const netlify_config = get_netlify_config();
 
 			// "build" is the default publish directory when Netlify detects SvelteKit
 			const publish = get_publish_directory(netlify_config, builder) || 'build';
 
+			const redirects_file_path = join(publish, '_redirects');
+
+			// If redirects file exists - empty any netlify generated files in functions-internal
+			// Without removing other files that may have been auto generated by integrations
+			if (existsSync(redirects_file_path)) {
+				// Read each line of the file
+				const fileStream = createReadStream(redirects_file_path);
+				const rl = createInterface({
+					input: fileStream,
+					crlfDelay: Infinity
+				});
+
+				// Create an array of lines
+				const lines = [];
+				for await (const line of rl) {
+					lines.push(line);
+				}
+
+				const functions_internal = join('.netlify', 'functions-internal');
+
+				// Loop through redirects, and delete corresponding functions-internal files
+				lines.forEach((line) => {
+					if (line) {
+						// example line /.netlify/functions/{function_name} 200
+						const path = line.split(' ')[1];
+						const function_name = path.split('/').pop();
+						const mjsFile = join(functions_internal, `${function_name}.mjs`);
+						const jsonFile = join(functions_internal, `${function_name}.json`);
+						if (existsSync(mjsFile)) unlinkSync(mjsFile);
+						if (existsSync(jsonFile)) unlinkSync(jsonFile);
+					}
+				});
+			}
+
 			// empty out existing build directories
 			builder.rimraf(publish);
 			builder.rimraf('.netlify/edge-functions');
-			builder.rimraf('.netlify/functions-internal');
 			builder.rimraf('.netlify/server');
 			builder.rimraf('.netlify/package.json');
 			builder.rimraf('.netlify/serverless.js');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-netlify",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -38,7 +38,7 @@
     "rollup": "^3.7.0",
     "typescript": "^4.9.4",
     "uvu": "^0.5.6",
-    "@sveltejs/kit": "^1.5.0"
+    "@sveltejs/kit": "^1.5.1"
   },
   "peerDependencies": {
     "@sveltejs/kit": "^1.5.0"