@web/rollup-plugin-html 2.1.1 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -40,6 +40,8 @@ export interface RollupPluginHTMLOptions {
40
40
  absolutePathPrefix?: string;
41
41
  /** When set to true, will insert meta tags for CSP and add script-src values for inline scripts by sha256-hashing the contents */
42
42
  strictCSPInlineScripts?: boolean;
43
+ /** Bundle assets reference from CSS via `url` */
44
+ bundleAssetsFromCss?: boolean;
43
45
  }
44
46
  export interface GeneratedBundle {
45
47
  name: string;
@@ -1 +1 @@
1
- {"version":3,"file":"RollupPluginHTMLOptions.d.ts","sourceRoot":"","sources":["../src/RollupPluginHTMLOptions.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,MAAM,WAAW,gBAAgB;IAC/B,qDAAqD;IACrD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yDAAyD;IACzD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,6DAA6D;IAC7D,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,uBAAuB;IACtC,0EAA0E;IAC1E,KAAK,CAAC,EAAE,MAAM,GAAG,gBAAgB,GAAG,CAAC,MAAM,GAAG,gBAAgB,CAAC,EAAE,CAAC;IAClE,mDAAmD;IACnD,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B,yCAAyC;IACzC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,+EAA+E;IAC/E,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,2GAA2G;IAC3G,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uDAAuD;IACvD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4CAA4C;IAC5C,cAAc,CAAC,EAAE,sBAAsB,GAAG,sBAAsB,EAAE,CAAC;IACnE,yCAAyC;IACzC,aAAa,CAAC,EAAE,qBAAqB,GAAG,qBAAqB,EAAE,CAAC;IAChE,iFAAiF;IACjF,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,wEAAwE;IACxE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,uLAAuL;IACvL,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,kFAAkF;IAClF,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,4DAA4D;IAC5D,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,6IAA6I;IAC7I,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,kIAAkI;IAClI,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,aAAa,CAAC;IACvB,MAAM,EAAE,YAAY,CAAC;CACtB;AAED,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACvD,WAAW,EAAE;QAGX,UAAU,EAAE,MAAM,CAAC;QAGnB,KAAK,EAAE,WAAW,CAAC;QACnB,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;KAC1B,EAAE,CAAC;CACL;AAED,MAAM,WAAW,iBAAiB;IAOhC,MAAM,EAAE,gBAAgB,CAAC;IAGzB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC1C,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,qBAAqB,GAAG,CAClC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,iBAAiB,KACpB,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE9B,MAAM,MAAM,sBAAsB,GAAG,CACnC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,KACb,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC"}
1
+ {"version":3,"file":"RollupPluginHTMLOptions.d.ts","sourceRoot":"","sources":["../src/RollupPluginHTMLOptions.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,MAAM,WAAW,gBAAgB;IAC/B,qDAAqD;IACrD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yDAAyD;IACzD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,6DAA6D;IAC7D,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,uBAAuB;IACtC,0EAA0E;IAC1E,KAAK,CAAC,EAAE,MAAM,GAAG,gBAAgB,GAAG,CAAC,MAAM,GAAG,gBAAgB,CAAC,EAAE,CAAC;IAClE,mDAAmD;IACnD,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B,yCAAyC;IACzC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,+EAA+E;IAC/E,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,2GAA2G;IAC3G,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uDAAuD;IACvD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4CAA4C;IAC5C,cAAc,CAAC,EAAE,sBAAsB,GAAG,sBAAsB,EAAE,CAAC;IACnE,yCAAyC;IACzC,aAAa,CAAC,EAAE,qBAAqB,GAAG,qBAAqB,EAAE,CAAC;IAChE,iFAAiF;IACjF,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,wEAAwE;IACxE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,uLAAuL;IACvL,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,kFAAkF;IAClF,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,4DAA4D;IAC5D,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,6IAA6I;IAC7I,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,kIAAkI;IAClI,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,iDAAiD;IACjD,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,aAAa,CAAC;IACvB,MAAM,EAAE,YAAY,CAAC;CACtB;AAED,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACvD,WAAW,EAAE;QAGX,UAAU,EAAE,MAAM,CAAC;QAGnB,KAAK,EAAE,WAAW,CAAC;QACnB,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;KAC1B,EAAE,CAAC;CACL;AAED,MAAM,WAAW,iBAAiB;IAOhC,MAAM,EAAE,gBAAgB,CAAC;IAGzB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC1C,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,qBAAqB,GAAG,CAClC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,iBAAiB,KACpB,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE9B,MAAM,MAAM,sBAAsB,GAAG,CACnC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,KACb,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"emitAssets.d.ts","sourceRoot":"","sources":["../../src/output/emitAssets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAGvC,OAAO,EAAc,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,uBAAuB,EAA0B,MAAM,4BAA4B,CAAC;AAE7F,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B;AAED,wBAAsB,UAAU,CAC9B,IAAI,EAAE,aAAa,EACnB,MAAM,EAAE,SAAS,EAAE,EACnB,OAAO,EAAE,uBAAuB;;;GAiEjC"}
1
+ {"version":3,"file":"emitAssets.d.ts","sourceRoot":"","sources":["../../src/output/emitAssets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAKvC,OAAO,EAAc,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,uBAAuB,EAA0B,MAAM,4BAA4B,CAAC;AAE7F,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B;AAwBD,wBAAsB,UAAU,CAC9B,IAAI,EAAE,aAAa,EACnB,MAAM,EAAE,SAAS,EAAE,EACnB,OAAO,EAAE,uBAAuB;;;GAiHjC"}
@@ -5,6 +5,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.emitAssets = void 0;
7
7
  const path_1 = __importDefault(require("path"));
8
+ const lightningcss_1 = require("lightningcss");
9
+ const fs_1 = __importDefault(require("fs"));
10
+ const allowedFileExtensions = [
11
+ /.*\.svg/,
12
+ /.*\.png/,
13
+ /.*\.jpg/,
14
+ /.*\.jpeg/,
15
+ /.*\.webp/,
16
+ /.*\.gif/,
17
+ /.*\.avif/,
18
+ /.*\.woff2/,
19
+ /.*\.woff/,
20
+ ];
21
+ function shouldHandleAsset(url) {
22
+ return (allowedFileExtensions.some(f => f.test(url)) &&
23
+ !url.startsWith('http') &&
24
+ !url.startsWith('data') &&
25
+ !url.startsWith('#') &&
26
+ !url.startsWith('/'));
27
+ }
8
28
  async function emitAssets(inputs, options) {
9
29
  const emittedStaticAssets = new Map();
10
30
  const emittedHashedAssets = new Map();
@@ -45,7 +65,49 @@ async function emitAssets(inputs, options) {
45
65
  }
46
66
  let ref;
47
67
  let basename = path_1.default.basename(asset.filePath);
68
+ const emittedExternalAssets = new Map();
48
69
  if (asset.hashed) {
70
+ if (basename.endsWith('.css') && options.bundleAssetsFromCss) {
71
+ let updatedCssSource = false;
72
+ const { code } = await (0, lightningcss_1.transform)({
73
+ filename: basename,
74
+ code: asset.content,
75
+ minify: false,
76
+ visitor: {
77
+ Url: url => {
78
+ // Support foo.svg#bar
79
+ // https://www.w3.org/TR/html4/types.html#:~:text=ID%20and%20NAME%20tokens%20must,tokens%20defined%20by%20other%20attributes.
80
+ const [filePath, idRef] = url.url.split('#');
81
+ if (shouldHandleAsset(filePath)) {
82
+ // Read the font file, get the font from the source location on the FS using asset.filePath
83
+ const assetLocation = path_1.default.resolve(path_1.default.dirname(asset.filePath), filePath);
84
+ const assetContent = fs_1.default.readFileSync(assetLocation);
85
+ // Avoid duplicates
86
+ if (!emittedExternalAssets.has(assetLocation)) {
87
+ const fontFileRef = this.emitFile({
88
+ type: 'asset',
89
+ name: path_1.default.basename(filePath),
90
+ source: assetContent,
91
+ });
92
+ const emittedFontFilePath = path_1.default.basename(this.getFileName(fontFileRef));
93
+ emittedExternalAssets.set(assetLocation, emittedFontFilePath);
94
+ // Update the URL in the original CSS file to point to the emitted font file
95
+ url.url = `assets/${idRef ? `${emittedFontFilePath}#${idRef}` : emittedFontFilePath}`;
96
+ }
97
+ else {
98
+ const emittedFontFilePath = emittedExternalAssets.get(assetLocation);
99
+ url.url = `assets/${idRef ? `${emittedFontFilePath}#${idRef}` : emittedFontFilePath}`;
100
+ }
101
+ }
102
+ updatedCssSource = true;
103
+ return url;
104
+ },
105
+ },
106
+ });
107
+ if (updatedCssSource) {
108
+ source = Buffer.from(code);
109
+ }
110
+ }
49
111
  ref = this.emitFile({ type: 'asset', name: basename, source });
50
112
  }
51
113
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"emitAssets.js","sourceRoot":"","sources":["../../src/output/emitAssets.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"emitAssets.js","sourceRoot":"","sources":["../../src/output/emitAssets.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"rollupPluginHTML.d.ts","sourceRoot":"","sources":["../src/rollupPluginHTML.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAKhC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGjD,OAAO,EAEL,uBAAuB,EAEvB,qBAAqB,EACtB,MAAM,8BAA8B,CAAC;AAItC,MAAM,WAAW,gBAAiB,SAAQ,MAAM;IAC9C,GAAG,EAAE;QACH,SAAS,IAAI,SAAS,EAAE,CAAC;QACzB,kBAAkB,CAAC,qBAAqB,EAAE,qBAAqB,GAAG,IAAI,CAAC;QACvE,oBAAoB,IAAI,IAAI,CAAC;QAC7B,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;KACjC,CAAC;CACH;AAED,wBAAgB,gBAAgB,CAAC,aAAa,GAAE,uBAA4B,GAAG,gBAAgB,CAsM9F"}
1
+ {"version":3,"file":"rollupPluginHTML.d.ts","sourceRoot":"","sources":["../src/rollupPluginHTML.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAKhC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGjD,OAAO,EAEL,uBAAuB,EAEvB,qBAAqB,EACtB,MAAM,8BAA8B,CAAC;AAItC,MAAM,WAAW,gBAAiB,SAAQ,MAAM;IAC9C,GAAG,EAAE;QACH,SAAS,IAAI,SAAS,EAAE,CAAC;QACzB,kBAAkB,CAAC,qBAAqB,EAAE,qBAAqB,GAAG,IAAI,CAAC;QACvE,oBAAoB,IAAI,IAAI,CAAC;QAC7B,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;KACjC,CAAC;CACH;AAED,wBAAgB,gBAAgB,CAAC,aAAa,GAAE,uBAA4B,GAAG,gBAAgB,CAuM9F"}
@@ -51,6 +51,7 @@ function rollupPluginHTML(pluginOptions = {}) {
51
51
  if (pluginOptions.strictCSPInlineScripts) {
52
52
  strictCSPInlineScripts = pluginOptions.strictCSPInlineScripts;
53
53
  }
54
+ pluginOptions.bundleAssetsFromCss = !!pluginOptions.bundleAssetsFromCss;
54
55
  if (pluginOptions.input == null) {
55
56
  // we are reading rollup input, so replace whatever was there
56
57
  return Object.assign(Object.assign({}, inputOptions), { input: moduleImports.map(mod => mod.importPath) });
@@ -1 +1 @@
1
- {"version":3,"file":"rollupPluginHTML.js","sourceRoot":"","sources":["../src/rollupPluginHTML.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rollupPluginHTML.js","sourceRoot":"","sources":["../src/rollupPluginHTML.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@web/rollup-plugin-html",
3
- "version": "2.1.1",
3
+ "version": "2.2.0",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -28,7 +28,7 @@
28
28
  "demo:mpa": "rm -rf demo/dist && rollup -c demo/mpa/rollup.config.js --watch & npm run serve-demo",
29
29
  "demo:spa": "rm -rf demo/dist && rollup -c demo/spa/rollup.config.js --watch & npm run serve-demo",
30
30
  "serve-demo": "node ../dev-server/dist/bin.js --watch --root-dir demo/dist --app-index index.html --compatibility none --open",
31
- "test": "mocha test/**/*.test.ts --require ts-node/register",
31
+ "test:node": "mocha test/**/*.test.ts --require ts-node/register --reporter dot",
32
32
  "test:watch": "mocha test/**/*.test.ts --require ts-node/register --watch --watch-files src,test"
33
33
  },
34
34
  "files": [
@@ -47,10 +47,11 @@
47
47
  "@web/parse5-utils": "^2.1.0",
48
48
  "glob": "^10.0.0",
49
49
  "html-minifier-terser": "^7.1.0",
50
+ "lightningcss": "^1.24.0",
50
51
  "parse5": "^6.0.1"
51
52
  },
52
53
  "devDependencies": {
53
54
  "@types/html-minifier-terser": "^7.0.0",
54
- "rollup": "^3.15.0"
55
+ "rollup": "^4.4.0"
55
56
  }
56
57
  }
@@ -41,6 +41,8 @@ export interface RollupPluginHTMLOptions {
41
41
  absolutePathPrefix?: string;
42
42
  /** When set to true, will insert meta tags for CSP and add script-src values for inline scripts by sha256-hashing the contents */
43
43
  strictCSPInlineScripts?: boolean;
44
+ /** Bundle assets reference from CSS via `url` */
45
+ bundleAssetsFromCss?: boolean;
44
46
  }
45
47
 
46
48
  export interface GeneratedBundle {
@@ -1,5 +1,7 @@
1
1
  import { PluginContext } from 'rollup';
2
2
  import path from 'path';
3
+ import { transform } from 'lightningcss';
4
+ import fs from 'fs';
3
5
 
4
6
  import { InputAsset, InputData } from '../input/InputData';
5
7
  import { RollupPluginHTMLOptions, TransformAssetFunction } from '../RollupPluginHTMLOptions';
@@ -9,6 +11,28 @@ export interface EmittedAssets {
9
11
  hashed: Map<string, string>;
10
12
  }
11
13
 
14
+ const allowedFileExtensions = [
15
+ /.*\.svg/,
16
+ /.*\.png/,
17
+ /.*\.jpg/,
18
+ /.*\.jpeg/,
19
+ /.*\.webp/,
20
+ /.*\.gif/,
21
+ /.*\.avif/,
22
+ /.*\.woff2/,
23
+ /.*\.woff/,
24
+ ];
25
+
26
+ function shouldHandleAsset(url: string) {
27
+ return (
28
+ allowedFileExtensions.some(f => f.test(url)) &&
29
+ !url.startsWith('http') &&
30
+ !url.startsWith('data') &&
31
+ !url.startsWith('#') &&
32
+ !url.startsWith('/')
33
+ );
34
+ }
35
+
12
36
  export async function emitAssets(
13
37
  this: PluginContext,
14
38
  inputs: InputData[],
@@ -57,7 +81,55 @@ export async function emitAssets(
57
81
 
58
82
  let ref: string;
59
83
  let basename = path.basename(asset.filePath);
84
+ const emittedExternalAssets = new Map();
60
85
  if (asset.hashed) {
86
+ if (basename.endsWith('.css') && options.bundleAssetsFromCss) {
87
+ let updatedCssSource = false;
88
+ const { code } = await transform({
89
+ filename: basename,
90
+ code: asset.content,
91
+ minify: false,
92
+ visitor: {
93
+ Url: url => {
94
+ // Support foo.svg#bar
95
+ // https://www.w3.org/TR/html4/types.html#:~:text=ID%20and%20NAME%20tokens%20must,tokens%20defined%20by%20other%20attributes.
96
+ const [filePath, idRef] = url.url.split('#');
97
+
98
+ if (shouldHandleAsset(filePath)) {
99
+ // Read the font file, get the font from the source location on the FS using asset.filePath
100
+ const assetLocation = path.resolve(path.dirname(asset.filePath), filePath);
101
+ const assetContent = fs.readFileSync(assetLocation);
102
+
103
+ // Avoid duplicates
104
+ if (!emittedExternalAssets.has(assetLocation)) {
105
+ const fontFileRef = this.emitFile({
106
+ type: 'asset',
107
+ name: path.basename(filePath),
108
+ source: assetContent,
109
+ });
110
+ const emittedFontFilePath = path.basename(this.getFileName(fontFileRef));
111
+ emittedExternalAssets.set(assetLocation, emittedFontFilePath);
112
+ // Update the URL in the original CSS file to point to the emitted font file
113
+ url.url = `assets/${
114
+ idRef ? `${emittedFontFilePath}#${idRef}` : emittedFontFilePath
115
+ }`;
116
+ } else {
117
+ const emittedFontFilePath = emittedExternalAssets.get(assetLocation);
118
+ url.url = `assets/${
119
+ idRef ? `${emittedFontFilePath}#${idRef}` : emittedFontFilePath
120
+ }`;
121
+ }
122
+ }
123
+ updatedCssSource = true;
124
+ return url;
125
+ },
126
+ },
127
+ });
128
+ if (updatedCssSource) {
129
+ source = Buffer.from(code);
130
+ }
131
+ }
132
+
61
133
  ref = this.emitFile({ type: 'asset', name: basename, source });
62
134
  } else {
63
135
  // ensure the output filename is unique
@@ -72,6 +72,7 @@ export function rollupPluginHTML(pluginOptions: RollupPluginHTMLOptions = {}): R
72
72
  if (pluginOptions.strictCSPInlineScripts) {
73
73
  strictCSPInlineScripts = pluginOptions.strictCSPInlineScripts;
74
74
  }
75
+ pluginOptions.bundleAssetsFromCss = !!pluginOptions.bundleAssetsFromCss;
75
76
 
76
77
  if (pluginOptions.input == null) {
77
78
  // we are reading rollup input, so replace whatever was there