📻

.github/workflows/aws.yml

@@ -27,8 +27,20 @@ jobs:
       - name: Install Playwright
         run: npx playwright install chromium --with-deps
 
-      - name: Test AWS Server MPA
+      - name: Test AWS Offline Server MPA
         run: npm run test.aws-offline.mpa
 
-      - name: Test AWS Server SPA
+      - name: Test AWS Offline Server SPA
         run: npm run test.aws-offline.spa
+
+      - name: Configura AWS credentials
+        run: npx serverless config credentials --provider aws --key ${{ secrets.AWS_KEY }} --secre ${{ secrets.AWS_SECRET }}
+
+      - name: Deploy AWS lambda
+        run: npm run deploy.aws
+
+      - name: Test AWS Server MPA
+        run: npm run test.aws.mpa
+
+      - name: Test AWS Server SPA
+        run: npm run test.aws.spa

custom-src/entry_aws-lambda.tsx

@@ -29,12 +29,20 @@ const { router, notFound, staticFile } = createQwikCity({
   static: {
     cacheControl: "public, max-age=31557600",
   },
+  getOrigin(req) {
+    if (process.env.IS_OFFLINE) {
+      return `http://${req.headers.host}`;
+    }
+    return null;
+  },
 });
 
 export const qwikApp = serverless(
   {
     handle: (req: any, res: any) => {
-      req.url = fixPath(req.url);
+      if (process.env.IS_OFFLINE) {
+        req.url = fixPath(req.url);
+      }
       staticFile(req, res, () => {
         router(req, res, () => {
           notFound(req, res, () => {});
@@ -47,14 +55,16 @@ export const qwikApp = serverless(
   }
 );
 
-function fixPath(url: string) {
+function fixPath(path: string) {
+  console.log(path);
   if (qwikCityPlan.trailingSlash) {
-    if (url.slice(url.lastIndexOf("/")).includes(".")) {
-      return url;
+    const url = new URL(path, "http://aws-qwik.local");
+    if (url.pathname.includes(".", url.pathname.lastIndexOf("/"))) {
+      return path;
     }
-    if (!url.endsWith("/")) {
-      return url + "/";
+    if (!url.pathname.endsWith("/")) {
+      return url.pathname + "/" + url.search;
     }
   }
-  return url;
-}
+  return path;
+}

custom-src/routes/functions/index.tsx

@@ -39,23 +39,6 @@ export default component$(() => {
         Increment {counter.value} {counterDoubled.value}
       </button>
 
-      <button
-        id="save"
-        onClick$={server$(() => {
-          globalDB.count = counter.value;
-          console.log("Current count is", counter.value);
-        })}
-      >
-        SAVE
-      </button>
-      <button
-        id="load"
-        onClick$={async () => {
-          message.value = `Stuff is: ${await getstuff(counter.value)}`;
-        }}
-      >
-        LOAD
-      </button>
       <p id="result">{message.value}</p>
       <button
         onClick$={async () => {

playwright.aws-offline.config.ts

@@ -7,7 +7,10 @@ const config: PlaywrightTestConfig = {
   metadata: {
     server: "aws",
   },
-  retries: 2,
+  grepInvert: [
+    /@streaming/,
+    /@trailingSlash/
+  ],
   webServer: {
     command: "npm run serve.aws",
     port: 4000,

playwright.aws.config.ts

@@ -7,9 +7,11 @@ const config: PlaywrightTestConfig = {
   metadata: {
     server: "aws",
   },
-
+  grepInvert: [
+    /@streaming/,
+  ],
   use: {
-    baseURL: "https://qwik-city-e2e.vercel.app/",
+    baseURL: "https://3psthbqcak.execute-api.us-west-1.amazonaws.com/",
   },
   retries: 2,
   webServer: undefined,

playwright.netlify.config.ts

@@ -7,7 +7,9 @@ const config: PlaywrightTestConfig = {
   metadata: {
     server: "netlify",
   },
-
+  grepInvert: [
+    /@streaming/,
+  ],
   use: {
     baseURL: "https://qwik-city-e2e.netlify.app/",
   },

serverless.yml

@@ -24,7 +24,8 @@ custom:
 package:
   excludeDevDependencies: true
   patterns:
-    - "./!**"
+    - "!*"
+    - "!*/**"
     - "server/**"
     - "dist/**"
 

tests/functions.spec.ts

@@ -21,7 +21,7 @@ test("navigate to /app/functions/ and run test", async ({
   }
 });
 
-test("streaming", async ({ page, javaScriptEnabled }) => {
+test("streaming @streaming", async ({ page, javaScriptEnabled }) => {
   await page.goto("/app/functions/");
   if (javaScriptEnabled) {
     const logs = page.locator(".server-streaming");
@@ -44,36 +44,14 @@ test("streaming", async ({ page, javaScriptEnabled }) => {
 
 async function functionsTest(page: Page) {
   const increment = page.locator("#increment");
-  const save = page.locator("#save");
-  const load = page.locator("#load");
-  const result = page.locator("#result");
-
-  await save.click();
-  await page.waitForTimeout(100);
-  await load.click();
-  await page.waitForTimeout(100);
 
   await expect(increment).toHaveText("Increment 0 0");
-  await expect(result).toHaveText("Stuff is: 0");
 
   await increment.click();
   await expect(increment).toHaveText("Increment 1 2");
-  await save.click();
-  await page.waitForTimeout(100);
-  await load.click();
-  await page.waitForTimeout(100);
-  await expect(result).toHaveText("Stuff is: 2");
 
   await increment.click();
   await expect(increment).toHaveText("Increment 2 4");
   await increment.click();
   await expect(increment).toHaveText("Increment 3 6");
-  await load.click();
-  await page.waitForTimeout(100);
-  await expect(result).toHaveText("Stuff is: 4");
-  await save.click();
-  await page.waitForTimeout(100);
-  await load.click();
-  await page.waitForTimeout(100);
-  await expect(result).toHaveText("Stuff is: 6");
 }

tests/navigate.spec.ts

@@ -16,7 +16,7 @@ test("navigate to /app/endpoints/", async ({ page }, { config }) => {
   await expect(new URL(page.url()).pathname).toEqual("/app/endpoints/");
 });
 
-test("navigate to /app/endpoints (no trailing)", async ({ page }, {
+test("navigate to /app/endpoints (no trailing) @trailingSlash", async ({ page }, {
   config,
 }) => {
   await page.goto("/app/");

tests/no-trailing-slash.spec.ts

@@ -1,6 +1,6 @@
 import { expect, test } from "@playwright/test";
 
-test("no trailing slash should redirect to have a trailing slash", async ({
+test("no trailing slash should redirect to have a trailing slash @trailingSlash", async ({
   page,
 }) => {
   const rsp = (await page.goto("/app/endpoints"))!;