From 45450e8dc99439d360cdf1d1850ea0a6e0b6cd0a Mon Sep 17 00:00:00 2001 From: Jeff Ohrstrom Date: Fri, 15 Nov 2024 11:45:02 -0500 Subject: [PATCH 1/3] import active_jobs js as a module --- apps/dashboard/app/views/active_jobs/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dashboard/app/views/active_jobs/index.html.erb b/apps/dashboard/app/views/active_jobs/index.html.erb index 5264bec5fa..ed87e67019 100644 --- a/apps/dashboard/app/views/active_jobs/index.html.erb +++ b/apps/dashboard/app/views/active_jobs/index.html.erb @@ -68,4 +68,4 @@ > -<%= javascript_include_tag 'active_jobs', nonce: true %> \ No newline at end of file +<%= javascript_include_tag 'active_jobs', nonce: true, type: 'module' %> \ No newline at end of file From ab2ccbcc82acc44203ccf82e1e0a8bea0d73f06b Mon Sep 17 00:00:00 2001 From: Jeff Ohrstrom Date: Fri, 15 Nov 2024 11:45:14 -0500 Subject: [PATCH 2/3] minify in dev environment --- apps/dashboard/esbuild.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dashboard/esbuild.config.js b/apps/dashboard/esbuild.config.js index a216f79fb5..bd7b626b62 100644 --- a/apps/dashboard/esbuild.config.js +++ b/apps/dashboard/esbuild.config.js @@ -73,7 +73,7 @@ esbuild.build({ outdir: buildDir, external: ['fs'], plugins: [prepPlugin, minifiedSrcResolvePlugin], - minify: process.env.RAILS_ENV == 'production' ? true : false, + minify: process.env.RAILS_ENV == 'production' || process.env.MINIFY == 'false' ? true : false, }).catch((e) => { console.error(e.message); process.exit(1); From b2d7ac61e456a3767d6e65949522ebf9d3274dd3 Mon Sep 17 00:00:00 2001 From: Jeff Ohrstrom Date: Fri, 15 Nov 2024 11:47:15 -0500 Subject: [PATCH 3/3] add a newline here --- apps/dashboard/app/views/active_jobs/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dashboard/app/views/active_jobs/index.html.erb b/apps/dashboard/app/views/active_jobs/index.html.erb index ed87e67019..72490ccec4 100644 --- a/apps/dashboard/app/views/active_jobs/index.html.erb +++ b/apps/dashboard/app/views/active_jobs/index.html.erb @@ -68,4 +68,4 @@ > -<%= javascript_include_tag 'active_jobs', nonce: true, type: 'module' %> \ No newline at end of file +<%= javascript_include_tag 'active_jobs', nonce: true, type: 'module' %>