Skip to content

Commit 27d561c

Browse files
committed
feat(html): improve template parameters
1 parent 47468a4 commit 27d561c

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

crates/rspack_plugin_html/src/plugin.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ use rayon::prelude::*;
1111
use rspack_core::{
1212
parse_to_url,
1313
rspack_sources::{RawSource, SourceExt},
14-
Compilation, CompilationAsset, CompilationProcessAssets, FilenameTemplate, Mode, PathData,
15-
Plugin,
14+
Compilation, CompilationAsset, CompilationProcessAssets, CrossOriginLoading, FilenameTemplate,
15+
Mode, PathData, Plugin,
1616
};
1717
use rspack_dojang::dojang::{Dojang, DojangOptions};
1818
use rspack_dojang::Operand;
@@ -335,7 +335,10 @@ async fn process_assets(&self, compilation: &mut Compilation) -> Result<()> {
335335
},
336336
"output": {
337337
"publicPath": config.get_public_path(compilation, &self.config.filename),
338-
"crossOriginLoading": format!("{}", compilation.options.output.cross_origin_loading),
338+
"crossOriginLoading": match &compilation.options.output.cross_origin_loading {
339+
CrossOriginLoading::Disable => "false",
340+
CrossOriginLoading::Enable(value) => value,
341+
},
339342
}
340343
},
341344
}),

packages/rspack-test-tools/tests/configCases/builtins/html-template-parameters/index.html

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<div>styles: "<% for style in htmlRspackPlugin.files.css { %><%= style %><% } %>"</div>
1919
<div>config title: "<%= htmlRspackPlugin.options.title %>"</div>
2020
<div>rspack config publicpath: "<%= rspackConfig.output.publicPath %>"</div>
21+
<div>rspack config cross origin loading: "<%= rspackConfig.output.crossOriginLoading %>"</div>
2122
<div>rspack config mode: "<%= rspackConfig.mode %>"</div>
2223
</body>
2324

packages/rspack-test-tools/tests/configCases/builtins/html-template-parameters/index.js

+4
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,8 @@ it("should inject rspackConfig.mode", () => {
4747

4848
it("should inject rspackConfig.output.publicPath", () => {
4949
expect(htmlContent).toContain(`rspack config publicpath: "http://cdn.com/"`);
50+
});
51+
52+
it("should inject rspackConfig.output.crossOriginLoading", () => {
53+
expect(htmlContent).toContain(`rspack config cross origin loading: "anonymous"`);
5054
});

packages/rspack-test-tools/tests/configCases/builtins/html-template-parameters/rspack.config.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ const { CssExtractRspackPlugin, HtmlRspackPlugin } = rspack;
44
/** @type {import("@rspack/core").Configuration} */
55
module.exports = {
66
output: {
7-
publicPath: "http://cdn.com/"
7+
publicPath: "http://cdn.com/",
8+
crossOriginLoading: "anonymous"
89
},
910
module: {
1011
rules: [

0 commit comments

Comments
 (0)