@atlaspack/transformer-html 2.14.5-canary.14 → 2.14.5-canary.141
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/CHANGELOG.md +121 -0
- package/lib/HTMLTransformer.d.ts +6 -0
- package/lib/HTMLTransformer.js +4 -0
- package/lib/dependencies.d.ts +2 -0
- package/lib/dependencies.js +10 -0
- package/lib/inline.d.ts +7 -0
- package/lib/inline.js +8 -2
- package/package.json +12 -10
- package/src/{HTMLTransformer.js → HTMLTransformer.ts} +9 -7
- package/src/{dependencies.js → dependencies.ts} +26 -15
- package/src/{inline.js → inline.ts} +7 -5
- package/test/{HTMLTransformer.test.js → HTMLTransformer.test.ts} +20 -27
- package/tsconfig.json +4 -0
package/CHANGELOG.md
CHANGED
@@ -1,5 +1,126 @@
|
|
1
1
|
# @atlaspack/transformer-html
|
2
2
|
|
3
|
+
## 2.14.21
|
4
|
+
|
5
|
+
### Patch Changes
|
6
|
+
|
7
|
+
- Updated dependencies []:
|
8
|
+
- @atlaspack/plugin@2.14.21
|
9
|
+
|
10
|
+
## 2.14.20
|
11
|
+
|
12
|
+
### Patch Changes
|
13
|
+
|
14
|
+
- [#702](https://github.com/atlassian-labs/atlaspack/pull/702) [`daaa768`](https://github.com/atlassian-labs/atlaspack/commit/daaa7688786772d7e3713b71c5bba6b89ec704aa) Thanks [@alshdavid](https://github.com/alshdavid)! - Fixes to Flow types
|
15
|
+
|
16
|
+
- Updated dependencies [[`daaa768`](https://github.com/atlassian-labs/atlaspack/commit/daaa7688786772d7e3713b71c5bba6b89ec704aa)]:
|
17
|
+
- @atlaspack/plugin@2.14.20
|
18
|
+
|
19
|
+
## 2.14.19
|
20
|
+
|
21
|
+
### Patch Changes
|
22
|
+
|
23
|
+
- Updated dependencies []:
|
24
|
+
- @atlaspack/plugin@2.14.19
|
25
|
+
|
26
|
+
## 2.14.18
|
27
|
+
|
28
|
+
### Patch Changes
|
29
|
+
|
30
|
+
- Updated dependencies [[`becf977`](https://github.com/atlassian-labs/atlaspack/commit/becf977f625d5ee46dae3d4c679f173bf5f40cc0), [`f0f7c71`](https://github.com/atlassian-labs/atlaspack/commit/f0f7c7168a1d3d18c6f30d2daed611275692b7c5)]:
|
31
|
+
- @atlaspack/rust@3.4.1
|
32
|
+
- @atlaspack/plugin@2.14.18
|
33
|
+
|
34
|
+
## 2.14.17
|
35
|
+
|
36
|
+
### Patch Changes
|
37
|
+
|
38
|
+
- Updated dependencies [[`c75bf55`](https://github.com/atlassian-labs/atlaspack/commit/c75bf553fff4decc285b5fd499a275853b18f8f2)]:
|
39
|
+
- @atlaspack/rust@3.4.0
|
40
|
+
- @atlaspack/plugin@2.14.17
|
41
|
+
|
42
|
+
## 2.14.16
|
43
|
+
|
44
|
+
### Patch Changes
|
45
|
+
|
46
|
+
- Updated dependencies []:
|
47
|
+
- @atlaspack/plugin@2.14.16
|
48
|
+
|
49
|
+
## 2.14.15
|
50
|
+
|
51
|
+
### Patch Changes
|
52
|
+
|
53
|
+
- Updated dependencies []:
|
54
|
+
- @atlaspack/plugin@2.14.15
|
55
|
+
|
56
|
+
## 2.14.14
|
57
|
+
|
58
|
+
### Patch Changes
|
59
|
+
|
60
|
+
- Updated dependencies []:
|
61
|
+
- @atlaspack/plugin@2.14.14
|
62
|
+
|
63
|
+
## 2.14.13
|
64
|
+
|
65
|
+
### Patch Changes
|
66
|
+
|
67
|
+
- Updated dependencies []:
|
68
|
+
- @atlaspack/plugin@2.14.13
|
69
|
+
|
70
|
+
## 2.14.12
|
71
|
+
|
72
|
+
### Patch Changes
|
73
|
+
|
74
|
+
- Updated dependencies []:
|
75
|
+
- @atlaspack/plugin@2.14.12
|
76
|
+
|
77
|
+
## 2.14.11
|
78
|
+
|
79
|
+
### Patch Changes
|
80
|
+
|
81
|
+
- Updated dependencies []:
|
82
|
+
- @atlaspack/plugin@2.14.11
|
83
|
+
|
84
|
+
## 2.14.10
|
85
|
+
|
86
|
+
### Patch Changes
|
87
|
+
|
88
|
+
- Updated dependencies [[`35fdd4b`](https://github.com/atlassian-labs/atlaspack/commit/35fdd4b52da0af20f74667f7b8adfb2f90279b7c), [`6dd4ccb`](https://github.com/atlassian-labs/atlaspack/commit/6dd4ccb753541de32322d881f973d571dd57e4ca)]:
|
89
|
+
- @atlaspack/rust@3.3.5
|
90
|
+
- @atlaspack/plugin@2.14.10
|
91
|
+
|
92
|
+
## 2.14.9
|
93
|
+
|
94
|
+
### Patch Changes
|
95
|
+
|
96
|
+
- Updated dependencies [[`124b7ff`](https://github.com/atlassian-labs/atlaspack/commit/124b7fff44f71aac9fbad289a9a9509b3dfc9aaa), [`e052521`](https://github.com/atlassian-labs/atlaspack/commit/e0525210850ed1606146eb86991049cf567c5dec), [`15c6d70`](https://github.com/atlassian-labs/atlaspack/commit/15c6d7000bd89da876bc590aa75b17a619a41896), [`e4d966c`](https://github.com/atlassian-labs/atlaspack/commit/e4d966c3c9c4292c5013372ae65b10d19d4bacc6), [`42a775d`](https://github.com/atlassian-labs/atlaspack/commit/42a775de8eec638ad188f3271964170d8c04d84b), [`29c2f10`](https://github.com/atlassian-labs/atlaspack/commit/29c2f106de9679adfb5afa04e1910471dc65a427), [`1ef91fc`](https://github.com/atlassian-labs/atlaspack/commit/1ef91fcc863fdd2831511937083dbbc1263b3d9d)]:
|
97
|
+
- @atlaspack/rust@3.3.4
|
98
|
+
- @atlaspack/plugin@2.14.9
|
99
|
+
|
100
|
+
## 2.14.8
|
101
|
+
|
102
|
+
### Patch Changes
|
103
|
+
|
104
|
+
- Updated dependencies [[`1ab0a27`](https://github.com/atlassian-labs/atlaspack/commit/1ab0a275aeca40350415e2b03e7440d1dddc6228), [`b8a4ae8`](https://github.com/atlassian-labs/atlaspack/commit/b8a4ae8f83dc0a83d8b145c5f729936ce52080a3)]:
|
105
|
+
- @atlaspack/rust@3.3.3
|
106
|
+
- @atlaspack/plugin@2.14.8
|
107
|
+
|
108
|
+
## 2.14.7
|
109
|
+
|
110
|
+
### Patch Changes
|
111
|
+
|
112
|
+
- Updated dependencies [[`556d6ab`](https://github.com/atlassian-labs/atlaspack/commit/556d6ab8ede759fa7f37fcd3f4da336ef1c55e8f)]:
|
113
|
+
- @atlaspack/rust@3.3.2
|
114
|
+
- @atlaspack/plugin@2.14.7
|
115
|
+
|
116
|
+
## 2.14.6
|
117
|
+
|
118
|
+
### Patch Changes
|
119
|
+
|
120
|
+
- Updated dependencies [[`e0f5337`](https://github.com/atlassian-labs/atlaspack/commit/e0f533757bd1019dbd108a04952c87da15286e09)]:
|
121
|
+
- @atlaspack/rust@3.3.1
|
122
|
+
- @atlaspack/plugin@2.14.6
|
123
|
+
|
3
124
|
## 2.14.5
|
4
125
|
|
5
126
|
### Patch Changes
|
@@ -0,0 +1,6 @@
|
|
1
|
+
import { Transformer } from '@atlaspack/plugin';
|
2
|
+
import type { AST, Transformer as TransformerOpts } from '@atlaspack/types';
|
3
|
+
export declare function parseHTML(code: string, xmlMode: boolean): AST;
|
4
|
+
export declare const transformerOpts: TransformerOpts<undefined>;
|
5
|
+
declare const _default: Transformer<undefined>;
|
6
|
+
export default _default;
|
package/lib/HTMLTransformer.js
CHANGED
@@ -58,6 +58,8 @@ function _diagnostic() {
|
|
58
58
|
return data;
|
59
59
|
}
|
60
60
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
61
|
+
// @ts-expect-error TS2305
|
62
|
+
|
61
63
|
function parseHTML(code, xmlMode) {
|
62
64
|
return {
|
63
65
|
type: 'posthtml',
|
@@ -156,6 +158,7 @@ const transformerOpts = exports.transformerOpts = {
|
|
156
158
|
}) {
|
157
159
|
return {
|
158
160
|
content: (0, _posthtmlRender().render)(ast.program, {
|
161
|
+
// @ts-expect-error TS2322
|
159
162
|
closingSingleTag: asset.type === 'xhtml' ? 'slash' : undefined
|
160
163
|
})
|
161
164
|
};
|
@@ -165,6 +168,7 @@ var _default = exports.default = new (_plugin().Transformer)(transformerOpts);
|
|
165
168
|
function findFirstMatch(ast, expressions) {
|
166
169
|
let found;
|
167
170
|
for (const expression of expressions) {
|
171
|
+
// @ts-expect-error TS2339
|
168
172
|
(0, _posthtml().default)().match.call(ast.program, expression, node => {
|
169
173
|
found = node;
|
170
174
|
return node;
|
package/lib/dependencies.js
CHANGED
@@ -19,6 +19,8 @@ function _srcset() {
|
|
19
19
|
return data;
|
20
20
|
}
|
21
21
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
22
|
+
// @ts-expect-error TS2724
|
23
|
+
|
22
24
|
// A list of all attributes that may produce a dependency
|
23
25
|
// Based on https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes
|
24
26
|
const ATTRS = {
|
@@ -89,6 +91,7 @@ function collectDependencies(asset, ast) {
|
|
89
91
|
let hasModuleScripts = false;
|
90
92
|
let seen = new Set();
|
91
93
|
let errors = [];
|
94
|
+
// @ts-expect-error TS2339
|
92
95
|
(0, _posthtml().default)().walk.call(ast.program, node => {
|
93
96
|
let {
|
94
97
|
tag,
|
@@ -100,6 +103,7 @@ function collectDependencies(asset, ast) {
|
|
100
103
|
seen.add(node);
|
101
104
|
if (tag === 'meta') {
|
102
105
|
const isMetaDependency = Object.keys(attrs).some(attr => {
|
106
|
+
// @ts-expect-error TS7053
|
103
107
|
let values = META[attr];
|
104
108
|
return values && values.includes(attrs[attr]) && attrs.content !== '' && !(attrs.name === 'msapplication-config' && attrs.content === 'none');
|
105
109
|
});
|
@@ -169,6 +173,7 @@ function collectDependencies(asset, ast) {
|
|
169
173
|
priority: 'parallel',
|
170
174
|
bundleBehavior: sourceType === 'script' || attrs.async != null ? 'isolated' : undefined,
|
171
175
|
env: {
|
176
|
+
// @ts-expect-error TS2322
|
172
177
|
sourceType,
|
173
178
|
outputFormat: 'global',
|
174
179
|
loc
|
@@ -185,7 +190,9 @@ function collectDependencies(asset, ast) {
|
|
185
190
|
// because nomodule scripts won't run when modules are supported.
|
186
191
|
bundleBehavior: sourceType === 'script' || attrs.async != null ? 'isolated' : undefined,
|
187
192
|
env: {
|
193
|
+
// @ts-expect-error TS2322
|
188
194
|
sourceType,
|
195
|
+
// @ts-expect-error TS2322
|
189
196
|
outputFormat,
|
190
197
|
loc
|
191
198
|
}
|
@@ -204,6 +211,8 @@ function collectDependencies(asset, ast) {
|
|
204
211
|
if (attrs[attr][0] === '#') {
|
205
212
|
continue;
|
206
213
|
}
|
214
|
+
|
215
|
+
// @ts-expect-error TS7053
|
207
216
|
let elements = ATTRS[attr];
|
208
217
|
if (elements && elements.includes(node.tag)) {
|
209
218
|
// Check for empty string
|
@@ -215,6 +224,7 @@ function collectDependencies(asset, ast) {
|
|
215
224
|
});
|
216
225
|
}
|
217
226
|
let depHandler = getAttrDepHandler(attr);
|
227
|
+
// @ts-expect-error TS7053
|
218
228
|
let depOptionsHandler = OPTIONS[node.tag];
|
219
229
|
let depOptions = typeof depOptionsHandler === 'function' ? depOptionsHandler(attrs, asset.env) : depOptionsHandler && depOptionsHandler[attr];
|
220
230
|
attrs[attr] = depHandler(asset, attrs[attr], depOptions);
|
package/lib/inline.d.ts
ADDED
@@ -0,0 +1,7 @@
|
|
1
|
+
import type { AST, MutableAsset, TransformerResult } from '@atlaspack/types';
|
2
|
+
interface ExtractInlineAssetsResult {
|
3
|
+
hasModuleScripts: boolean;
|
4
|
+
assets: Array<TransformerResult>;
|
5
|
+
}
|
6
|
+
export default function extractInlineAssets(asset: MutableAsset, ast: AST): ExtractInlineAssetsResult;
|
7
|
+
export {};
|
package/lib/inline.js
CHANGED
@@ -19,6 +19,8 @@ function _posthtml() {
|
|
19
19
|
return data;
|
20
20
|
}
|
21
21
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
22
|
+
// @ts-expect-error TS2724
|
23
|
+
|
22
24
|
const SCRIPT_TYPES = {
|
23
25
|
'application/javascript': 'js',
|
24
26
|
'text/javascript': 'js',
|
@@ -34,6 +36,7 @@ function extractInlineAssets(asset, ast) {
|
|
34
36
|
// Extract inline <script> and <style> tags for processing.
|
35
37
|
let parts = [];
|
36
38
|
let hasModuleScripts = false;
|
39
|
+
// @ts-expect-error TS2339
|
37
40
|
(0, _posthtml().default)().walk.call(program, node => {
|
38
41
|
let parcelKey = (0, _rust().hashString)(`${asset.id}:${key++}`);
|
39
42
|
if (node.tag === 'script' || node.tag === 'style') {
|
@@ -49,10 +52,14 @@ function extractInlineAssets(asset, ast) {
|
|
49
52
|
}
|
50
53
|
} else if (node.attrs && node.attrs.type != null) {
|
51
54
|
// Skip JSON
|
55
|
+
// @ts-expect-error TS7053
|
52
56
|
if (SCRIPT_TYPES[node.attrs.type] === false) {
|
53
57
|
return node;
|
54
58
|
}
|
59
|
+
|
60
|
+
// @ts-expect-error TS7053
|
55
61
|
if (SCRIPT_TYPES[node.attrs.type]) {
|
62
|
+
// @ts-expect-error TS7053
|
56
63
|
type = SCRIPT_TYPES[node.attrs.type];
|
57
64
|
} else {
|
58
65
|
type = node.attrs.type.split('/')[1];
|
@@ -120,10 +127,10 @@ function extractInlineAssets(asset, ast) {
|
|
120
127
|
content: value,
|
121
128
|
uniqueKey: parcelKey,
|
122
129
|
bundleBehavior: 'inline',
|
130
|
+
// @ts-expect-error TS2322
|
123
131
|
env,
|
124
132
|
meta: {
|
125
133
|
type: 'tag',
|
126
|
-
// $FlowFixMe
|
127
134
|
node,
|
128
135
|
startLine: (_node$location = node.location) === null || _node$location === void 0 ? void 0 : _node$location.start.line
|
129
136
|
}
|
@@ -151,7 +158,6 @@ function extractInlineAssets(asset, ast) {
|
|
151
158
|
bundleBehavior: 'inline',
|
152
159
|
meta: {
|
153
160
|
type: 'attr',
|
154
|
-
// $FlowFixMe
|
155
161
|
node
|
156
162
|
}
|
157
163
|
});
|
package/package.json
CHANGED
@@ -1,26 +1,28 @@
|
|
1
1
|
{
|
2
2
|
"name": "@atlaspack/transformer-html",
|
3
|
-
"version": "2.14.5-canary.
|
3
|
+
"version": "2.14.5-canary.141+2f29297bd",
|
4
4
|
"license": "(MIT OR Apache-2.0)",
|
5
5
|
"publishConfig": {
|
6
6
|
"access": "public"
|
7
7
|
},
|
8
8
|
"scripts": {
|
9
|
-
"test": "mocha"
|
9
|
+
"test": "mocha",
|
10
|
+
"check-ts": "tsc --emitDeclarationOnly --rootDir src"
|
10
11
|
},
|
11
12
|
"repository": {
|
12
13
|
"type": "git",
|
13
14
|
"url": "https://github.com/atlassian-labs/atlaspack.git"
|
14
15
|
},
|
15
|
-
"main": "lib/HTMLTransformer.js",
|
16
|
-
"source": "src/HTMLTransformer.
|
16
|
+
"main": "./lib/HTMLTransformer.js",
|
17
|
+
"source": "./src/HTMLTransformer.ts",
|
18
|
+
"types": "./lib/HTMLTransformer.d.ts",
|
17
19
|
"engines": {
|
18
20
|
"node": ">= 16.0.0"
|
19
21
|
},
|
20
22
|
"dependencies": {
|
21
|
-
"@atlaspack/diagnostic": "2.14.1-canary.
|
22
|
-
"@atlaspack/plugin": "2.14.5-canary.
|
23
|
-
"@atlaspack/rust": "3.2.1-canary.
|
23
|
+
"@atlaspack/diagnostic": "2.14.1-canary.209+2f29297bd",
|
24
|
+
"@atlaspack/plugin": "2.14.5-canary.141+2f29297bd",
|
25
|
+
"@atlaspack/rust": "3.2.1-canary.141+2f29297bd",
|
24
26
|
"nullthrows": "^1.1.1",
|
25
27
|
"posthtml": "^0.16.5",
|
26
28
|
"posthtml-parser": "^0.10.1",
|
@@ -29,8 +31,8 @@
|
|
29
31
|
"srcset": "4"
|
30
32
|
},
|
31
33
|
"devDependencies": {
|
32
|
-
"@atlaspack/core": "2.16.2-canary.
|
34
|
+
"@atlaspack/core": "2.16.2-canary.141+2f29297bd"
|
33
35
|
},
|
34
36
|
"type": "commonjs",
|
35
|
-
"gitHead": "
|
36
|
-
}
|
37
|
+
"gitHead": "2f29297bd550840c9840871559349ef773bcbf6d"
|
38
|
+
}
|
@@ -1,9 +1,8 @@
|
|
1
|
-
// @flow
|
2
|
-
|
3
1
|
import {Transformer} from '@atlaspack/plugin';
|
4
2
|
import type {AST, Transformer as TransformerOpts} from '@atlaspack/types';
|
5
3
|
import {parser as parse} from 'posthtml-parser';
|
6
4
|
import nullthrows from 'nullthrows';
|
5
|
+
// @ts-expect-error TS2305
|
7
6
|
import type {PostHTMLExpression, PostHTMLNode} from 'posthtml';
|
8
7
|
import PostHTML from 'posthtml';
|
9
8
|
import {render} from 'posthtml-render';
|
@@ -25,7 +24,7 @@ export function parseHTML(code: string, xmlMode: boolean): AST {
|
|
25
24
|
};
|
26
25
|
}
|
27
26
|
|
28
|
-
export const transformerOpts: TransformerOpts<
|
27
|
+
export const transformerOpts: TransformerOpts<undefined> = {
|
29
28
|
canReuseAST({ast}) {
|
30
29
|
return ast.type === 'posthtml' && semver.satisfies(ast.version, '^0.4.0');
|
31
30
|
},
|
@@ -46,7 +45,7 @@ export const transformerOpts: TransformerOpts<void> = {
|
|
46
45
|
let hasModuleScripts;
|
47
46
|
try {
|
48
47
|
hasModuleScripts = collectDependencies(asset, ast);
|
49
|
-
} catch (errors) {
|
48
|
+
} catch (errors: any) {
|
50
49
|
if (Array.isArray(errors)) {
|
51
50
|
throw new ThrowableDiagnostic({
|
52
51
|
diagnostic: errors.map((error) => ({
|
@@ -81,7 +80,7 @@ export const transformerOpts: TransformerOpts<void> = {
|
|
81
80
|
}),
|
82
81
|
},
|
83
82
|
content: [],
|
84
|
-
};
|
83
|
+
} as const;
|
85
84
|
|
86
85
|
const found = findFirstMatch(ast, [{tag: 'body'}, {tag: 'html'}]);
|
87
86
|
|
@@ -108,20 +107,23 @@ export const transformerOpts: TransformerOpts<void> = {
|
|
108
107
|
generate({ast, asset}) {
|
109
108
|
return {
|
110
109
|
content: render(ast.program, {
|
110
|
+
// @ts-expect-error TS2322
|
111
111
|
closingSingleTag: asset.type === 'xhtml' ? 'slash' : undefined,
|
112
112
|
}),
|
113
113
|
};
|
114
114
|
},
|
115
115
|
};
|
116
|
-
|
116
|
+
|
117
|
+
export default new Transformer(transformerOpts) as Transformer<undefined>;
|
117
118
|
|
118
119
|
function findFirstMatch(
|
119
120
|
ast: AST,
|
120
121
|
expressions: PostHTMLExpression[],
|
121
|
-
):
|
122
|
+
): PostHTMLNode | null | undefined {
|
122
123
|
let found;
|
123
124
|
|
124
125
|
for (const expression of expressions) {
|
126
|
+
// @ts-expect-error TS2339
|
125
127
|
PostHTML().match.call(ast.program, expression, (node) => {
|
126
128
|
found = node;
|
127
129
|
return node;
|
@@ -1,6 +1,5 @@
|
|
1
|
-
// @flow
|
2
|
-
|
3
1
|
import type {AST, MutableAsset, FilePath} from '@atlaspack/types';
|
2
|
+
// @ts-expect-error TS2724
|
4
3
|
import type {PostHTMLNode} from 'posthtml';
|
5
4
|
import PostHTML from 'posthtml';
|
6
5
|
import {parse, stringify} from 'srcset';
|
@@ -26,7 +25,7 @@ const ATTRS = {
|
|
26
25
|
'xlink:href': ['use', 'image', 'script'],
|
27
26
|
content: ['meta'],
|
28
27
|
data: ['object'],
|
29
|
-
};
|
28
|
+
} as const;
|
30
29
|
|
31
30
|
// A list of metadata that should produce a dependency
|
32
31
|
// Based on:
|
@@ -63,7 +62,7 @@ const META = {
|
|
63
62
|
'contentUrl',
|
64
63
|
'downloadUrl',
|
65
64
|
],
|
66
|
-
};
|
65
|
+
} as const;
|
67
66
|
|
68
67
|
const FEED_TYPES = new Set(['application/rss+xml', 'application/atom+xml']);
|
69
68
|
|
@@ -75,7 +74,7 @@ const OPTIONS = {
|
|
75
74
|
iframe: {
|
76
75
|
src: {needsStableName: true},
|
77
76
|
},
|
78
|
-
link(attrs) {
|
77
|
+
link(attrs: any) {
|
79
78
|
if (attrs.rel === 'stylesheet') {
|
80
79
|
return {
|
81
80
|
// Keep in the same bundle group as the HTML.
|
@@ -83,9 +82,13 @@ const OPTIONS = {
|
|
83
82
|
};
|
84
83
|
}
|
85
84
|
},
|
86
|
-
};
|
85
|
+
} as const;
|
87
86
|
|
88
|
-
function collectSrcSetDependencies(
|
87
|
+
function collectSrcSetDependencies(
|
88
|
+
asset: MutableAsset,
|
89
|
+
srcset: string,
|
90
|
+
opts: any,
|
91
|
+
) {
|
89
92
|
let parsed = parse(srcset).map(({url, ...v}) => ({
|
90
93
|
url: asset.addURLDependency(url, opts),
|
91
94
|
...v,
|
@@ -93,12 +96,13 @@ function collectSrcSetDependencies(asset, srcset, opts) {
|
|
93
96
|
return stringify(parsed);
|
94
97
|
}
|
95
98
|
|
96
|
-
function getAttrDepHandler(attr) {
|
99
|
+
function getAttrDepHandler(attr: string) {
|
97
100
|
if (attr === 'srcset' || attr === 'imagesrcset') {
|
98
101
|
return collectSrcSetDependencies;
|
99
102
|
}
|
100
103
|
|
101
|
-
return (asset, src, opts) =>
|
104
|
+
return (asset: MutableAsset, src: string, opts: any) =>
|
105
|
+
asset.addURLDependency(src, opts);
|
102
106
|
}
|
103
107
|
|
104
108
|
export default function collectDependencies(
|
@@ -108,11 +112,12 @@ export default function collectDependencies(
|
|
108
112
|
let isDirty = false;
|
109
113
|
let hasModuleScripts = false;
|
110
114
|
let seen = new Set();
|
111
|
-
let errors: Array<{
|
112
|
-
message: string
|
113
|
-
filePath: FilePath
|
114
|
-
loc: PostHTMLNode['location']
|
115
|
-
|
115
|
+
let errors: Array<{
|
116
|
+
message: string;
|
117
|
+
filePath: FilePath;
|
118
|
+
loc: PostHTMLNode['location'];
|
119
|
+
}> = [];
|
120
|
+
// @ts-expect-error TS2339
|
116
121
|
PostHTML().walk.call(ast.program, (node) => {
|
117
122
|
let {tag, attrs} = node;
|
118
123
|
if (!attrs || seen.has(node)) {
|
@@ -123,6 +128,7 @@ export default function collectDependencies(
|
|
123
128
|
|
124
129
|
if (tag === 'meta') {
|
125
130
|
const isMetaDependency = Object.keys(attrs).some((attr) => {
|
131
|
+
// @ts-expect-error TS7053
|
126
132
|
let values = META[attr];
|
127
133
|
return (
|
128
134
|
values &&
|
@@ -197,7 +203,7 @@ export default function collectDependencies(
|
|
197
203
|
|
198
204
|
// If this is a <script type="module">, and not all of the browser targets support ESM natively,
|
199
205
|
// add a copy of the script tag with a nomodule attribute.
|
200
|
-
let copy:
|
206
|
+
let copy: PostHTMLNode | null | undefined;
|
201
207
|
if (
|
202
208
|
outputFormat === 'esmodule' &&
|
203
209
|
!asset.env.supports('esmodules', true)
|
@@ -215,6 +221,7 @@ export default function collectDependencies(
|
|
215
221
|
? 'isolated'
|
216
222
|
: undefined,
|
217
223
|
env: {
|
224
|
+
// @ts-expect-error TS2322
|
218
225
|
sourceType,
|
219
226
|
outputFormat: 'global',
|
220
227
|
loc,
|
@@ -236,7 +243,9 @@ export default function collectDependencies(
|
|
236
243
|
? 'isolated'
|
237
244
|
: undefined,
|
238
245
|
env: {
|
246
|
+
// @ts-expect-error TS2322
|
239
247
|
sourceType,
|
248
|
+
// @ts-expect-error TS2322
|
240
249
|
outputFormat,
|
241
250
|
loc,
|
242
251
|
},
|
@@ -258,6 +267,7 @@ export default function collectDependencies(
|
|
258
267
|
continue;
|
259
268
|
}
|
260
269
|
|
270
|
+
// @ts-expect-error TS7053
|
261
271
|
let elements = ATTRS[attr];
|
262
272
|
if (elements && elements.includes(node.tag)) {
|
263
273
|
// Check for empty string
|
@@ -270,6 +280,7 @@ export default function collectDependencies(
|
|
270
280
|
}
|
271
281
|
|
272
282
|
let depHandler = getAttrDepHandler(attr);
|
283
|
+
// @ts-expect-error TS7053
|
273
284
|
let depOptionsHandler = OPTIONS[node.tag];
|
274
285
|
let depOptions =
|
275
286
|
typeof depOptionsHandler === 'function'
|
@@ -1,7 +1,6 @@
|
|
1
|
-
// @flow strict-local
|
2
|
-
|
3
1
|
import type {AST, MutableAsset, TransformerResult} from '@atlaspack/types';
|
4
2
|
import {hashString} from '@atlaspack/rust';
|
3
|
+
// @ts-expect-error TS2724
|
5
4
|
import type {PostHTMLNode} from 'posthtml';
|
6
5
|
|
7
6
|
import PostHTML from 'posthtml';
|
@@ -13,7 +12,7 @@ const SCRIPT_TYPES = {
|
|
13
12
|
'application/ld+json': 'jsonld',
|
14
13
|
'text/html': false,
|
15
14
|
module: 'js',
|
16
|
-
};
|
15
|
+
} as const;
|
17
16
|
|
18
17
|
interface ExtractInlineAssetsResult {
|
19
18
|
hasModuleScripts: boolean;
|
@@ -30,6 +29,7 @@ export default function extractInlineAssets(
|
|
30
29
|
// Extract inline <script> and <style> tags for processing.
|
31
30
|
let parts: Array<TransformerResult> = [];
|
32
31
|
let hasModuleScripts = false;
|
32
|
+
// @ts-expect-error TS2339
|
33
33
|
PostHTML().walk.call(program, (node: PostHTMLNode) => {
|
34
34
|
let parcelKey = hashString(`${asset.id}:${key++}`);
|
35
35
|
if (node.tag === 'script' || node.tag === 'style') {
|
@@ -45,11 +45,14 @@ export default function extractInlineAssets(
|
|
45
45
|
}
|
46
46
|
} else if (node.attrs && node.attrs.type != null) {
|
47
47
|
// Skip JSON
|
48
|
+
// @ts-expect-error TS7053
|
48
49
|
if (SCRIPT_TYPES[node.attrs.type] === false) {
|
49
50
|
return node;
|
50
51
|
}
|
51
52
|
|
53
|
+
// @ts-expect-error TS7053
|
52
54
|
if (SCRIPT_TYPES[node.attrs.type]) {
|
55
|
+
// @ts-expect-error TS7053
|
53
56
|
type = SCRIPT_TYPES[node.attrs.type];
|
54
57
|
} else {
|
55
58
|
type = node.attrs.type.split('/')[1];
|
@@ -131,10 +134,10 @@ export default function extractInlineAssets(
|
|
131
134
|
content: value,
|
132
135
|
uniqueKey: parcelKey,
|
133
136
|
bundleBehavior: 'inline',
|
137
|
+
// @ts-expect-error TS2322
|
134
138
|
env,
|
135
139
|
meta: {
|
136
140
|
type: 'tag',
|
137
|
-
// $FlowFixMe
|
138
141
|
node,
|
139
142
|
startLine: node.location?.start.line,
|
140
143
|
},
|
@@ -163,7 +166,6 @@ export default function extractInlineAssets(
|
|
163
166
|
bundleBehavior: 'inline',
|
164
167
|
meta: {
|
165
168
|
type: 'attr',
|
166
|
-
// $FlowFixMe
|
167
169
|
node,
|
168
170
|
},
|
169
171
|
});
|
@@ -1,22 +1,19 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
import {type PostHTMLNode, render} from 'posthtml-render';
|
1
|
+
import {PostHTMLNode, render} from 'posthtml-render';
|
4
2
|
import {parseHTML, transformerOpts} from '../src/HTMLTransformer';
|
5
3
|
import assert from 'assert';
|
6
4
|
import type {PluginOptions} from '../../../core/types-internal/src';
|
7
5
|
|
8
6
|
function normalizeHTML(code: string): string {
|
9
7
|
const ast = parseHTML(code, true);
|
10
|
-
// $FlowFixMe
|
11
8
|
const result = renderHTML(ast);
|
12
9
|
const lines = result
|
13
10
|
.split('\n')
|
14
|
-
.map((line) => line.trim())
|
15
|
-
.filter((line) => line);
|
11
|
+
.map((line: any) => line.trim())
|
12
|
+
.filter((line: any) => line);
|
16
13
|
return lines.join('');
|
17
14
|
}
|
18
15
|
|
19
|
-
function renderHTML(newAST: {
|
16
|
+
function renderHTML(newAST: {program: PostHTMLNode}): string {
|
20
17
|
return render(newAST.program, {
|
21
18
|
closingSingleTag: 'slash',
|
22
19
|
});
|
@@ -24,24 +21,24 @@ function renderHTML(newAST: {|program: PostHTMLNode|}): string {
|
|
24
21
|
|
25
22
|
async function runTestTransform(
|
26
23
|
code: string,
|
27
|
-
options: {
|
28
|
-
shouldScopeHoist: boolean
|
29
|
-
supportsEsmodules: boolean
|
30
|
-
hmrOptions: PluginOptions['hmrOptions']
|
31
|
-
|
24
|
+
options: {
|
25
|
+
shouldScopeHoist: boolean;
|
26
|
+
supportsEsmodules: boolean;
|
27
|
+
hmrOptions: PluginOptions['hmrOptions'];
|
28
|
+
} = {
|
32
29
|
shouldScopeHoist: true,
|
33
30
|
supportsEsmodules: true,
|
34
31
|
hmrOptions: null,
|
35
32
|
},
|
36
33
|
) {
|
37
|
-
const dependencies = [];
|
34
|
+
const dependencies: Array<any> = [];
|
38
35
|
let newAST = null;
|
39
36
|
const asset = {
|
40
37
|
getAST: () => parseHTML(code, true),
|
41
|
-
setAST: (n) => {
|
38
|
+
setAST: (n: any) => {
|
42
39
|
newAST = n;
|
43
40
|
},
|
44
|
-
addURLDependency(url, opts) {
|
41
|
+
addURLDependency(url: string, opts: Partial<DependencyOptions>) {
|
45
42
|
dependencies.push({url, opts});
|
46
43
|
return `dependency-id::${url}`;
|
47
44
|
},
|
@@ -53,34 +50,31 @@ async function runTestTransform(
|
|
53
50
|
return options.supportsEsmodules;
|
54
51
|
},
|
55
52
|
},
|
56
|
-
addDependency(specifier, specifierType) {
|
53
|
+
addDependency(specifier: DependencyOptions, specifierType: undefined) {
|
57
54
|
dependencies.push({specifier, specifierType});
|
58
55
|
return 'dependency-id';
|
59
56
|
},
|
60
|
-
};
|
57
|
+
} as const;
|
61
58
|
|
62
59
|
const transformInput = {
|
63
60
|
asset,
|
64
61
|
options: {
|
65
62
|
hmrOptions: options.hmrOptions,
|
66
63
|
},
|
67
|
-
};
|
68
|
-
// $FlowFixMe
|
64
|
+
} as const;
|
69
65
|
const transformResult = await transformerOpts.transform(transformInput);
|
70
66
|
|
71
|
-
// $FlowFixMe
|
72
67
|
const outputCode = renderHTML(newAST);
|
73
68
|
|
74
69
|
return {dependencies, newAST, outputCode, transformResult, inputAsset: asset};
|
75
70
|
}
|
76
71
|
|
77
|
-
function normalizeDependencies(dependencies) {
|
78
|
-
return dependencies.map((dependency) => ({
|
72
|
+
function normalizeDependencies(dependencies: any) {
|
73
|
+
return dependencies.map((dependency: any) => ({
|
79
74
|
...dependency,
|
80
75
|
opts: {
|
81
76
|
...dependency.opts,
|
82
77
|
env: {
|
83
|
-
// $FlowFixMe
|
84
78
|
...dependency.opts.env,
|
85
79
|
loc: null,
|
86
80
|
},
|
@@ -88,9 +82,8 @@ function normalizeDependencies(dependencies) {
|
|
88
82
|
}));
|
89
83
|
}
|
90
84
|
|
91
|
-
function normalizeAssets(assets) {
|
92
|
-
return assets.map((asset) => {
|
93
|
-
// $FlowFixMe
|
85
|
+
function normalizeAssets(assets: any) {
|
86
|
+
return assets.map((asset: any) => {
|
94
87
|
return {
|
95
88
|
...asset,
|
96
89
|
env: null,
|
@@ -189,7 +182,7 @@ describe('HTMLTransformer', () => {
|
|
189
182
|
sourceType: 'script',
|
190
183
|
},
|
191
184
|
priority: 'parallel',
|
192
|
-
};
|
185
|
+
} as const;
|
193
186
|
assert.deepEqual(normalizeDependencies(dependencies), [
|
194
187
|
{
|
195
188
|
url: 'input1.js',
|
package/tsconfig.json
ADDED