angular: replace proxy.conf.json with proxy.config.mjs (#28336)

jhipster · Jan 8, 2025 · 2243f1b · 2243f1b
1 parent a862a1c
commit 2243f1b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 29 deletions.
diff --git a/generators/angular/files-angular.ts b/generators/angular/files-angular.ts
@@ -59,7 +59,7 @@ export const files = {
       condition: ctx => ctx.clientBundlerExperimentalEsbuild,
       templates: [
         { sourceFile: 'angular.json.esbuild', destinationFile: 'angular.json' },
-        'proxy.conf.json',
+        'proxy.config.mjs',
         'build-plugins/define-esbuild.mjs',
       ],
     }),

diff --git a/generators/angular/templates/angular.json.esbuild.ejs b/generators/angular/templates/angular.json.esbuild.ejs
@@ -126,7 +126,7 @@
           "options": {
             "buildTarget": "<%= dasherizedBaseName %>:build:development",
             "open": true,
-            "proxyConfig": "proxy.conf.json",
+            "proxyConfig": "proxy.config.mjs",
             "port": <%= devServerPort %>
           },
           "configurations": {

diff --git a/generators/angular/templates/proxy.conf.json.ejs b/generators/angular/templates/proxy.conf.json.ejs
diff --git a/generators/angular/templates/proxy.config.mjs.ejs b/generators/angular/templates/proxy.config.mjs.ejs
@@ -0,0 +1,24 @@
+const backendHost = '127.0.0.1';
+const backendPort = <%= applicationTypeMicroservice ? gatewayServerPort : serverPort %>;
+
+<%_ if (clientBundlerExperimentalEsbuild) { _%>
+/**
+ * @type {import('vite').CommonServerOptions['proxy']}
+ */
+<%_ } _%>
+export default {
+<%_ if (communicationSpringWebsocket) { _%>
+  '/websocket': {
+    target: `ws://${backendHost}:${backendPort}`,
+    ws: true,
+  },
+<%_ } _%>
+  '^/(api|management|v3/api-docs<% if (databaseTypeSql && devDatabaseTypeH2Any) { %>|h2-console<% } %><% if (authenticationTypeOauth2) { %>|oauth2|login<% } %><% if (authenticationTypeSession) { %>|login<% } %><% if (applicationTypeGateway || applicationTypeMicroservice) { %>|services<% } %>)': {
+<%_ if (clientBundlerExperimentalEsbuild) { _%>
+    target: `http://${backendHost}:${backendPort}`,
+<%_ } else { _%>
+    router: req => `http${req.socket.ssl ? 's' : ''}://${backendHost}:${backendPort}`,
+<%_ } _%>
+    xfwd: true,
+  },
+};