@web/rollup-plugin-html 1.10.1 → 1.11.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.
@@ -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;AAmE3C,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"}
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;AAuE3C,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"}
@@ -29,28 +29,33 @@ function extractFirstUrlOfSrcSet(node) {
29
29
  return urls[0];
30
30
  }
31
31
  function isAsset(node) {
32
- var _a, _b, _c, _d, _e, _f;
32
+ var _a, _b, _c, _d, _e, _f, _g;
33
33
  let path = '';
34
34
  switch (parse5_utils_1.getTagName(node)) {
35
35
  case 'img':
36
36
  path = (_a = parse5_utils_1.getAttribute(node, 'src')) !== null && _a !== void 0 ? _a : '';
37
37
  break;
38
38
  case 'source':
39
- path = (_b = extractFirstUrlOfSrcSet(node)) !== null && _b !== void 0 ? _b : '';
39
+ if (parse5_utils_1.getAttribute(node, 'src')) {
40
+ path = (_b = parse5_utils_1.getAttribute(node, 'src')) !== null && _b !== void 0 ? _b : '';
41
+ }
42
+ else {
43
+ path = (_c = extractFirstUrlOfSrcSet(node)) !== null && _c !== void 0 ? _c : '';
44
+ }
40
45
  break;
41
46
  case 'link':
42
- if (linkRels.includes((_c = parse5_utils_1.getAttribute(node, 'rel')) !== null && _c !== void 0 ? _c : '')) {
43
- path = (_d = parse5_utils_1.getAttribute(node, 'href')) !== null && _d !== void 0 ? _d : '';
47
+ if (linkRels.includes((_d = parse5_utils_1.getAttribute(node, 'rel')) !== null && _d !== void 0 ? _d : '')) {
48
+ path = (_e = parse5_utils_1.getAttribute(node, 'href')) !== null && _e !== void 0 ? _e : '';
44
49
  }
45
50
  break;
46
51
  case 'meta':
47
52
  if (parse5_utils_1.getAttribute(node, 'property') === 'og:image' && parse5_utils_1.getAttribute(node, 'content')) {
48
- path = (_e = parse5_utils_1.getAttribute(node, 'content')) !== null && _e !== void 0 ? _e : '';
53
+ path = (_f = parse5_utils_1.getAttribute(node, 'content')) !== null && _f !== void 0 ? _f : '';
49
54
  }
50
55
  break;
51
56
  case 'script':
52
57
  if (parse5_utils_1.getAttribute(node, 'type') !== 'module' && parse5_utils_1.getAttribute(node, 'src')) {
53
- path = (_f = parse5_utils_1.getAttribute(node, 'src')) !== null && _f !== void 0 ? _f : '';
58
+ path = (_g = parse5_utils_1.getAttribute(node, 'src')) !== null && _g !== void 0 ? _g : '';
54
59
  }
55
60
  break;
56
61
  default:
@@ -97,7 +102,7 @@ function getSourceAttribute(node) {
97
102
  return 'src';
98
103
  }
99
104
  case 'source': {
100
- return 'srcset';
105
+ return parse5_utils_1.getAttribute(node, 'src') ? 'src' : 'srcset';
101
106
  }
102
107
  case 'link': {
103
108
  return 'href';
@@ -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":"addRollupInput.d.ts","sourceRoot":"","sources":["../../src/input/addRollupInput.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAW7D,wBAAgB,cAAc,CAC5B,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,eAAe,EAAE,GAChC,YAAY,CAoCd"}
1
+ {"version":3,"file":"addRollupInput.d.ts","sourceRoot":"","sources":["../../src/input/addRollupInput.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAW7D,wBAAgB,cAAc,CAC5B,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,eAAe,EAAE,GAChC,YAAY,CAuCd"}
@@ -10,13 +10,17 @@ function fromEntries(entries) {
10
10
  return obj;
11
11
  }
12
12
  function addRollupInput(inputOptions, inputModuleIds) {
13
+ var _a;
13
14
  // Add input module ids to existing input option, whether it's a string, array or object
14
15
  // this way you can use multiple html plugins all adding their own inputs
15
16
  if (!inputOptions.input) {
16
17
  return Object.assign(Object.assign({}, inputOptions), { input: inputModuleIds.map(mod => mod.importPath) });
17
18
  }
18
19
  if (typeof inputOptions.input === 'string') {
19
- return Object.assign(Object.assign({}, inputOptions), { input: [inputOptions.input, ...inputModuleIds.map(mod => mod.importPath)] });
20
+ return Object.assign(Object.assign({}, inputOptions), { input: [
21
+ ...(((_a = inputOptions === null || inputOptions === void 0 ? void 0 : inputOptions.input) === null || _a === void 0 ? void 0 : _a.endsWith('.html')) ? [] : [inputOptions.input]),
22
+ ...inputModuleIds.map(mod => mod.importPath),
23
+ ] });
20
24
  }
21
25
  if (Array.isArray(inputOptions.input)) {
22
26
  return Object.assign(Object.assign({}, inputOptions), { input: [...inputOptions.input, ...inputModuleIds.map(mod => mod.importPath)] });
@@ -1 +1 @@
1
- {"version":3,"file":"addRollupInput.js","sourceRoot":"","sources":["../../src/input/addRollupInput.ts"],"names":[],"mappings":";;;AAEA,oCAAuC;AAEvC,SAAS,WAAW,CAAI,OAAsB;IAC5C,MAAM,GAAG,GAAsB,EAAE,CAAC;IAClC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,OAAO,EAAE;QAC5B,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;KACZ;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAgB,cAAc,CAC5B,YAA0B,EAC1B,cAAiC;IAEjC,wFAAwF;IACxF,yEAAyE;IACzE,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE;QACvB,uCAAY,YAAY,KAAE,KAAK,EAAE,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,IAAG;KAC9E;IAED,IAAI,OAAO,YAAY,CAAC,KAAK,KAAK,QAAQ,EAAE;QAC1C,uCACK,YAAY,KACf,KAAK,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IACzE;KACH;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;QACrC,uCACK,YAAY,KACf,KAAK,EAAE,CAAC,GAAG,YAAY,CAAC,KAAK,EAAE,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAC5E;KACH;IAED,IAAI,OAAO,YAAY,CAAC,KAAK,KAAK,QAAQ,EAAE;QAC1C,uCACK,YAAY,KACf,KAAK,kCACA,YAAY,CAAC,KAAK,GAClB,WAAW,CACZ,cAAc;iBACX,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC;iBAC1B,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAC1D,KAEH;KACH;IAED,MAAM,mBAAW,CAAC,2EAA2E,CAAC,CAAC;AACjG,CAAC;AAvCD,wCAuCC"}
1
+ {"version":3,"file":"addRollupInput.js","sourceRoot":"","sources":["../../src/input/addRollupInput.ts"],"names":[],"mappings":";;;AAEA,oCAAuC;AAEvC,SAAS,WAAW,CAAI,OAAsB;IAC5C,MAAM,GAAG,GAAsB,EAAE,CAAC;IAClC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,OAAO,EAAE;QAC5B,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;KACZ;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAgB,cAAc,CAC5B,YAA0B,EAC1B,cAAiC;;IAEjC,wFAAwF;IACxF,yEAAyE;IACzE,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE;QACvB,uCAAY,YAAY,KAAE,KAAK,EAAE,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,IAAG;KAC9E;IAED,IAAI,OAAO,YAAY,CAAC,KAAK,KAAK,QAAQ,EAAE;QAC1C,uCACK,YAAY,KACf,KAAK,EAAE;gBACL,GAAG,CAAC,OAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK,0CAAE,QAAQ,CAAC,OAAO,GAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBACvE,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC;aAC7C,IACD;KACH;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;QACrC,uCACK,YAAY,KACf,KAAK,EAAE,CAAC,GAAG,YAAY,CAAC,KAAK,EAAE,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAC5E;KACH;IAED,IAAI,OAAO,YAAY,CAAC,KAAK,KAAK,QAAQ,EAAE;QAC1C,uCACK,YAAY,KACf,KAAK,kCACA,YAAY,CAAC,KAAK,GAClB,WAAW,CACZ,cAAc;iBACX,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC;iBAC1B,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAC1D,KAEH;KACH;IAED,MAAM,mBAAW,CAAC,2EAA2E,CAAC,CAAC;AACjG,CAAC;AA1CD,wCA0CC"}
@@ -10,7 +10,7 @@ const crypto_1 = __importDefault(require("crypto"));
10
10
  const utils_1 = require("../../assets/utils");
11
11
  const parse5_utils_2 = require("@web/parse5-utils");
12
12
  function createContentHash(content) {
13
- return crypto_1.default.createHash('md4').update(content).digest('hex');
13
+ return crypto_1.default.createHash('md5').update(content).digest('hex');
14
14
  }
15
15
  function isAbsolute(src) {
16
16
  try {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@web/rollup-plugin-html",
3
- "version": "1.10.1",
3
+ "version": "1.11.0",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -50,6 +50,6 @@
50
50
  },
51
51
  "devDependencies": {
52
52
  "@types/html-minifier-terser": "^6.0.0",
53
- "rollup": "^2.35.1"
53
+ "rollup": "^2.66.1"
54
54
  }
55
55
  }
@@ -34,7 +34,11 @@ function isAsset(node: Element) {
34
34
  path = getAttribute(node, 'src') ?? '';
35
35
  break;
36
36
  case 'source':
37
- path = extractFirstUrlOfSrcSet(node) ?? '';
37
+ if (getAttribute(node, 'src')) {
38
+ path = getAttribute(node, 'src') ?? '';
39
+ } else {
40
+ path = extractFirstUrlOfSrcSet(node) ?? '';
41
+ }
38
42
  break;
39
43
  case 'link':
40
44
  if (linkRels.includes(getAttribute(node, 'rel') ?? '')) {
@@ -104,7 +108,7 @@ export function getSourceAttribute(node: Element) {
104
108
  return 'src';
105
109
  }
106
110
  case 'source': {
107
- return 'srcset';
111
+ return getAttribute(node, 'src') ? 'src' : 'srcset';
108
112
  }
109
113
  case 'link': {
110
114
  return 'href';
@@ -23,7 +23,10 @@ export function addRollupInput(
23
23
  if (typeof inputOptions.input === 'string') {
24
24
  return {
25
25
  ...inputOptions,
26
- input: [inputOptions.input, ...inputModuleIds.map(mod => mod.importPath)],
26
+ input: [
27
+ ...(inputOptions?.input?.endsWith('.html') ? [] : [inputOptions.input]),
28
+ ...inputModuleIds.map(mod => mod.importPath),
29
+ ],
27
30
  };
28
31
  }
29
32
 
@@ -14,7 +14,7 @@ export interface ExtractModulesParams {
14
14
  }
15
15
 
16
16
  function createContentHash(content: string) {
17
- return crypto.createHash('md4').update(content).digest('hex');
17
+ return crypto.createHash('md5').update(content).digest('hex');
18
18
  }
19
19
 
20
20
  function isAbsolute(src: string) {
package/CHANGELOG.md DELETED
@@ -1,189 +0,0 @@
1
- # @web/rollup-plugin-html
2
-
3
- ## 1.10.1
4
-
5
- ### Patch Changes
6
-
7
- - 516ecd3f: Fix html-minimier-terser call to use await
8
-
9
- ## 1.10.0
10
-
11
- ### Minor Changes
12
-
13
- - b57f36de: Update dependency html-minifier-terser to 6.0.0
14
-
15
- ## 1.9.1
16
-
17
- ### Patch Changes
18
-
19
- - ca749b0e: Update dependency @types/parse5 to v6
20
- - Updated dependencies [ca749b0e]
21
- - @web/parse5-utils@1.3.0
22
-
23
- ## 1.9.0
24
-
25
- ### Minor Changes
26
-
27
- - 075afcf9: Add `exclude` option. Used e.g. to ignore html file assets when bundling.
28
-
29
- ## 1.8.0
30
-
31
- ### Minor Changes
32
-
33
- - 7c4dd6cd: Support `picture` tags by handling `source` tags with `srcset` attributes.
34
-
35
- Example of supported html
36
-
37
- ```html
38
- <picture>
39
- <source type="image/avif" srcset="small.avif 30w, big.avif 60w" sizes="30px" />
40
- <source type="image/jpeg" srcset="small.jpeg 30w, big.jpeg 60w" sizes="30px" />
41
- <img alt="..." src="small.jpeg" width="30" height="15" loading="lazy" decoding="async" />
42
- </picture>
43
- ```
44
-
45
- ## 1.7.0
46
-
47
- ### Minor Changes
48
-
49
- - be919633: add minify option
50
-
51
- ### Patch Changes
52
-
53
- - e331e429: fix(rollup-plugin-html): fix linked assets not being prefixed with configured publicPath. See https://github.com/modernweb-dev/web/issues/1302
54
-
55
- ## 1.6.0
56
-
57
- ### Minor Changes
58
-
59
- - 7d0e28c2: Preserve attributes on html script tags.
60
-
61
- Input:
62
-
63
- ```html
64
- <script type="module" src="..." some="attribute">
65
- ```
66
-
67
- Output before:
68
-
69
- ```html
70
- <script type="module" src="...">
71
- ```
72
-
73
- Output now:
74
-
75
- ```html
76
- <script type="module" src="..." some="attribute">
77
- ```
78
-
79
- ## 1.5.0
80
-
81
- ### Minor Changes
82
-
83
- - 5688eb5b: Add option to scan for inline scripts in HTML assets, and insert a CSP meta tag to allow them executing with strict CSP rules.
84
-
85
- ### Patch Changes
86
-
87
- - Updated dependencies [a07f4aef]
88
- - @web/parse5-utils@1.2.2
89
-
90
- ## 1.4.0
91
-
92
- ### Minor Changes
93
-
94
- - 58d78c33: Add option `absolutePathPrefix` to support subfolders deployments if absolute urls are used
95
-
96
- ## 1.3.3
97
-
98
- ### Patch Changes
99
-
100
- - 1f4a2ab3: Adds an `injectServiceWorker` and `serviceWorkerPath` option which if provided will inject a service worker registration script into html files.
101
-
102
- ## 1.3.2
103
-
104
- ### Patch Changes
105
-
106
- - 05dd36f: fix entryoint for node v10
107
-
108
- ## 1.3.1
109
-
110
- ### Patch Changes
111
-
112
- - 53ba8db: ignore scripts with absolute paths
113
-
114
- ## 1.3.0
115
-
116
- ### Minor Changes
117
-
118
- - ac2e832: Allow for an `absoluteBaseUrl` setting which will convert absolute URLs to full absolute URLs for the following tags.
119
-
120
- ```html
121
- <!-- FROM -->
122
- <meta property="og:image" content="./images/image-social.png" />
123
- <link rel="canonical" href="/guides/" />
124
- <meta property="og:url" content="/guides/" />
125
-
126
- <!-- TO -->
127
- <meta property="og:image" content="https://domain.com/assets/image-social-xxx.png" />
128
- <link rel="canonical" href="https://domain.com/guides/" />
129
- <meta property="og:url" content="https://domain.com/guides/" />
130
- ```
131
-
132
- ### Patch Changes
133
-
134
- - de5d396: Identify `<meta property="og:image"` as an asset
135
-
136
- ## 1.2.1
137
-
138
- ### Patch Changes
139
-
140
- - cfdeb98: - do not touch `<script>` tags with inline content/code
141
- - treat `<script src="...">` tags as assets
142
-
143
- ## 1.2.0
144
-
145
- ### Minor Changes
146
-
147
- - 23fadf2: allow disabling default inject behavior
148
-
149
- ### Patch Changes
150
-
151
- - Updated dependencies [a7c9af6]
152
- - @web/parse5-utils@1.1.2
153
-
154
- ## 1.1.1
155
-
156
- ### Patch Changes
157
-
158
- - d804089: don't hash social media and browser assets
159
- - 717c415: Prevent remote URLs from counting as assets
160
- - 9e18d84: write asset paths relative to HTML file
161
-
162
- ## 1.1.0
163
-
164
- ### Minor Changes
165
-
166
- - 50ba2d6: watch referenced assets
167
-
168
- ## 1.0.2
169
-
170
- ### Patch Changes
171
-
172
- - d130352: bundle referenced HTML assets
173
-
174
- ## 1.0.1
175
-
176
- ### Patch Changes
177
-
178
- - 12da341: remove prepublish script
179
-
180
- ## 1.0.0
181
-
182
- ### Major Changes
183
-
184
- - 3121966: First release
185
-
186
- ### Patch Changes
187
-
188
- - Updated dependencies [3121966]
189
- - @web/parse5-utils@1.1.0