Merged PR 1618: updated gitignore,package lock for node 20 pipeline

updated gitignore,package lock for node 20 pipeline

Related work items: #12956
This commit is contained in:
Robert Bond
2025-05-13 12:57:21 +00:00
5 changed files with 11314 additions and 23 deletions
+2 -2
View File
@@ -16,8 +16,8 @@ yarn-error.log*
.yarn .yarn
#lock files #lock files
yarn.lock # yarn.lock
package-lock.json # package-lock.json
tmp tmp
+11285
View File
File diff suppressed because it is too large Load Diff
+5 -5
View File
@@ -7,9 +7,10 @@
"debugdev": "NODE_OPTIONS='--inspect' next dev", "debugdev": "NODE_OPTIONS='--inspect' next dev",
"dev:app": "node ./server/server.js", "dev:app": "node ./server/server.js",
"build": "NODE_ENV=production node_modules/next/dist/bin/next build", "build": "NODE_ENV=production node_modules/next/dist/bin/next build",
"start2": "NODE_ENV=production node ./server/server.js", "start2": "NODE_ENV=production node server.js",
"start": "NODE_ENV=production node_modules/next/dist/bin/next start", "start": "NODE_ENV=production node_modules/next/dist/bin/next start",
"lint": "next lint" "lint": "next lint",
"prisma:generate": "prisma generate"
}, },
"browser": { "browser": {
"child_process": false "child_process": false
@@ -48,8 +49,7 @@
"moment": "^2.29.4", "moment": "^2.29.4",
"multiparty": "^4.2.3", "multiparty": "^4.2.3",
"mysql": "^2.18.1", "mysql": "^2.18.1",
"nanoid": "^3.2.0", "next": "^14.2.28",
"next": "14.1.2",
"next-auth": "^4.24.4", "next-auth": "^4.24.4",
"next-build-id": "^3.0.0", "next-build-id": "^3.0.0",
"next-connect": "^0.12.2", "next-connect": "^0.12.2",
@@ -104,4 +104,4 @@
"eslint-plugin-jsdoc": "^48.2.3", "eslint-plugin-jsdoc": "^48.2.3",
"prisma": "^5.0.0" "prisma": "^5.0.0"
} }
} }
+1 -1
View File
@@ -1,7 +1,7 @@
import Document, { Html, Head, Main, NextScript } from "next/document"; import Document, { Html, Head, Main, NextScript } from "next/document";
import SkipLink from "../components/skiplink"; import SkipLink from "../components/skiplink";
import { Tracking, TrackingNoScript } from "../components/tracking"; import { Tracking, TrackingNoScript } from "../components/tracking";
import { nanoid } from "nanoid"; //import { nanoid } from "nanoid";
import { setCookie } from "nookies"; import { setCookie } from "nookies";
import Script from "next/script"; import Script from "next/script";
+21 -15
View File
@@ -4,6 +4,7 @@ const appInsights = require("applicationinsights");
const initAppInsights = (instrumentationKey) => { const initAppInsights = (instrumentationKey) => {
if (!instrumentationKey) { if (!instrumentationKey) {
console.log("App Insights not configured.");
return false; return false;
} }
@@ -13,6 +14,7 @@ const initAppInsights = (instrumentationKey) => {
.setSendLiveMetrics(true) .setSendLiveMetrics(true)
.start(); .start();
console.log("App Insights enabled.");
return true; return true;
}; };
@@ -24,6 +26,8 @@ const startServer = async (config) => {
}; };
const app = next(serverOptions); const app = next(serverOptions);
await app.prepare(); // prepare BEFORE starting the server
const handleNextRequests = app.getRequestHandler(); const handleNextRequests = app.getRequestHandler();
const srv = createServer((req, res) => { const srv = createServer((req, res) => {
@@ -38,22 +42,28 @@ const startServer = async (config) => {
}); });
await new Promise((resolve, reject) => { await new Promise((resolve, reject) => {
// This code catches EADDRINUSE error if the port is already in use
srv.on("error", reject); srv.on("error", reject);
srv.on("listening", () => resolve()); srv.on("listening", () => resolve());
srv.listen(config.port, config.hostname); srv.listen(config.port, config.hostname);
}); });
// It's up to caller to run `app.prepare()`, so it can notify that the server // Graceful shutdown handling
// is listening before starting any intensive operations. process.on("SIGTERM", () => {
console.log("Received SIGTERM, shutting down gracefully...");
srv.close(() => {
console.log("Server closed.");
process.exit(0);
});
});
return app; return app;
}; };
// App configuration
const startTime = Date.now(); const startTime = Date.now();
const serverConfig = { const serverConfig = {
hostname: "localhost", hostname: "0.0.0.0", // Required for Azure App Service
port: process.env.PORT || 3000, port: parseInt(process.env.PORT, 10) || 3000,
env: process.env.APP_ENV || process.env.NODE_ENV || "production", env: process.env.APP_ENV || process.env.NODE_ENV || "production",
useAppInsights: initAppInsights( useAppInsights: initAppInsights(
process.env.NEXT_PUBLIC_APPINSIGHTS_INSTRUMENTATIONKEY process.env.NEXT_PUBLIC_APPINSIGHTS_INSTRUMENTATIONKEY
@@ -61,24 +71,20 @@ const serverConfig = {
}; };
startServer(serverConfig) startServer(serverConfig)
.then(async (app) => { .then(() => {
console.log( console.log(
`started server on host ${serverConfig.hostname}, port ${serverConfig.port}, env ${serverConfig.env}` `Server ready on http://${serverConfig.hostname}:${serverConfig.port} [${serverConfig.env}]`
); );
if (serverConfig.useAppInsights) { if (serverConfig.useAppInsights) {
const duration = Date.now() - startTime; const duration = Date.now() - startTime;
appInsights.defaultClient.trackMetric({ appInsights.defaultClient.trackMetric({
name: "server startup time", name: "Server Startup Time",
value: duration, value: duration,
}); });
} }
await app.prepare();
}) })
.catch((error) => { .catch((err) => {
console.error(err); console.error("Server failed to start:", err);
process.exit(1); process.exit(1);
}); });