From cbe37f4f4dbaa7dbe7c7fc5e984c1b97fee670c1 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Thu, 7 Apr 2022 14:27:01 +0100 Subject: [PATCH 1/3] fix: detect node versions 16/14 for azure swa --- src/presets/azure.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/presets/azure.ts b/src/presets/azure.ts index d9c749c65e..1241edaae2 100644 --- a/src/presets/azure.ts +++ b/src/presets/azure.ts @@ -26,7 +26,18 @@ async function writeRoutes (nitro) { version: '2.0' } + let nodeVersion = '16' + try { + const currentNodeVersion = fse.readJSONSync(join(nitro.options.rootDir, 'package.json')).engines.node + if (['16', '14'].includes(currentNodeVersion)) { + nodeVersion = currentNodeVersion + } + } catch { } + const config = { + platform: { + apiRuntime: `node:${nodeVersion}` + }, routes: [], navigationFallback: { rewrite: '/api/server' From d5d4a27c883b767a458f617677a8b3a8aabbafec Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Thu, 7 Apr 2022 15:54:43 +0100 Subject: [PATCH 2/3] fix: tweak preset for new swa config --- src/presets/azure.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/presets/azure.ts b/src/presets/azure.ts index 1241edaae2..93e87aaa4f 100644 --- a/src/presets/azure.ts +++ b/src/presets/azure.ts @@ -111,7 +111,9 @@ async function writeRoutes (nitro) { await writeFile(resolve(nitro.options.output.serverDir, 'function.json'), JSON.stringify(functionDefinition)) await writeFile(resolve(nitro.options.output.serverDir, '../host.json'), JSON.stringify(host)) - await writeFile(resolve(nitro.options.output.publicDir, 'staticwebapp.config.json'), JSON.stringify(config)) + const stubPackageJson = resolve(nitro.options.output.serverDir, '../package.json') + await writeFile(stubPackageJson, JSON.stringify({ private: true })) + await writeFile(resolve(nitro.options.rootDir, 'staticwebapp.config.json'), JSON.stringify(config)) if (!indexFileExists) { await writeFile(indexPath, '') } From 63b5180fb4eabf7d372a5b44e07413afb7a8b08f Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Thu, 7 Apr 2022 15:56:40 +0100 Subject: [PATCH 3/3] fix: fall back to process node version --- src/presets/azure.ts | 7 ++++++- src/presets/firebase.ts | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/presets/azure.ts b/src/presets/azure.ts index 93e87aaa4f..ae34fcca56 100644 --- a/src/presets/azure.ts +++ b/src/presets/azure.ts @@ -32,7 +32,12 @@ async function writeRoutes (nitro) { if (['16', '14'].includes(currentNodeVersion)) { nodeVersion = currentNodeVersion } - } catch { } + } catch { + const currentNodeVersion = process.versions.node.slice(0, 2) + if (['16', '14'].includes(currentNodeVersion)) { + nodeVersion = currentNodeVersion + } + } const config = { platform: { diff --git a/src/presets/firebase.ts b/src/presets/firebase.ts index 6c7e727c3c..db2d7a788c 100644 --- a/src/presets/firebase.ts +++ b/src/presets/firebase.ts @@ -62,7 +62,12 @@ async function writeRoutes (nitro: Nitro) { if (['16', '14'].includes(currentNodeVersion)) { nodeVersion = currentNodeVersion } - } catch { } + } catch { + const currentNodeVersion = process.versions.node.slice(0, 2) + if (['16', '14'].includes(currentNodeVersion)) { + nodeVersion = currentNodeVersion + } + } const getPackageVersion = async (id) => { const pkg = await readPackageJSON(id, { url: nitro.options.nodeModulesDirs })