Skip to content

fix: script minifiy match regex #7918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 24, 2025
+30 −1
Merged

fix: script minifiy match regex #7918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a93d5d
fix: should minify the match string
clChenLiang Nov 24, 2025
a601ba0
feat: add test
clChenLiang Nov 24, 2025
86a7465
docs: add changeset
clChenLiang Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/smart-showers-think.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@modern-js/runtime': patch
---

fix: use minify regex
fix: 用最小匹配来替换
2 changes: 1 addition & 1 deletion packages/runtime/plugin-runtime/src/document/cli/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ export const documentPlugin = (): CliPluginFuture<AppTools<'shared'>> => ({

html = html.replace(
new RegExp(
`${DOCUMENT_SCRIPT_PLACEHOLDER_START}${DOCUMENT_SCRIPT_ATTRIBUTES_START}(.*)${DOCUMENT_SCRIPT_ATTRIBUTES_END}(.*?)${DOCUMENT_SCRIPT_PLACEHOLDER_END}`,
`${DOCUMENT_SCRIPT_PLACEHOLDER_START}${DOCUMENT_SCRIPT_ATTRIBUTES_START}(.*?)${DOCUMENT_SCRIPT_ATTRIBUTES_END}(.*?)${DOCUMENT_SCRIPT_PLACEHOLDER_END}`,
'g',
),
(_scriptStr, $1, $2) =>
Expand Down
8 changes: 8 additions & 0 deletions tests/integration/app-document/src/sub/Document.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ export default function Document(): React.ReactElement {
console.log('this is a IIFE function');
}}
/>
<Script
defer
async
id="script-has-id2"
content={() => {
console.log('this is another IIFE function');
}}
/>
</Head>
<Body {...{ dir: 'ltr' }}>
<Root {...{ class: 'root' }}>
Expand Down
15 changes: 15 additions & 0 deletions tests/integration/app-document/tests/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,21 @@ describe('test dev and build', () => {
htmlWithDoc.includes('console.log("this is a IIFE function")'),
).toBe(true);
});

test('should not break Script origin script properties', async () => {
const htmlWithDoc = fs.readFileSync(
path.join(appDir, 'dist', 'html/sub/index.html'),
'utf-8',
);

expect(
htmlWithDoc.includes('<script defer="" async="" id="script-has-id2">'),
).toBe(true);
// IIFE should worked
expect(
htmlWithDoc.includes('console.log("this is another IIFE function")'),
).toBe(true);
});
});

describe('test dev', () => {
Expand Down