@web/rollup-plugin-html 2.2.1 → 2.3.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.
- package/dist/RollupPluginHTMLOptions.d.ts +2 -0
- package/dist/RollupPluginHTMLOptions.d.ts.map +1 -1
- package/dist/assets/utils.d.ts +2 -0
- package/dist/assets/utils.d.ts.map +1 -1
- package/dist/assets/utils.js +10 -1
- package/dist/assets/utils.js.map +1 -1
- package/dist/input/extract/extractAssets.d.ts +1 -0
- package/dist/input/extract/extractAssets.d.ts.map +1 -1
- package/dist/input/extract/extractAssets.js +3 -0
- package/dist/input/extract/extractAssets.js.map +1 -1
- package/dist/input/extract/extractModulesAndAssets.d.ts +1 -0
- package/dist/input/extract/extractModulesAndAssets.d.ts.map +1 -1
- package/dist/input/extract/extractModulesAndAssets.js +9 -2
- package/dist/input/extract/extractModulesAndAssets.js.map +1 -1
- package/dist/input/getInputData.d.ts +1 -0
- package/dist/input/getInputData.d.ts.map +1 -1
- package/dist/input/getInputData.js +5 -2
- package/dist/input/getInputData.js.map +1 -1
- package/dist/output/emitAssets.d.ts.map +1 -1
- package/dist/output/emitAssets.js +10 -8
- package/dist/output/emitAssets.js.map +1 -1
- package/dist/output/getOutputHTML.d.ts.map +1 -1
- package/dist/output/getOutputHTML.js +1 -0
- package/dist/output/getOutputHTML.js.map +1 -1
- package/dist/output/injectedUpdatedAssetPaths.d.ts +1 -0
- package/dist/output/injectedUpdatedAssetPaths.d.ts.map +1 -1
- package/dist/output/injectedUpdatedAssetPaths.js +4 -1
- package/dist/output/injectedUpdatedAssetPaths.js.map +1 -1
- package/package.json +4 -2
- package/src/RollupPluginHTMLOptions.ts +2 -0
- package/src/assets/utils.ts +9 -0
- package/src/input/extract/extractAssets.ts +5 -0
- package/src/input/extract/extractModulesAndAssets.ts +10 -2
- package/src/input/getInputData.ts +7 -1
- package/src/output/emitAssets.ts +10 -8
- package/src/output/getOutputHTML.ts +1 -0
- package/src/output/injectedUpdatedAssetPaths.ts +6 -0
|
@@ -28,6 +28,8 @@ export interface RollupPluginHTMLOptions {
|
|
|
28
28
|
transformHtml?: TransformHtmlFunction | TransformHtmlFunction[];
|
|
29
29
|
/** Whether to extract and bundle assets referenced in HTML. Defaults to true. */
|
|
30
30
|
extractAssets?: boolean;
|
|
31
|
+
/** Whether to ignore assets referenced in HTML and CSS with glob patterns. */
|
|
32
|
+
externalAssets?: string | string[];
|
|
31
33
|
/** Define a full absolute url to your site (e.g. https://domain.com) */
|
|
32
34
|
absoluteBaseUrl?: string;
|
|
33
35
|
/** Whether to set full absolute urls for ['meta[property=og:image]', 'link[rel=canonical]', 'meta[property=og:url]'] or not. Requires a absoluteBaseUrl to be set. Default to true. */
|
|
@@ -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;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
|
+
{"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,8EAA8E;IAC9E,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACnC,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"}
|
package/dist/assets/utils.d.ts
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { Document, Element } from 'parse5';
|
|
2
|
+
import picomatch from 'picomatch';
|
|
2
3
|
export declare function isHashedAsset(node: Element): boolean;
|
|
3
4
|
export declare function resolveAssetFilePath(browserPath: string, htmlDir: string, projectRootDir: string, absolutePathPrefix?: string): string;
|
|
4
5
|
export declare function getSourceAttribute(node: Element): "srcset" | "src" | "href" | "content";
|
|
5
6
|
export declare function getSourcePaths(node: Element): string[];
|
|
6
7
|
export declare function findAssets(document: Document): Element[];
|
|
8
|
+
export declare function createAssetPicomatchMatcher(glob?: string | string[]): picomatch.Matcher;
|
|
7
9
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/assets/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/assets/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAE3C,OAAO,SAAS,MAAM,WAAW,CAAC;AAsElC,wBAAgB,aAAa,CAAC,IAAI,EAAE,OAAO,WAe1C;AAED,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,kBAAkB,CAAC,EAAE,MAAM,UAU5B;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,yCAoB/C;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,YAc3C;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,QAAQ,aAE5C;AAMD,wBAAgB,2BAA2B,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,qBAEnE"}
|
package/dist/assets/utils.js
CHANGED
|
@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.findAssets = exports.getSourcePaths = exports.getSourceAttribute = exports.resolveAssetFilePath = exports.isHashedAsset = void 0;
|
|
6
|
+
exports.createAssetPicomatchMatcher = exports.findAssets = exports.getSourcePaths = exports.getSourceAttribute = exports.resolveAssetFilePath = exports.isHashedAsset = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
|
+
const picomatch_1 = __importDefault(require("picomatch"));
|
|
8
9
|
const parse5_utils_1 = require("@web/parse5-utils");
|
|
9
10
|
const utils_js_1 = require("../utils.js");
|
|
10
11
|
const v8_1 = require("v8");
|
|
@@ -135,4 +136,12 @@ function findAssets(document) {
|
|
|
135
136
|
return (0, parse5_utils_1.findElements)(document, isAsset);
|
|
136
137
|
}
|
|
137
138
|
exports.findAssets = findAssets;
|
|
139
|
+
// picomatch follows glob spec and requires "./" to be removed for the matcher to work
|
|
140
|
+
// it is safe, because with or without it resolves to the same file
|
|
141
|
+
// read more: https://github.com/micromatch/picomatch/issues/77
|
|
142
|
+
const removeLeadingSlash = (str) => (str.startsWith('./') ? str.slice(2) : str);
|
|
143
|
+
function createAssetPicomatchMatcher(glob) {
|
|
144
|
+
return (0, picomatch_1.default)(glob || [], { format: removeLeadingSlash });
|
|
145
|
+
}
|
|
146
|
+
exports.createAssetPicomatchMatcher = createAssetPicomatchMatcher;
|
|
138
147
|
//# sourceMappingURL=utils.js.map
|
package/dist/assets/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/assets/utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/assets/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractAssets.d.ts","sourceRoot":"","sources":["../../../src/input/extract/extractAssets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,QAAQ,CAAC;AAG7C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"extractAssets.d.ts","sourceRoot":"","sources":["../../../src/input/extract/extractAssets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,QAAQ,CAAC;AAG7C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAS7C,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,QAAQ,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACnC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,UAAU,EAAE,CAoCvE"}
|
|
@@ -11,9 +11,12 @@ const utils_js_1 = require("../../assets/utils.js");
|
|
|
11
11
|
function extractAssets(params) {
|
|
12
12
|
const assetNodes = (0, utils_js_1.findAssets)(params.document);
|
|
13
13
|
const allAssets = [];
|
|
14
|
+
const isExternal = (0, utils_js_1.createAssetPicomatchMatcher)(params.externalAssets);
|
|
14
15
|
for (const node of assetNodes) {
|
|
15
16
|
const sourcePaths = (0, utils_js_1.getSourcePaths)(node);
|
|
16
17
|
for (const sourcePath of sourcePaths) {
|
|
18
|
+
if (isExternal(sourcePath))
|
|
19
|
+
continue;
|
|
17
20
|
const filePath = (0, utils_js_1.resolveAssetFilePath)(sourcePath, params.htmlDir, params.rootDir, params.absolutePathPrefix);
|
|
18
21
|
const hashed = (0, utils_js_1.isHashedAsset)(node);
|
|
19
22
|
const alreadyHandled = allAssets.find(a => a.filePath === filePath && a.hashed === hashed);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractAssets.js","sourceRoot":"","sources":["../../../src/input/extract/extractAssets.ts"],"names":[],"mappings":";;;;;;AAAA,mCAA6C;AAC7C,4CAAoB;AACpB,gDAAwB;AAExB,
|
|
1
|
+
{"version":3,"file":"extractAssets.js","sourceRoot":"","sources":["../../../src/input/extract/extractAssets.ts"],"names":[],"mappings":";;;;;;AAAA,mCAA6C;AAC7C,4CAAoB;AACpB,gDAAwB;AAExB,oDAM+B;AAW/B,SAAgB,aAAa,CAAC,MAA2B;IACvD,MAAM,UAAU,GAAG,IAAA,qBAAU,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAiB,EAAE,CAAC;IACnC,MAAM,UAAU,GAAG,IAAA,sCAA2B,EAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAEtE,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;QAC7B,MAAM,WAAW,GAAG,IAAA,yBAAc,EAAC,IAAI,CAAC,CAAC;QACzC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACpC,IAAI,UAAU,CAAC,UAAU,CAAC;gBAAE,SAAS;YAErC,MAAM,QAAQ,GAAG,IAAA,+BAAoB,EACnC,UAAU,EACV,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,kBAAkB,CAC1B,CAAC;YACF,MAAM,MAAM,GAAG,IAAA,wBAAa,EAAC,IAAI,CAAC,CAAC;YACnC,MAAM,cAAc,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;YAC3F,IAAI,CAAC,cAAc,EAAE;gBACnB,IAAI;oBACF,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;iBACzB;gBAAC,OAAO,KAAK,EAAE;oBACd,MAAM,KAAK,GAAG,IAAA,kBAAS,EAAC,IAAI,CAAC,CAAC;oBAC9B,MAAM,QAAQ,GAAG,cAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;oBACnE,MAAM,IAAI,KAAK,CACb,kBAAkB,QAAQ,8BAA8B,QAAQ,iBAAiB,KAAK,GAAG,CAC1F,CAAC;iBACH;gBAED,MAAM,OAAO,GAAG,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;gBAC1C,SAAS,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;aAC/C;SACF;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AApCD,sCAoCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractModulesAndAssets.d.ts","sourceRoot":"","sources":["../../../src/input/extract/extractModulesAndAssets.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,OAAO,CAAC;IACvB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,aAAa;;;;;
|
|
1
|
+
{"version":3,"file":"extractModulesAndAssets.d.ts","sourceRoot":"","sources":["../../../src/input/extract/extractModulesAndAssets.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACnC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,aAAa;;;;;EA2B5D"}
|
|
@@ -9,7 +9,7 @@ const parse5_1 = require("parse5");
|
|
|
9
9
|
const extractModules_js_1 = require("./extractModules.js");
|
|
10
10
|
const extractAssets_js_1 = require("./extractAssets.js");
|
|
11
11
|
function extractModulesAndAssets(params) {
|
|
12
|
-
const { html, htmlFilePath, rootDir, absolutePathPrefix } = params;
|
|
12
|
+
const { html, htmlFilePath, rootDir, externalAssets, absolutePathPrefix } = params;
|
|
13
13
|
const htmlDir = path_1.default.dirname(htmlFilePath);
|
|
14
14
|
const document = (0, parse5_1.parse)(html);
|
|
15
15
|
// extract functions mutate the AST
|
|
@@ -20,7 +20,14 @@ function extractModulesAndAssets(params) {
|
|
|
20
20
|
absolutePathPrefix,
|
|
21
21
|
});
|
|
22
22
|
const assets = params.extractAssets
|
|
23
|
-
? (0, extractAssets_js_1.extractAssets)({
|
|
23
|
+
? (0, extractAssets_js_1.extractAssets)({
|
|
24
|
+
document,
|
|
25
|
+
htmlDir,
|
|
26
|
+
htmlFilePath,
|
|
27
|
+
rootDir,
|
|
28
|
+
externalAssets,
|
|
29
|
+
absolutePathPrefix,
|
|
30
|
+
})
|
|
24
31
|
: [];
|
|
25
32
|
// turn mutated AST back to a string
|
|
26
33
|
const updatedHtmlString = (0, parse5_1.serialize)(document);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractModulesAndAssets.js","sourceRoot":"","sources":["../../../src/input/extract/extractModulesAndAssets.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,mCAA0C;AAC1C,2DAAqD;AACrD,yDAAmD;
|
|
1
|
+
{"version":3,"file":"extractModulesAndAssets.js","sourceRoot":"","sources":["../../../src/input/extract/extractModulesAndAssets.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,mCAA0C;AAC1C,2DAAqD;AACrD,yDAAmD;AAWnD,SAAgB,uBAAuB,CAAC,MAAqB;IAC3D,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAAC;IACnF,MAAM,OAAO,GAAG,cAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC3C,MAAM,QAAQ,GAAG,IAAA,cAAK,EAAC,IAAI,CAAC,CAAC;IAE7B,mCAAmC;IACnC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,IAAA,kCAAc,EAAC;QACtD,QAAQ;QACR,OAAO;QACP,OAAO;QACP,kBAAkB;KACnB,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,CAAC,aAAa;QACjC,CAAC,CAAC,IAAA,gCAAa,EAAC;YACZ,QAAQ;YACR,OAAO;YACP,YAAY;YACZ,OAAO;YACP,cAAc;YACd,kBAAkB;SACnB,CAAC;QACJ,CAAC,CAAC,EAAE,CAAC;IAEP,oCAAoC;IACpC,MAAM,iBAAiB,GAAG,IAAA,kBAAS,EAAC,QAAQ,CAAC,CAAC;IAE9C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,CAAC;AACzF,CAAC;AA3BD,0DA2BC"}
|
|
@@ -7,6 +7,7 @@ export interface CreateInputDataParams {
|
|
|
7
7
|
rootDir: string;
|
|
8
8
|
filePath?: string;
|
|
9
9
|
extractAssets: boolean;
|
|
10
|
+
externalAssets?: string | string[];
|
|
10
11
|
absolutePathPrefix?: string;
|
|
11
12
|
}
|
|
12
13
|
export declare function getInputData(pluginOptions: RollupPluginHTMLOptions, rollupInput?: InputOption): InputData[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getInputData.d.ts","sourceRoot":"","sources":["../../src/input/getInputData.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAkBrC,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;IACvB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;
|
|
1
|
+
{"version":3,"file":"getInputData.d.ts","sourceRoot":"","sources":["../../src/input/getInputData.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAkBrC,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACnC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAyBD,wBAAgB,YAAY,CAC1B,aAAa,EAAE,uBAAuB,EACtC,WAAW,CAAC,EAAE,WAAW,GACxB,SAAS,EAAE,CA8Db"}
|
|
@@ -23,13 +23,14 @@ function getName(filePath, rootDir, flattenOutput = true) {
|
|
|
23
23
|
return path_1.default.relative(rootDir, filePath);
|
|
24
24
|
}
|
|
25
25
|
function createInputData(params) {
|
|
26
|
-
const { name, html, rootDir, filePath, extractAssets, absolutePathPrefix } = params;
|
|
26
|
+
const { name, html, rootDir, filePath, extractAssets, externalAssets, absolutePathPrefix } = params;
|
|
27
27
|
const htmlFilePath = filePath ? filePath : path_1.default.resolve(rootDir, name);
|
|
28
28
|
const result = (0, extractModulesAndAssets_js_1.extractModulesAndAssets)({
|
|
29
29
|
html,
|
|
30
30
|
htmlFilePath,
|
|
31
31
|
rootDir,
|
|
32
32
|
extractAssets,
|
|
33
|
+
externalAssets,
|
|
33
34
|
absolutePathPrefix,
|
|
34
35
|
});
|
|
35
36
|
return {
|
|
@@ -43,7 +44,7 @@ function createInputData(params) {
|
|
|
43
44
|
}
|
|
44
45
|
function getInputData(pluginOptions, rollupInput) {
|
|
45
46
|
var _a, _b;
|
|
46
|
-
const { rootDir = process.cwd(), flattenOutput, extractAssets = true, absolutePathPrefix, exclude: ignore, } = pluginOptions;
|
|
47
|
+
const { rootDir = process.cwd(), flattenOutput, extractAssets = true, externalAssets, absolutePathPrefix, exclude: ignore, } = pluginOptions;
|
|
47
48
|
const allInputs = (0, normalizeInputOptions_js_1.normalizeInputOptions)(pluginOptions, rollupInput);
|
|
48
49
|
const result = [];
|
|
49
50
|
for (const input of allInputs) {
|
|
@@ -54,6 +55,7 @@ function getInputData(pluginOptions, rollupInput) {
|
|
|
54
55
|
html: input.html,
|
|
55
56
|
rootDir,
|
|
56
57
|
extractAssets,
|
|
58
|
+
externalAssets,
|
|
57
59
|
absolutePathPrefix,
|
|
58
60
|
});
|
|
59
61
|
result.push(data);
|
|
@@ -72,6 +74,7 @@ function getInputData(pluginOptions, rollupInput) {
|
|
|
72
74
|
rootDir,
|
|
73
75
|
filePath,
|
|
74
76
|
extractAssets,
|
|
77
|
+
externalAssets,
|
|
75
78
|
absolutePathPrefix,
|
|
76
79
|
});
|
|
77
80
|
result.push(data);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getInputData.js","sourceRoot":"","sources":["../../src/input/getInputData.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,+BAA+D;AAE/D,0CAA0C;AAG1C,yEAAmE;AACnE,qFAA+E;AAG/E,SAAS,WAAW,CAAC,QAAgB,EAAE,IAAmC;IACxE,MAAM,KAAK,GAAG,IAAA,eAAQ,EAAC,QAAQ,kCAAO,IAAI,KAAE,QAAQ,EAAE,IAAI,IAAG,CAAC;IAC9D,OAAO,CACL,KAAK;QACH,yBAAyB;SACxB,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,YAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC,CAC7D,CAAC;AACJ,CAAC;AAED,SAAS,OAAO,CAAC,QAAgB,EAAE,OAAe,EAAE,aAAa,GAAG,IAAI;IACtE,IAAI,aAAa,EAAE;QACjB,OAAO,cAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;KAChC;IACD,OAAO,cAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC1C,CAAC;
|
|
1
|
+
{"version":3,"file":"getInputData.js","sourceRoot":"","sources":["../../src/input/getInputData.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;AAKvC,OAAO,EAAc,SAAS,EAAE,MAAM,oBAAoB,CAAC;
|
|
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;AAE3D,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;;;GAkHjC"}
|
|
@@ -7,6 +7,7 @@ exports.emitAssets = void 0;
|
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const lightningcss_1 = require("lightningcss");
|
|
9
9
|
const fs_1 = __importDefault(require("fs"));
|
|
10
|
+
const utils_js_1 = require("../assets/utils.js");
|
|
10
11
|
const allowedFileExtensions = [
|
|
11
12
|
/.*\.svg/,
|
|
12
13
|
/.*\.png/,
|
|
@@ -65,6 +66,7 @@ async function emitAssets(inputs, options) {
|
|
|
65
66
|
}
|
|
66
67
|
let ref;
|
|
67
68
|
let basename = path_1.default.basename(asset.filePath);
|
|
69
|
+
const isExternal = (0, utils_js_1.createAssetPicomatchMatcher)(options.externalAssets);
|
|
68
70
|
const emittedExternalAssets = new Map();
|
|
69
71
|
if (asset.hashed) {
|
|
70
72
|
if (basename.endsWith('.css') && options.bundleAssetsFromCss) {
|
|
@@ -78,8 +80,8 @@ async function emitAssets(inputs, options) {
|
|
|
78
80
|
// Support foo.svg#bar
|
|
79
81
|
// https://www.w3.org/TR/html4/types.html#:~:text=ID%20and%20NAME%20tokens%20must,tokens%20defined%20by%20other%20attributes.
|
|
80
82
|
const [filePath, idRef] = url.url.split('#');
|
|
81
|
-
if (shouldHandleAsset(filePath)) {
|
|
82
|
-
// Read the
|
|
83
|
+
if (shouldHandleAsset(filePath) && !isExternal(filePath)) {
|
|
84
|
+
// Read the asset file, get the asset from the source location on the FS using asset.filePath
|
|
83
85
|
const assetLocation = path_1.default.resolve(path_1.default.dirname(asset.filePath), filePath);
|
|
84
86
|
const assetContent = fs_1.default.readFileSync(assetLocation);
|
|
85
87
|
// Avoid duplicates
|
|
@@ -89,14 +91,14 @@ async function emitAssets(inputs, options) {
|
|
|
89
91
|
name: path_1.default.join('assets', path_1.default.basename(filePath)),
|
|
90
92
|
source: assetContent,
|
|
91
93
|
});
|
|
92
|
-
const
|
|
93
|
-
emittedExternalAssets.set(assetLocation,
|
|
94
|
-
// Update the URL in the original CSS file to point to the emitted
|
|
95
|
-
url.url = `assets/${idRef ? `${
|
|
94
|
+
const emittedAssetFilePath = path_1.default.basename(this.getFileName(fontFileRef));
|
|
95
|
+
emittedExternalAssets.set(assetLocation, emittedAssetFilePath);
|
|
96
|
+
// Update the URL in the original CSS file to point to the emitted asset file
|
|
97
|
+
url.url = `assets/${idRef ? `${emittedAssetFilePath}#${idRef}` : emittedAssetFilePath}`;
|
|
96
98
|
}
|
|
97
99
|
else {
|
|
98
|
-
const
|
|
99
|
-
url.url = `assets/${idRef ? `${
|
|
100
|
+
const emittedAssetFilePath = emittedExternalAssets.get(assetLocation);
|
|
101
|
+
url.url = `assets/${idRef ? `${emittedAssetFilePath}#${idRef}` : emittedAssetFilePath}`;
|
|
100
102
|
}
|
|
101
103
|
}
|
|
102
104
|
updatedCssSource = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emitAssets.js","sourceRoot":"","sources":["../../src/output/emitAssets.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AACxB,+CAAyC;AACzC,4CAAoB;
|
|
1
|
+
{"version":3,"file":"emitAssets.js","sourceRoot":"","sources":["../../src/output/emitAssets.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getOutputHTML.d.ts","sourceRoot":"","sources":["../../src/output/getOutputHTML.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,uBAAuB,EACvB,qBAAqB,EACtB,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAKhD,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,aAAa,CAAC;IAC7B,aAAa,EAAE,uBAAuB,CAAC;IACvC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACpD,wBAAwB,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACnD,qBAAqB,EAAE,OAAO,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,OAAO,CAAC;CACjC;AAED,wBAAsB,aAAa,CAAC,MAAM,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"getOutputHTML.d.ts","sourceRoot":"","sources":["../../src/output/getOutputHTML.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,uBAAuB,EACvB,qBAAqB,EACtB,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAKhD,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,aAAa,CAAC;IAC7B,aAAa,EAAE,uBAAuB,CAAC;IACvC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACpD,wBAAwB,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACnD,qBAAqB,EAAE,OAAO,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,OAAO,CAAC;CACjC;AAED,wBAAsB,aAAa,CAAC,MAAM,EAAE,mBAAmB,mBAsF9D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getOutputHTML.js","sourceRoot":"","sources":["../../src/output/getOutputHTML.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getOutputHTML.js","sourceRoot":"","sources":["../../src/output/getOutputHTML.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"injectedUpdatedAssetPaths.d.ts","sourceRoot":"","sources":["../../src/output/injectedUpdatedAssetPaths.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"injectedUpdatedAssetPaths.d.ts","sourceRoot":"","sources":["../../src/output/injectedUpdatedAssetPaths.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAWlC,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,aAAa,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAaD,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,2BAA2B,QAuD1E"}
|
|
@@ -20,11 +20,14 @@ function getSrcSetUrlWidthPairs(srcset) {
|
|
|
20
20
|
return urls;
|
|
21
21
|
}
|
|
22
22
|
function injectedUpdatedAssetPaths(args) {
|
|
23
|
-
const { document, input, outputDir, rootDir, emittedAssets, publicPath = './', absolutePathPrefix, } = args;
|
|
23
|
+
const { document, input, outputDir, rootDir, emittedAssets, externalAssets, publicPath = './', absolutePathPrefix, } = args;
|
|
24
24
|
const assetNodes = (0, utils_js_1.findAssets)(document);
|
|
25
|
+
const isExternal = (0, utils_js_1.createAssetPicomatchMatcher)(externalAssets);
|
|
25
26
|
for (const node of assetNodes) {
|
|
26
27
|
const sourcePaths = (0, utils_js_1.getSourcePaths)(node);
|
|
27
28
|
for (const sourcePath of sourcePaths) {
|
|
29
|
+
if (isExternal(sourcePath))
|
|
30
|
+
continue;
|
|
28
31
|
const htmlFilePath = input.filePath ? input.filePath : path_1.default.join(rootDir, input.name);
|
|
29
32
|
const htmlDir = path_1.default.dirname(htmlFilePath);
|
|
30
33
|
const filePath = (0, utils_js_1.resolveAssetFilePath)(sourcePath, htmlDir, rootDir, absolutePathPrefix);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"injectedUpdatedAssetPaths.js","sourceRoot":"","sources":["../../src/output/injectedUpdatedAssetPaths.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA+D;AAE/D,gDAAwB;AAExB,
|
|
1
|
+
{"version":3,"file":"injectedUpdatedAssetPaths.js","sourceRoot":"","sources":["../../src/output/injectedUpdatedAssetPaths.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA+D;AAE/D,gDAAwB;AAExB,iDAO4B;AAE5B,0CAA0C;AAE1C,yCAA2C;AAa3C,SAAS,sBAAsB,CAAC,MAAc;IAC5C,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,EAAE,CAAC;KACX;IACD,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACxE,MAAM,IAAI,GAAG,WAAW;SACrB,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;SACtB,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC5D,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,yBAAyB,CAAC,IAAiC;IACzE,MAAM,EACJ,QAAQ,EACR,KAAK,EACL,SAAS,EACT,OAAO,EACP,aAAa,EACb,cAAc,EACd,UAAU,GAAG,IAAI,EACjB,kBAAkB,GACnB,GAAG,IAAI,CAAC;IACT,MAAM,UAAU,GAAG,IAAA,qBAAU,EAAC,QAAQ,CAAC,CAAC;IACxC,MAAM,UAAU,GAAG,IAAA,sCAA2B,EAAC,cAAc,CAAC,CAAC;IAE/D,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;QAC7B,MAAM,WAAW,GAAG,IAAA,yBAAc,EAAC,IAAI,CAAC,CAAC;QACzC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACpC,IAAI,UAAU,CAAC,UAAU,CAAC;gBAAE,SAAS;YAErC,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YACtF,MAAM,OAAO,GAAG,cAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YAC3C,MAAM,QAAQ,GAAG,IAAA,+BAAoB,EAAC,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC;YACxF,MAAM,UAAU,GAAG,IAAA,wBAAa,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC;YACrF,MAAM,kBAAkB,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAEpD,IAAI,CAAC,kBAAkB,EAAE;gBACvB,MAAM,IAAA,sBAAW,EACf,iDAAiD,KAAK,CAAC,IAAI,oBAAoB,QAAQ,4BAA4B,CACpH,CAAC;aACH;YACD,MAAM,kBAAkB,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC5D,MAAM,aAAa,GAAG,cAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;YACvD,MAAM,kBAAkB,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;YACpE,MAAM,sBAAsB,GAAG,cAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;YAEhF,MAAM,WAAW,GAAG,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,IAAA,wBAAa,EAAC,sBAAsB,CAAC,CAAC,CAAC;YACvF,MAAM,GAAG,GAAG,IAAA,6BAAkB,EAAC,IAAI,CAAC,CAAC;YAErC,IAAI,iBAAiB,GAAG,WAAW,CAAC;YACpC,IAAI,GAAG,KAAK,QAAQ,EAAE;gBACpB,MAAM,MAAM,GAAG,IAAA,2BAAY,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBACvC,IAAI,MAAM,EAAE;oBACV,MAAM,aAAa,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;oBACrD,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;wBACxC,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE;4BAClC,YAAY,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC;yBAC/B;qBACF;oBACD,iBAAiB,GAAG,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAC1F;aACF;YAED,IAAA,2BAAY,EAAC,IAAI,EAAE,GAAG,EAAE,iBAAiB,CAAC,CAAC;SAC5C;KACF;AACH,CAAC;AAvDD,8DAuDC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@web/rollup-plugin-html",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.3.0",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -48,10 +48,12 @@
|
|
|
48
48
|
"glob": "^10.0.0",
|
|
49
49
|
"html-minifier-terser": "^7.1.0",
|
|
50
50
|
"lightningcss": "^1.24.0",
|
|
51
|
-
"parse5": "^6.0.1"
|
|
51
|
+
"parse5": "^6.0.1",
|
|
52
|
+
"picomatch": "^2.2.2"
|
|
52
53
|
},
|
|
53
54
|
"devDependencies": {
|
|
54
55
|
"@types/html-minifier-terser": "^7.0.0",
|
|
56
|
+
"@types/picomatch": "^2.2.1",
|
|
55
57
|
"rollup": "^4.4.0"
|
|
56
58
|
}
|
|
57
59
|
}
|
|
@@ -29,6 +29,8 @@ export interface RollupPluginHTMLOptions {
|
|
|
29
29
|
transformHtml?: TransformHtmlFunction | TransformHtmlFunction[];
|
|
30
30
|
/** Whether to extract and bundle assets referenced in HTML. Defaults to true. */
|
|
31
31
|
extractAssets?: boolean;
|
|
32
|
+
/** Whether to ignore assets referenced in HTML and CSS with glob patterns. */
|
|
33
|
+
externalAssets?: string | string[];
|
|
32
34
|
/** Define a full absolute url to your site (e.g. https://domain.com) */
|
|
33
35
|
absoluteBaseUrl?: string;
|
|
34
36
|
/** Whether to set full absolute urls for ['meta[property=og:image]', 'link[rel=canonical]', 'meta[property=og:url]'] or not. Requires a absoluteBaseUrl to be set. Default to true. */
|
package/src/assets/utils.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Document, Element } from 'parse5';
|
|
2
2
|
import path from 'path';
|
|
3
|
+
import picomatch from 'picomatch';
|
|
3
4
|
import { findElements, getTagName, getAttribute } from '@web/parse5-utils';
|
|
4
5
|
import { createError } from '../utils.js';
|
|
5
6
|
import { serialize } from 'v8';
|
|
@@ -143,3 +144,11 @@ export function getSourcePaths(node: Element) {
|
|
|
143
144
|
export function findAssets(document: Document) {
|
|
144
145
|
return findElements(document, isAsset);
|
|
145
146
|
}
|
|
147
|
+
|
|
148
|
+
// picomatch follows glob spec and requires "./" to be removed for the matcher to work
|
|
149
|
+
// it is safe, because with or without it resolves to the same file
|
|
150
|
+
// read more: https://github.com/micromatch/picomatch/issues/77
|
|
151
|
+
const removeLeadingSlash = (str: string) => (str.startsWith('./') ? str.slice(2) : str);
|
|
152
|
+
export function createAssetPicomatchMatcher(glob?: string | string[]) {
|
|
153
|
+
return picomatch(glob || [], { format: removeLeadingSlash });
|
|
154
|
+
}
|
|
@@ -7,6 +7,7 @@ import {
|
|
|
7
7
|
getSourcePaths,
|
|
8
8
|
isHashedAsset,
|
|
9
9
|
resolveAssetFilePath,
|
|
10
|
+
createAssetPicomatchMatcher,
|
|
10
11
|
} from '../../assets/utils.js';
|
|
11
12
|
|
|
12
13
|
export interface ExtractAssetsParams {
|
|
@@ -14,16 +15,20 @@ export interface ExtractAssetsParams {
|
|
|
14
15
|
htmlFilePath: string;
|
|
15
16
|
htmlDir: string;
|
|
16
17
|
rootDir: string;
|
|
18
|
+
externalAssets?: string | string[];
|
|
17
19
|
absolutePathPrefix?: string;
|
|
18
20
|
}
|
|
19
21
|
|
|
20
22
|
export function extractAssets(params: ExtractAssetsParams): InputAsset[] {
|
|
21
23
|
const assetNodes = findAssets(params.document);
|
|
22
24
|
const allAssets: InputAsset[] = [];
|
|
25
|
+
const isExternal = createAssetPicomatchMatcher(params.externalAssets);
|
|
23
26
|
|
|
24
27
|
for (const node of assetNodes) {
|
|
25
28
|
const sourcePaths = getSourcePaths(node);
|
|
26
29
|
for (const sourcePath of sourcePaths) {
|
|
30
|
+
if (isExternal(sourcePath)) continue;
|
|
31
|
+
|
|
27
32
|
const filePath = resolveAssetFilePath(
|
|
28
33
|
sourcePath,
|
|
29
34
|
params.htmlDir,
|
|
@@ -8,11 +8,12 @@ export interface ExtractParams {
|
|
|
8
8
|
htmlFilePath: string;
|
|
9
9
|
rootDir: string;
|
|
10
10
|
extractAssets: boolean;
|
|
11
|
+
externalAssets?: string | string[];
|
|
11
12
|
absolutePathPrefix?: string;
|
|
12
13
|
}
|
|
13
14
|
|
|
14
15
|
export function extractModulesAndAssets(params: ExtractParams) {
|
|
15
|
-
const { html, htmlFilePath, rootDir, absolutePathPrefix } = params;
|
|
16
|
+
const { html, htmlFilePath, rootDir, externalAssets, absolutePathPrefix } = params;
|
|
16
17
|
const htmlDir = path.dirname(htmlFilePath);
|
|
17
18
|
const document = parse(html);
|
|
18
19
|
|
|
@@ -24,7 +25,14 @@ export function extractModulesAndAssets(params: ExtractParams) {
|
|
|
24
25
|
absolutePathPrefix,
|
|
25
26
|
});
|
|
26
27
|
const assets = params.extractAssets
|
|
27
|
-
? extractAssets({
|
|
28
|
+
? extractAssets({
|
|
29
|
+
document,
|
|
30
|
+
htmlDir,
|
|
31
|
+
htmlFilePath,
|
|
32
|
+
rootDir,
|
|
33
|
+
externalAssets,
|
|
34
|
+
absolutePathPrefix,
|
|
35
|
+
})
|
|
28
36
|
: [];
|
|
29
37
|
|
|
30
38
|
// turn mutated AST back to a string
|
|
@@ -31,17 +31,20 @@ export interface CreateInputDataParams {
|
|
|
31
31
|
rootDir: string;
|
|
32
32
|
filePath?: string;
|
|
33
33
|
extractAssets: boolean;
|
|
34
|
+
externalAssets?: string | string[];
|
|
34
35
|
absolutePathPrefix?: string;
|
|
35
36
|
}
|
|
36
37
|
|
|
37
38
|
function createInputData(params: CreateInputDataParams): InputData {
|
|
38
|
-
const { name, html, rootDir, filePath, extractAssets, absolutePathPrefix } =
|
|
39
|
+
const { name, html, rootDir, filePath, extractAssets, externalAssets, absolutePathPrefix } =
|
|
40
|
+
params;
|
|
39
41
|
const htmlFilePath = filePath ? filePath : path.resolve(rootDir, name);
|
|
40
42
|
const result = extractModulesAndAssets({
|
|
41
43
|
html,
|
|
42
44
|
htmlFilePath,
|
|
43
45
|
rootDir,
|
|
44
46
|
extractAssets,
|
|
47
|
+
externalAssets,
|
|
45
48
|
absolutePathPrefix,
|
|
46
49
|
});
|
|
47
50
|
|
|
@@ -63,6 +66,7 @@ export function getInputData(
|
|
|
63
66
|
rootDir = process.cwd(),
|
|
64
67
|
flattenOutput,
|
|
65
68
|
extractAssets = true,
|
|
69
|
+
externalAssets,
|
|
66
70
|
absolutePathPrefix,
|
|
67
71
|
exclude: ignore,
|
|
68
72
|
} = pluginOptions;
|
|
@@ -77,6 +81,7 @@ export function getInputData(
|
|
|
77
81
|
html: input.html,
|
|
78
82
|
rootDir,
|
|
79
83
|
extractAssets,
|
|
84
|
+
externalAssets,
|
|
80
85
|
absolutePathPrefix,
|
|
81
86
|
});
|
|
82
87
|
result.push(data);
|
|
@@ -97,6 +102,7 @@ export function getInputData(
|
|
|
97
102
|
rootDir,
|
|
98
103
|
filePath,
|
|
99
104
|
extractAssets,
|
|
105
|
+
externalAssets,
|
|
100
106
|
absolutePathPrefix,
|
|
101
107
|
});
|
|
102
108
|
result.push(data);
|
package/src/output/emitAssets.ts
CHANGED
|
@@ -4,6 +4,7 @@ import { transform } from 'lightningcss';
|
|
|
4
4
|
import fs from 'fs';
|
|
5
5
|
|
|
6
6
|
import { InputAsset, InputData } from '../input/InputData';
|
|
7
|
+
import { createAssetPicomatchMatcher } from '../assets/utils.js';
|
|
7
8
|
import { RollupPluginHTMLOptions, TransformAssetFunction } from '../RollupPluginHTMLOptions';
|
|
8
9
|
|
|
9
10
|
export interface EmittedAssets {
|
|
@@ -81,6 +82,7 @@ export async function emitAssets(
|
|
|
81
82
|
|
|
82
83
|
let ref: string;
|
|
83
84
|
let basename = path.basename(asset.filePath);
|
|
85
|
+
const isExternal = createAssetPicomatchMatcher(options.externalAssets);
|
|
84
86
|
const emittedExternalAssets = new Map();
|
|
85
87
|
if (asset.hashed) {
|
|
86
88
|
if (basename.endsWith('.css') && options.bundleAssetsFromCss) {
|
|
@@ -95,8 +97,8 @@ export async function emitAssets(
|
|
|
95
97
|
// https://www.w3.org/TR/html4/types.html#:~:text=ID%20and%20NAME%20tokens%20must,tokens%20defined%20by%20other%20attributes.
|
|
96
98
|
const [filePath, idRef] = url.url.split('#');
|
|
97
99
|
|
|
98
|
-
if (shouldHandleAsset(filePath)) {
|
|
99
|
-
// Read the
|
|
100
|
+
if (shouldHandleAsset(filePath) && !isExternal(filePath)) {
|
|
101
|
+
// Read the asset file, get the asset from the source location on the FS using asset.filePath
|
|
100
102
|
const assetLocation = path.resolve(path.dirname(asset.filePath), filePath);
|
|
101
103
|
const assetContent = fs.readFileSync(assetLocation);
|
|
102
104
|
|
|
@@ -107,16 +109,16 @@ export async function emitAssets(
|
|
|
107
109
|
name: path.join('assets', path.basename(filePath)),
|
|
108
110
|
source: assetContent,
|
|
109
111
|
});
|
|
110
|
-
const
|
|
111
|
-
emittedExternalAssets.set(assetLocation,
|
|
112
|
-
// Update the URL in the original CSS file to point to the emitted
|
|
112
|
+
const emittedAssetFilePath = path.basename(this.getFileName(fontFileRef));
|
|
113
|
+
emittedExternalAssets.set(assetLocation, emittedAssetFilePath);
|
|
114
|
+
// Update the URL in the original CSS file to point to the emitted asset file
|
|
113
115
|
url.url = `assets/${
|
|
114
|
-
idRef ? `${
|
|
116
|
+
idRef ? `${emittedAssetFilePath}#${idRef}` : emittedAssetFilePath
|
|
115
117
|
}`;
|
|
116
118
|
} else {
|
|
117
|
-
const
|
|
119
|
+
const emittedAssetFilePath = emittedExternalAssets.get(assetLocation);
|
|
118
120
|
url.url = `assets/${
|
|
119
|
-
idRef ? `${
|
|
121
|
+
idRef ? `${emittedAssetFilePath}#${idRef}` : emittedAssetFilePath
|
|
120
122
|
}`;
|
|
121
123
|
}
|
|
122
124
|
}
|
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
getSourcePaths,
|
|
9
9
|
isHashedAsset,
|
|
10
10
|
resolveAssetFilePath,
|
|
11
|
+
createAssetPicomatchMatcher,
|
|
11
12
|
} from '../assets/utils.js';
|
|
12
13
|
import { InputData } from '../input/InputData.js';
|
|
13
14
|
import { createError } from '../utils.js';
|
|
@@ -20,6 +21,7 @@ export interface InjectUpdatedAssetPathsArgs {
|
|
|
20
21
|
outputDir: string;
|
|
21
22
|
rootDir: string;
|
|
22
23
|
emittedAssets: EmittedAssets;
|
|
24
|
+
externalAssets?: string | string[];
|
|
23
25
|
publicPath?: string;
|
|
24
26
|
absolutePathPrefix?: string;
|
|
25
27
|
}
|
|
@@ -42,14 +44,18 @@ export function injectedUpdatedAssetPaths(args: InjectUpdatedAssetPathsArgs) {
|
|
|
42
44
|
outputDir,
|
|
43
45
|
rootDir,
|
|
44
46
|
emittedAssets,
|
|
47
|
+
externalAssets,
|
|
45
48
|
publicPath = './',
|
|
46
49
|
absolutePathPrefix,
|
|
47
50
|
} = args;
|
|
48
51
|
const assetNodes = findAssets(document);
|
|
52
|
+
const isExternal = createAssetPicomatchMatcher(externalAssets);
|
|
49
53
|
|
|
50
54
|
for (const node of assetNodes) {
|
|
51
55
|
const sourcePaths = getSourcePaths(node);
|
|
52
56
|
for (const sourcePath of sourcePaths) {
|
|
57
|
+
if (isExternal(sourcePath)) continue;
|
|
58
|
+
|
|
53
59
|
const htmlFilePath = input.filePath ? input.filePath : path.join(rootDir, input.name);
|
|
54
60
|
const htmlDir = path.dirname(htmlFilePath);
|
|
55
61
|
const filePath = resolveAssetFilePath(sourcePath, htmlDir, rootDir, absolutePathPrefix);
|