From 28eeddeb347252b566bd9f09f96c5d334c17fff1 Mon Sep 17 00:00:00 2001 From: Owen Buckley Date: Wed, 22 May 2024 20:40:51 -0400 Subject: [PATCH] exclude JSON script tags from JS bundling (#1231) --- packages/cli/src/lib/resource-utils.js | 3 ++- .../build.default.workspace-javascript-css.spec.js | 9 ++++++++- .../src/pages/index.html | 4 ++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/cli/src/lib/resource-utils.js b/packages/cli/src/lib/resource-utils.js index a3d71e579..1032afc5e 100644 --- a/packages/cli/src/lib/resource-utils.js +++ b/packages/cli/src/lib/resource-utils.js @@ -124,7 +124,8 @@ async function trackResourcesForRoute(html, compilation, route) { const scripts = await Promise.all(root.querySelectorAll('script') .filter(script => ( isLocalLink(script.getAttribute('src')) || script.rawText) - && script.rawAttrs.indexOf('importmap') < 0) + && script.rawAttrs.indexOf('importmap') < 0 + && script.getAttribute('type') !== 'application/json') .map(async(script) => { const src = script.getAttribute('src'); const optimizationAttr = script.getAttribute('data-gwd-opt'); diff --git a/packages/cli/test/cases/build.default.workspace-javascript-css/build.default.workspace-javascript-css.spec.js b/packages/cli/test/cases/build.default.workspace-javascript-css/build.default.workspace-javascript-css.spec.js index 1265601d1..8a5376690 100644 --- a/packages/cli/test/cases/build.default.workspace-javascript-css/build.default.workspace-javascript-css.spec.js +++ b/packages/cli/test/cases/build.default.workspace-javascript-css/build.default.workspace-javascript-css.spec.js @@ -78,7 +78,7 @@ describe('Build Greenwood With: ', function() { it('should have two tag in the ', function() { diff --git a/packages/cli/test/cases/build.default.workspace-javascript-css/src/pages/index.html b/packages/cli/test/cases/build.default.workspace-javascript-css/src/pages/index.html index 75cb0dd31..fbb7de6fa 100644 --- a/packages/cli/test/cases/build.default.workspace-javascript-css/src/pages/index.html +++ b/packages/cli/test/cases/build.default.workspace-javascript-css/src/pages/index.html @@ -47,6 +47,10 @@ + +