Merge pull request #6 from derkoe/fix/azure-directory-layout

Fix/azure directory layout
derkoe · Feb 7, 2023 · e15e343 · e15e343
2 parents b3987fe + e0a3a5e
commit e15e343
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/azure-static-web-apps-salmon-dune-02a16c603.yml b/.github/workflows/azure-static-web-apps-salmon-dune-02a16c603.yml
@@ -29,7 +29,7 @@ jobs:
           # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
           app_build_command: "npm run build"
           app_location: "." # App source code path
-          api_location: "." # Api source code path - optional
+          api_location: "./azure-functions" # Api source code path - optional
           skip_api_build: true
           output_location: "./dist" # Built app content directory - optional
           ###### End of Repository/Build Configurations ######

diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,6 @@
 /lib
 /lib-types
 /server
-/azure/server
 
 # Development
 node_modules
@@ -38,4 +37,8 @@ lerna-debug.log*
 .yarn/*
 !.yarn/releases
 
-.env
+.env
+
+# Azure
+/azure-functions/**
+!/azure-functions/host.json
diff --git a/adaptors/azure-swa/vite.config.ts b/adaptors/azure-swa/vite.config.ts
@@ -6,7 +6,7 @@ export default extendConfig(baseConfig, () => {
   return {
     build: {
       ssr: true,
-      outDir: 'server',
+      outDir: 'azure-functions/render',
       rollupOptions: {
         input: ['src/entry.azure-swa.tsx', '@qwik-city-plan'],
         output: {
@@ -18,7 +18,6 @@ export default extendConfig(baseConfig, () => {
     ssr: {
       target: 'webworker',
       noExternal: true,
-      outDir: 'dist/server',
     },
     plugins: [
       azureSwaAdaptor({

diff --git a/host.json → azure-functions/host.json b/host.json → azure-functions/host.json
diff --git a/public/staticwebapp.config.json b/public/staticwebapp.config.json
@@ -17,11 +17,11 @@
     },
     {
       "route": "/*",
-      "rewrite": "/api/server"
+      "rewrite": "/api/render"
     }
   ],
   "navigationFallback": {
-    "rewrite": "/api/server"
+    "rewrite": "/api/render"
   },
   "platform": {
     "apiRuntime": "node:18"

diff --git a/swa-cli.config.json b/swa-cli.config.json
@@ -3,7 +3,7 @@
   "configurations": {
     "qwik-app": {
       "appLocation": ".",
-      "apiLocation": ".",
+      "apiLocation": "./azure-functions",
       "outputLocation": "./dist",
       "appBuildCommand": "npm run build"
     }