@atlaspack/packager-svg 2.14.5-canary.16 → 2.14.5-canary.161
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 +175 -0
- package/lib/SVGPackager.js +10 -4
- package/lib/types/SVGPackager.d.ts +3 -0
- package/package.json +12 -7
- package/src/{SVGPackager.js → SVGPackager.ts} +39 -17
- package/tsconfig.json +4 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,180 @@
|
|
|
1
1
|
# @atlaspack/packager-svg
|
|
2
2
|
|
|
3
|
+
## 2.14.25
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies []:
|
|
8
|
+
- @atlaspack/utils@2.18.2
|
|
9
|
+
- @atlaspack/plugin@2.14.25
|
|
10
|
+
- @atlaspack/types@2.15.15
|
|
11
|
+
|
|
12
|
+
## 2.14.24
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- Updated dependencies []:
|
|
17
|
+
- @atlaspack/utils@2.18.1
|
|
18
|
+
- @atlaspack/plugin@2.14.24
|
|
19
|
+
- @atlaspack/types@2.15.14
|
|
20
|
+
|
|
21
|
+
## 2.14.23
|
|
22
|
+
|
|
23
|
+
### Patch Changes
|
|
24
|
+
|
|
25
|
+
- Updated dependencies [[`23d561e`](https://github.com/atlassian-labs/atlaspack/commit/23d561e51e68b0c38fd1ff4e4fb173e5e7b01cf2)]:
|
|
26
|
+
- @atlaspack/utils@2.18.0
|
|
27
|
+
- @atlaspack/types@2.15.13
|
|
28
|
+
- @atlaspack/plugin@2.14.23
|
|
29
|
+
|
|
30
|
+
## 2.14.22
|
|
31
|
+
|
|
32
|
+
### Patch Changes
|
|
33
|
+
|
|
34
|
+
- [#720](https://github.com/atlassian-labs/atlaspack/pull/720) [`d2fd849`](https://github.com/atlassian-labs/atlaspack/commit/d2fd849770fe6305e9c694bd97b1bd905abd9d94) Thanks [@alshdavid](https://github.com/alshdavid)! - Migrate to TypeScript
|
|
35
|
+
|
|
36
|
+
- Updated dependencies [[`d2fd849`](https://github.com/atlassian-labs/atlaspack/commit/d2fd849770fe6305e9c694bd97b1bd905abd9d94)]:
|
|
37
|
+
- @atlaspack/plugin@2.14.22
|
|
38
|
+
- @atlaspack/types@2.15.12
|
|
39
|
+
- @atlaspack/utils@2.17.4
|
|
40
|
+
|
|
41
|
+
## 2.14.21
|
|
42
|
+
|
|
43
|
+
### Patch Changes
|
|
44
|
+
|
|
45
|
+
- Updated dependencies []:
|
|
46
|
+
- @atlaspack/types@2.15.11
|
|
47
|
+
- @atlaspack/utils@2.17.3
|
|
48
|
+
- @atlaspack/plugin@2.14.21
|
|
49
|
+
|
|
50
|
+
## 2.14.20
|
|
51
|
+
|
|
52
|
+
### Patch Changes
|
|
53
|
+
|
|
54
|
+
- [#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
|
|
55
|
+
|
|
56
|
+
- Updated dependencies [[`daaa768`](https://github.com/atlassian-labs/atlaspack/commit/daaa7688786772d7e3713b71c5bba6b89ec704aa)]:
|
|
57
|
+
- @atlaspack/plugin@2.14.20
|
|
58
|
+
- @atlaspack/utils@2.17.2
|
|
59
|
+
- @atlaspack/types@2.15.10
|
|
60
|
+
|
|
61
|
+
## 2.14.19
|
|
62
|
+
|
|
63
|
+
### Patch Changes
|
|
64
|
+
|
|
65
|
+
- Updated dependencies []:
|
|
66
|
+
- @atlaspack/utils@2.17.1
|
|
67
|
+
- @atlaspack/types@2.15.9
|
|
68
|
+
- @atlaspack/plugin@2.14.19
|
|
69
|
+
|
|
70
|
+
## 2.14.18
|
|
71
|
+
|
|
72
|
+
### Patch Changes
|
|
73
|
+
|
|
74
|
+
- Updated dependencies [[`dbb4072`](https://github.com/atlassian-labs/atlaspack/commit/dbb40721ebeb45990a14ba04e6b44e7f836fb32d), [`de23e0c`](https://github.com/atlassian-labs/atlaspack/commit/de23e0ce49d5504fe3947ac26640a3d951087da3), [`18a57cf`](https://github.com/atlassian-labs/atlaspack/commit/18a57cf8a4789b2de5ad8e2676f317a26cc91417), [`a5ed1b4`](https://github.com/atlassian-labs/atlaspack/commit/a5ed1b414498560f393ff491af4da25b6e8dde56)]:
|
|
75
|
+
- @atlaspack/utils@2.17.0
|
|
76
|
+
- @atlaspack/types@2.15.8
|
|
77
|
+
- @atlaspack/plugin@2.14.18
|
|
78
|
+
|
|
79
|
+
## 2.14.17
|
|
80
|
+
|
|
81
|
+
### Patch Changes
|
|
82
|
+
|
|
83
|
+
- Updated dependencies []:
|
|
84
|
+
- @atlaspack/utils@2.16.1
|
|
85
|
+
- @atlaspack/types@2.15.7
|
|
86
|
+
- @atlaspack/plugin@2.14.17
|
|
87
|
+
|
|
88
|
+
## 2.14.16
|
|
89
|
+
|
|
90
|
+
### Patch Changes
|
|
91
|
+
|
|
92
|
+
- Updated dependencies [[`30ee2cf`](https://github.com/atlassian-labs/atlaspack/commit/30ee2cfcd34cf2646ded0eda13fdb80a2a5de529)]:
|
|
93
|
+
- @atlaspack/utils@2.16.0
|
|
94
|
+
- @atlaspack/types@2.15.6
|
|
95
|
+
- @atlaspack/plugin@2.14.16
|
|
96
|
+
|
|
97
|
+
## 2.14.15
|
|
98
|
+
|
|
99
|
+
### Patch Changes
|
|
100
|
+
|
|
101
|
+
- Updated dependencies []:
|
|
102
|
+
- @atlaspack/utils@2.15.3
|
|
103
|
+
- @atlaspack/types@2.15.5
|
|
104
|
+
- @atlaspack/plugin@2.14.15
|
|
105
|
+
|
|
106
|
+
## 2.14.14
|
|
107
|
+
|
|
108
|
+
### Patch Changes
|
|
109
|
+
|
|
110
|
+
- Updated dependencies []:
|
|
111
|
+
- @atlaspack/utils@2.15.2
|
|
112
|
+
- @atlaspack/types@2.15.4
|
|
113
|
+
- @atlaspack/plugin@2.14.14
|
|
114
|
+
|
|
115
|
+
## 2.14.13
|
|
116
|
+
|
|
117
|
+
### Patch Changes
|
|
118
|
+
|
|
119
|
+
- Updated dependencies []:
|
|
120
|
+
- @atlaspack/types@2.15.3
|
|
121
|
+
- @atlaspack/utils@2.15.1
|
|
122
|
+
- @atlaspack/plugin@2.14.13
|
|
123
|
+
|
|
124
|
+
## 2.14.12
|
|
125
|
+
|
|
126
|
+
### Patch Changes
|
|
127
|
+
|
|
128
|
+
- Updated dependencies [[`e39c6cf`](https://github.com/atlassian-labs/atlaspack/commit/e39c6cf05f7e95ce5420dbcea66f401b1cbd397c)]:
|
|
129
|
+
- @atlaspack/utils@2.15.0
|
|
130
|
+
- @atlaspack/types@2.15.2
|
|
131
|
+
- @atlaspack/plugin@2.14.12
|
|
132
|
+
|
|
133
|
+
## 2.14.11
|
|
134
|
+
|
|
135
|
+
### Patch Changes
|
|
136
|
+
|
|
137
|
+
- Updated dependencies []:
|
|
138
|
+
- @atlaspack/utils@2.14.11
|
|
139
|
+
- @atlaspack/types@2.15.1
|
|
140
|
+
- @atlaspack/plugin@2.14.11
|
|
141
|
+
|
|
142
|
+
## 2.14.10
|
|
143
|
+
|
|
144
|
+
### Patch Changes
|
|
145
|
+
|
|
146
|
+
- Updated dependencies [[`51aba5f`](https://github.com/atlassian-labs/atlaspack/commit/51aba5fc0e49235ee06bbc3c376f48c3e7da5c4b), [`1e32d4e`](https://github.com/atlassian-labs/atlaspack/commit/1e32d4eae6b3af3968e8a0ef97d35b4347fd4196)]:
|
|
147
|
+
- @atlaspack/types@2.15.0
|
|
148
|
+
- @atlaspack/plugin@2.14.10
|
|
149
|
+
- @atlaspack/utils@2.14.10
|
|
150
|
+
|
|
151
|
+
## 2.14.9
|
|
152
|
+
|
|
153
|
+
### Patch Changes
|
|
154
|
+
|
|
155
|
+
- Updated dependencies []:
|
|
156
|
+
- @atlaspack/utils@2.14.9
|
|
157
|
+
- @atlaspack/types@2.14.9
|
|
158
|
+
- @atlaspack/plugin@2.14.9
|
|
159
|
+
|
|
160
|
+
## 2.14.8
|
|
161
|
+
|
|
162
|
+
### Patch Changes
|
|
163
|
+
|
|
164
|
+
- Updated dependencies []:
|
|
165
|
+
- @atlaspack/utils@2.14.8
|
|
166
|
+
- @atlaspack/types@2.14.8
|
|
167
|
+
- @atlaspack/plugin@2.14.8
|
|
168
|
+
|
|
169
|
+
## 2.14.7
|
|
170
|
+
|
|
171
|
+
### Patch Changes
|
|
172
|
+
|
|
173
|
+
- Updated dependencies []:
|
|
174
|
+
- @atlaspack/utils@2.14.7
|
|
175
|
+
- @atlaspack/types@2.14.7
|
|
176
|
+
- @atlaspack/plugin@2.14.7
|
|
177
|
+
|
|
3
178
|
## 2.14.6
|
|
4
179
|
|
|
5
180
|
### Patch Changes
|
package/lib/SVGPackager.js
CHANGED
|
@@ -39,6 +39,7 @@ var _default = exports.default = new (_plugin().Packager)({
|
|
|
39
39
|
bundleGraph,
|
|
40
40
|
getInlineBundleContents
|
|
41
41
|
}) {
|
|
42
|
+
// @ts-expect-error TS2552
|
|
42
43
|
const assets = [];
|
|
43
44
|
bundle.traverseAssets(asset => {
|
|
44
45
|
assets.push(asset);
|
|
@@ -52,16 +53,19 @@ var _default = exports.default = new (_plugin().Packager)({
|
|
|
52
53
|
})))];
|
|
53
54
|
const asset = assets[0];
|
|
54
55
|
const code = await asset.getCode();
|
|
55
|
-
|
|
56
|
-
html: svg
|
|
57
|
-
} = await (0, _posthtml().default)([tree => insertBundleReferences(referencedBundles, tree), tree => replaceInlineAssetContent(bundleGraph, getInlineBundleContents, tree)]).process(code, {
|
|
56
|
+
const options = {
|
|
58
57
|
directives: [{
|
|
59
58
|
name: /^\?/,
|
|
60
59
|
start: '<',
|
|
61
60
|
end: '>'
|
|
62
61
|
}],
|
|
63
62
|
xmlMode: true
|
|
64
|
-
}
|
|
63
|
+
};
|
|
64
|
+
let {
|
|
65
|
+
html: svg
|
|
66
|
+
} = await (0, _posthtml().default)([tree => insertBundleReferences(referencedBundles, tree), tree => replaceInlineAssetContent(bundleGraph, getInlineBundleContents, tree)
|
|
67
|
+
// @ts-expect-error TS2559
|
|
68
|
+
]).process(code, options);
|
|
65
69
|
const {
|
|
66
70
|
contents,
|
|
67
71
|
map
|
|
@@ -87,6 +91,7 @@ var _default = exports.default = new (_plugin().Packager)({
|
|
|
87
91
|
});
|
|
88
92
|
async function replaceInlineAssetContent(bundleGraph, getInlineBundleContents, tree) {
|
|
89
93
|
const inlineNodes = [];
|
|
94
|
+
// @ts-expect-error TS7006
|
|
90
95
|
tree.walk(node => {
|
|
91
96
|
if (node.attrs && node.attrs['data-parcel-key']) {
|
|
92
97
|
inlineNodes.push(node);
|
|
@@ -150,6 +155,7 @@ function insertBundleReferences(siblingBundles, tree) {
|
|
|
150
155
|
}
|
|
151
156
|
tree.unshift(...stylesheets);
|
|
152
157
|
if (scripts.length > 0) {
|
|
158
|
+
// @ts-expect-error TS7006
|
|
153
159
|
tree.match({
|
|
154
160
|
tag: 'svg'
|
|
155
161
|
}, node => {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaspack/packager-svg",
|
|
3
|
-
"version": "2.14.5-canary.
|
|
3
|
+
"version": "2.14.5-canary.161+ee040bb64",
|
|
4
4
|
"license": "(MIT OR Apache-2.0)",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -9,17 +9,22 @@
|
|
|
9
9
|
"type": "git",
|
|
10
10
|
"url": "https://github.com/atlassian-labs/atlaspack.git"
|
|
11
11
|
},
|
|
12
|
-
"main": "lib/SVGPackager.js",
|
|
13
|
-
"source": "src/SVGPackager.
|
|
12
|
+
"main": "./lib/SVGPackager.js",
|
|
13
|
+
"source": "./src/SVGPackager.ts",
|
|
14
|
+
"types": "./lib/types/SVGPackager.d.ts",
|
|
14
15
|
"engines": {
|
|
15
16
|
"node": ">= 16.0.0"
|
|
16
17
|
},
|
|
17
18
|
"dependencies": {
|
|
18
|
-
"@atlaspack/plugin": "2.14.5-canary.
|
|
19
|
-
"@atlaspack/types": "2.14.5-canary.
|
|
20
|
-
"@atlaspack/utils": "2.14.5-canary.
|
|
19
|
+
"@atlaspack/plugin": "2.14.5-canary.161+ee040bb64",
|
|
20
|
+
"@atlaspack/types": "2.14.5-canary.161+ee040bb64",
|
|
21
|
+
"@atlaspack/utils": "2.14.5-canary.161+ee040bb64",
|
|
21
22
|
"posthtml": "^0.16.4"
|
|
22
23
|
},
|
|
23
24
|
"type": "commonjs",
|
|
24
|
-
"
|
|
25
|
+
"scripts": {
|
|
26
|
+
"check-ts": "tsc --emitDeclarationOnly --rootDir src",
|
|
27
|
+
"build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
|
|
28
|
+
},
|
|
29
|
+
"gitHead": "ee040bb6428f29b57d892ddd8107e29077d08ffd"
|
|
25
30
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// @flow
|
|
2
|
-
|
|
3
1
|
import type {Bundle, BundleGraph, NamedBundle} from '@atlaspack/types';
|
|
4
2
|
import assert from 'assert';
|
|
5
3
|
import {Packager} from '@atlaspack/plugin';
|
|
@@ -12,9 +10,10 @@ import {
|
|
|
12
10
|
setSymmetricDifference,
|
|
13
11
|
} from '@atlaspack/utils';
|
|
14
12
|
|
|
15
|
-
export default
|
|
13
|
+
export default new Packager({
|
|
16
14
|
async package({bundle, bundleGraph, getInlineBundleContents}) {
|
|
17
|
-
|
|
15
|
+
// @ts-expect-error TS2552
|
|
16
|
+
const assets: Array<Asset> = [];
|
|
18
17
|
bundle.traverseAssets((asset) => {
|
|
19
18
|
assets.push(asset);
|
|
20
19
|
});
|
|
@@ -45,12 +44,13 @@ export default (new Packager({
|
|
|
45
44
|
},
|
|
46
45
|
],
|
|
47
46
|
xmlMode: true,
|
|
48
|
-
};
|
|
47
|
+
} as const;
|
|
49
48
|
|
|
50
49
|
let {html: svg} = await posthtml([
|
|
51
|
-
(tree) => insertBundleReferences(referencedBundles, tree),
|
|
52
|
-
(tree) =>
|
|
50
|
+
(tree: any) => insertBundleReferences(referencedBundles, tree),
|
|
51
|
+
(tree: any) =>
|
|
53
52
|
replaceInlineAssetContent(bundleGraph, getInlineBundleContents, tree),
|
|
53
|
+
// @ts-expect-error TS2559
|
|
54
54
|
]).process(code, options);
|
|
55
55
|
|
|
56
56
|
const {contents, map} = replaceURLReferences({
|
|
@@ -73,14 +73,21 @@ export default (new Packager({
|
|
|
73
73
|
map,
|
|
74
74
|
});
|
|
75
75
|
},
|
|
76
|
-
})
|
|
76
|
+
}) as Packager<unknown, unknown>;
|
|
77
77
|
|
|
78
78
|
async function replaceInlineAssetContent(
|
|
79
79
|
bundleGraph: BundleGraph<NamedBundle>,
|
|
80
|
-
getInlineBundleContents
|
|
81
|
-
|
|
80
|
+
getInlineBundleContents: (
|
|
81
|
+
arg1: Bundle,
|
|
82
|
+
arg2: BundleGraph<NamedBundle>,
|
|
83
|
+
// @ts-expect-error TS2304
|
|
84
|
+
) => Async<{
|
|
85
|
+
contents: Blob;
|
|
86
|
+
}>,
|
|
87
|
+
tree: any,
|
|
82
88
|
) {
|
|
83
|
-
const inlineNodes = [];
|
|
89
|
+
const inlineNodes: Array<any> = [];
|
|
90
|
+
// @ts-expect-error TS7006
|
|
84
91
|
tree.walk((node) => {
|
|
85
92
|
if (node.attrs && node.attrs['data-parcel-key']) {
|
|
86
93
|
inlineNodes.push(node);
|
|
@@ -118,10 +125,16 @@ async function replaceInlineAssetContent(
|
|
|
118
125
|
|
|
119
126
|
async function getAssetContent(
|
|
120
127
|
bundleGraph: BundleGraph<NamedBundle>,
|
|
121
|
-
getInlineBundleContents
|
|
122
|
-
|
|
128
|
+
getInlineBundleContents: (
|
|
129
|
+
arg1: Bundle,
|
|
130
|
+
arg2: BundleGraph<NamedBundle>,
|
|
131
|
+
// @ts-expect-error TS2304
|
|
132
|
+
) => Async<{
|
|
133
|
+
contents: Blob;
|
|
134
|
+
}>,
|
|
135
|
+
assetId: any,
|
|
123
136
|
) {
|
|
124
|
-
let inlineBundle:
|
|
137
|
+
let inlineBundle: Bundle | null | undefined;
|
|
125
138
|
bundleGraph.traverseBundles((bundle, context, {stop}) => {
|
|
126
139
|
const entryAssets = bundle.getEntryAssets();
|
|
127
140
|
if (entryAssets.some((a) => a.uniqueKey === assetId)) {
|
|
@@ -139,9 +152,17 @@ async function getAssetContent(
|
|
|
139
152
|
return {bundle: inlineBundle, contents: bundleResult.contents};
|
|
140
153
|
}
|
|
141
154
|
|
|
142
|
-
function insertBundleReferences(siblingBundles
|
|
143
|
-
let scripts
|
|
144
|
-
|
|
155
|
+
function insertBundleReferences(siblingBundles: Array<NamedBundle>, tree: any) {
|
|
156
|
+
let scripts: Array<
|
|
157
|
+
| any
|
|
158
|
+
| {
|
|
159
|
+
attrs: {
|
|
160
|
+
href: string;
|
|
161
|
+
};
|
|
162
|
+
tag: string;
|
|
163
|
+
}
|
|
164
|
+
> = [];
|
|
165
|
+
let stylesheets: Array<any | string> = [];
|
|
145
166
|
|
|
146
167
|
for (let bundle of siblingBundles) {
|
|
147
168
|
if (bundle.type === 'css') {
|
|
@@ -162,6 +183,7 @@ function insertBundleReferences(siblingBundles, tree) {
|
|
|
162
183
|
|
|
163
184
|
tree.unshift(...stylesheets);
|
|
164
185
|
if (scripts.length > 0) {
|
|
186
|
+
// @ts-expect-error TS7006
|
|
165
187
|
tree.match({tag: 'svg'}, (node) => {
|
|
166
188
|
node.content.unshift(...scripts);
|
|
167
189
|
});
|
package/tsconfig.json
ADDED