fix universal deploy

Author: mrosack

_sls_lambda_universal/copy-dist.js

@@ -0,0 +1,34 @@
+#!/usr/bin/env node
+// Copies ../dist into ./dist, replacing any previous copy.
+// Using a Node.js script instead of copyfiles for reliable cross-platform behavior with .. paths.
+
+const fs = require('fs');
+const path = require('path');
+
+const srcDir = path.resolve(__dirname, '../dist');
+const destDir = path.resolve(__dirname, 'dist');
+
+if (!fs.existsSync(srcDir)) {
+  console.error(`Source directory not found: ${srcDir}`);
+  console.error('Run the Angular production build first.');
+  process.exit(1);
+}
+
+if (fs.existsSync(destDir)) {
+  fs.rmSync(destDir, { recursive: true });
+}
+
+function copyRecursive(src, dest) {
+  const stat = fs.statSync(src);
+  if (stat.isDirectory()) {
+    fs.mkdirSync(dest, { recursive: true });
+    for (const item of fs.readdirSync(src)) {
+      copyRecursive(path.join(src, item), path.join(dest, item));
+    }
+  } else {
+    fs.copyFileSync(src, dest);
+  }
+}
+
+copyRecursive(srcDir, destDir);
+console.log(`Copied ${srcDir} → ${destDir}`);

_sls_lambda_universal/package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "copy": "npx copyfiles ../dist/**/*.* dist",
+    "copy": "node copy-dist.js",
     "deploy-develop": "npm run copy && sls deploy --verbose",
     "deploy-master": "npm run copy && sls deploy --verbose --stage prod"
   },

_sls_lambda_universal/pydt-universal.js

@@ -1,13 +1,17 @@
-const serverlessExpress = require('@vendia/serverless-express')
-const server = require('./dist/web/server/main');
-const app = server.app();
+const serverlessExpress = require('@vendia/serverless-express');
 
-module.exports.handler = serverlessExpress({
-  app,
-  logSettings: {
-    level: 'debug'
-  },
-  binarySettings: {
-    contentTypes: ['*/*']
+let cachedHandler;
+
+module.exports.handler = async (event, context) => {
+  if (!cachedHandler) {
+    const { reqHandler } = await import('./dist/web/server/server.mjs');
+    cachedHandler = serverlessExpress({
+      app: reqHandler,
+      binarySettings: {
+        contentTypes: ['*/*']
+      }
+    });
   }
-});
+
+  return cachedHandler(event, context);
+};

src/server.ts

@@ -25,13 +25,23 @@ const angularApp = new AngularNodeAppEngine();
  */
 
 /**
- * Serve static files from /browser
+ * Serve static files from /browser.
+ * Hashed files (JS/CSS bundles) get a long cache; SW-critical files must never be cached
+ * so the service worker can detect new deployments.
  */
+const NO_CACHE_FILES =
+  /\/(ngsw\.json|ngsw-worker\.js|pydt-service-worker\.js|safety-worker\.js|worker-basic\.min\.js|index\.html)$/;
+
 app.use(
   express.static(browserDistFolder, {
     maxAge: "1y",
     index: false,
     redirect: false,
+    setHeaders: (res, filePath) => {
+      if (NO_CACHE_FILES.test(filePath)) {
+        res.setHeader("Cache-Control", "no-cache");
+      }
+    },
   }),
 );