From ba5d15f530ac9059e333912b0ec834cad8499aff Mon Sep 17 00:00:00 2001 From: nboehret <82972366+nboehret@users.noreply.github.com> Date: Fri, 8 Jul 2022 12:10:19 -0700 Subject: [PATCH 1/4] added check for windows filepath --- index.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/index.js b/index.js index 6744995..2e6dd03 100644 --- a/index.js +++ b/index.js @@ -99,5 +99,10 @@ const getAllFiles = function (dirPath, basePath, arrayOfFiles) { } }) + if (path.sep == "\\") + { + arrayOfFiles = arrayOfFiles.map(file => file.replaceAll("\\", "/")) + } + return arrayOfFiles } \ No newline at end of file From eb6ede50f69f6776106dcd4cb2dd500bc062c9ff Mon Sep 17 00:00:00 2001 From: nboehret <82972366+nboehret@users.noreply.github.com> Date: Fri, 8 Jul 2022 12:15:10 -0700 Subject: [PATCH 2/4] added require for path for windows fix --- index.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/index.js b/index.js index 2e6dd03..0b4e801 100644 --- a/index.js +++ b/index.js @@ -1,5 +1,5 @@ const { copyFileSync, unlinkSync, existsSync, statSync, mkdirSync, emptyDirSync, readdirSync, writeFileSync } = require('fs-extra'); -const { join } = require('path'); +const path = require('path'); const esbuild = require('esbuild'); @@ -16,22 +16,22 @@ module.exports = function ({ out = 'build' } = {}) { async adapt(builder) { emptyDirSync(out); - const static_directory = join(out, 'assets'); + const static_directory = path.join(out, 'assets'); if (!existsSync(static_directory)) { mkdirSync(static_directory, { recursive: true }); } - const prerendered_directory = join(out, 'prerendered'); + const prerendered_directory = path.join(out, 'prerendered'); if (!existsSync(prerendered_directory)) { mkdirSync(prerendered_directory, { recursive: true }); } - const server_directory = join(out, 'server'); + const server_directory = path.join(out, 'server'); if (!existsSync(server_directory)) { mkdirSync(server_directory, { recursive: true }); } - const edge_directory = join(out, 'edge'); + const edge_directory = path.join(out, 'edge'); if (!existsSync(edge_directory)) { mkdirSync(edge_directory, { recursive: true }); } @@ -51,7 +51,7 @@ module.exports = function ({ out = 'build' } = {}) { esbuild.buildSync({ entryPoints: [`${server_directory}/_serverless.js`], outfile: `${server_directory}/serverless.js`, - inject: [join(`${server_directory}/shims.js`)], + inject: [path.join(`${server_directory}/shims.js`)], external: ['node:*'], format: 'cjs', bundle: true, @@ -95,7 +95,7 @@ const getAllFiles = function (dirPath, basePath, arrayOfFiles) { if (statSync(dirPath + "/" + file).isDirectory()) { arrayOfFiles = getAllFiles(dirPath + "/" + file, basePath, arrayOfFiles) } else { - arrayOfFiles.push(join("/", dirPath.replace(basePath, ''), "/", file)) + arrayOfFiles.push(path.join("/", dirPath.replace(basePath, ''), "/", file)) } }) From 60b5d8bb2618cfa7d6d62dd74414bf5d9beb958e Mon Sep 17 00:00:00 2001 From: Nick Boehret Date: Sat, 9 Jul 2022 06:18:06 -0700 Subject: [PATCH 3/4] restoring to original --- index.js | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/index.js b/index.js index 0b4e801..6744995 100644 --- a/index.js +++ b/index.js @@ -1,5 +1,5 @@ const { copyFileSync, unlinkSync, existsSync, statSync, mkdirSync, emptyDirSync, readdirSync, writeFileSync } = require('fs-extra'); -const path = require('path'); +const { join } = require('path'); const esbuild = require('esbuild'); @@ -16,22 +16,22 @@ module.exports = function ({ out = 'build' } = {}) { async adapt(builder) { emptyDirSync(out); - const static_directory = path.join(out, 'assets'); + const static_directory = join(out, 'assets'); if (!existsSync(static_directory)) { mkdirSync(static_directory, { recursive: true }); } - const prerendered_directory = path.join(out, 'prerendered'); + const prerendered_directory = join(out, 'prerendered'); if (!existsSync(prerendered_directory)) { mkdirSync(prerendered_directory, { recursive: true }); } - const server_directory = path.join(out, 'server'); + const server_directory = join(out, 'server'); if (!existsSync(server_directory)) { mkdirSync(server_directory, { recursive: true }); } - const edge_directory = path.join(out, 'edge'); + const edge_directory = join(out, 'edge'); if (!existsSync(edge_directory)) { mkdirSync(edge_directory, { recursive: true }); } @@ -51,7 +51,7 @@ module.exports = function ({ out = 'build' } = {}) { esbuild.buildSync({ entryPoints: [`${server_directory}/_serverless.js`], outfile: `${server_directory}/serverless.js`, - inject: [path.join(`${server_directory}/shims.js`)], + inject: [join(`${server_directory}/shims.js`)], external: ['node:*'], format: 'cjs', bundle: true, @@ -95,14 +95,9 @@ const getAllFiles = function (dirPath, basePath, arrayOfFiles) { if (statSync(dirPath + "/" + file).isDirectory()) { arrayOfFiles = getAllFiles(dirPath + "/" + file, basePath, arrayOfFiles) } else { - arrayOfFiles.push(path.join("/", dirPath.replace(basePath, ''), "/", file)) + arrayOfFiles.push(join("/", dirPath.replace(basePath, ''), "/", file)) } }) - if (path.sep == "\\") - { - arrayOfFiles = arrayOfFiles.map(file => file.replaceAll("\\", "/")) - } - return arrayOfFiles } \ No newline at end of file From d6dab89d1fa51afc63701e187b79eb9d06b2ad70 Mon Sep 17 00:00:00 2001 From: Nick Boehret Date: Sat, 9 Jul 2022 06:28:54 -0700 Subject: [PATCH 4/4] importing path/posix for linux only file outputs --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index 6744995..8e70767 100644 --- a/index.js +++ b/index.js @@ -1,5 +1,5 @@ const { copyFileSync, unlinkSync, existsSync, statSync, mkdirSync, emptyDirSync, readdirSync, writeFileSync } = require('fs-extra'); -const { join } = require('path'); +const { join } = require('path/posix'); const esbuild = require('esbuild');