@atlaspack/transformer-image 3.1.5-canary.137 → 3.1.5-canary.139
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 +9 -0
- package/lib/ImageTransformer.d.ts +3 -0
- package/lib/ImageTransformer.js +11 -6
- package/lib/loadSharp.d.ts +1 -0
- package/lib/validateConfig.d.ts +1 -0
- package/package.json +12 -8
- package/src/{ImageTransformer.js → ImageTransformer.ts} +10 -9
- package/src/{loadSharp.js → loadSharp.ts} +0 -1
- package/src/{validateConfig.js → validateConfig.ts} +0 -1
- package/tsconfig.json +4 -0
package/CHANGELOG.md
CHANGED
package/lib/ImageTransformer.js
CHANGED
|
@@ -28,6 +28,8 @@ function _workers() {
|
|
|
28
28
|
}
|
|
29
29
|
var _loadSharp = _interopRequireDefault(require("./loadSharp"));
|
|
30
30
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
31
|
+
// @ts-expect-error TS1192
|
|
32
|
+
|
|
31
33
|
// from https://github.com/lovell/sharp/blob/df7b8ba73808fc494be413e88cfb621b6279218c/lib/output.js#L6-L17
|
|
32
34
|
const FORMATS = new Map([['jpeg', 'jpeg'], ['jpg', 'jpeg'], ['png', 'png'], ['webp', 'webp'], ['gif', 'gif'], ['tiff', 'tiff'], ['avif', 'avif'], ['heic', 'heif'], ['heif', 'heif']]);
|
|
33
35
|
let isSharpLoadedOnMainThread = false;
|
|
@@ -58,17 +60,20 @@ var _default = exports.default = new (_plugin().Transformer)({
|
|
|
58
60
|
if (!originalFormat) {
|
|
59
61
|
throw new Error(`The image transformer does not support ${asset.type} images.`);
|
|
60
62
|
}
|
|
61
|
-
const width = asset.query.has('width') ?
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
63
|
+
const width = asset.query.has('width') ?
|
|
64
|
+
// @ts-expect-error TS2345
|
|
65
|
+
parseInt(asset.query.get('width'), 10) : null;
|
|
66
|
+
const height = asset.query.has('height') ?
|
|
67
|
+
// @ts-expect-error TS2345
|
|
68
|
+
parseInt(asset.query.get('height'), 10) : null;
|
|
69
|
+
const quality = asset.query.has('quality') ?
|
|
70
|
+
// @ts-expect-error TS2345
|
|
71
|
+
parseInt(asset.query.get('quality'), 10) : config.quality;
|
|
66
72
|
let targetFormat = (_asset$query$get = asset.query.get('as')) === null || _asset$query$get === void 0 ? void 0 : _asset$query$get.toLowerCase().trim();
|
|
67
73
|
if (targetFormat && !FORMATS.has(targetFormat)) {
|
|
68
74
|
throw new Error(`The image transformer does not support ${targetFormat} images.`);
|
|
69
75
|
}
|
|
70
76
|
const format = (0, _nullthrows().default)(FORMATS.get(targetFormat || originalFormat));
|
|
71
|
-
// $FlowFixMe
|
|
72
77
|
const outputOptions = config[format];
|
|
73
78
|
if (width || height || quality || targetFormat || outputOptions) {
|
|
74
79
|
// Sharp must be required from the main thread as well to prevent errors when workers exit
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function validateConfig(data: any, filePath: string): void;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaspack/transformer-image",
|
|
3
|
-
"version": "3.1.5-canary.
|
|
3
|
+
"version": "3.1.5-canary.139+d2fd84977",
|
|
4
4
|
"license": "(MIT OR Apache-2.0)",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -9,15 +9,16 @@
|
|
|
9
9
|
"type": "git",
|
|
10
10
|
"url": "https://github.com/atlassian-labs/atlaspack.git"
|
|
11
11
|
},
|
|
12
|
-
"main": "lib/ImageTransformer.js",
|
|
13
|
-
"source": "src/ImageTransformer.
|
|
12
|
+
"main": "./lib/ImageTransformer.js",
|
|
13
|
+
"source": "./src/ImageTransformer.ts",
|
|
14
|
+
"types": "./lib/ImageTransformer.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/utils": "2.14.5-canary.
|
|
20
|
-
"@atlaspack/workers": "2.14.5-canary.
|
|
19
|
+
"@atlaspack/plugin": "2.14.5-canary.139+d2fd84977",
|
|
20
|
+
"@atlaspack/utils": "2.14.5-canary.139+d2fd84977",
|
|
21
|
+
"@atlaspack/workers": "2.14.5-canary.139+d2fd84977",
|
|
21
22
|
"nullthrows": "^1.1.1"
|
|
22
23
|
},
|
|
23
24
|
"devDependencies": {
|
|
@@ -27,5 +28,8 @@
|
|
|
27
28
|
"@atlaspack/core": "^2.13.1"
|
|
28
29
|
},
|
|
29
30
|
"type": "commonjs",
|
|
30
|
-
"
|
|
31
|
-
|
|
31
|
+
"scripts": {
|
|
32
|
+
"check-ts": "tsc --emitDeclarationOnly --rootDir src"
|
|
33
|
+
},
|
|
34
|
+
"gitHead": "d2fd849770fe6305e9c694bd97b1bd905abd9d94"
|
|
35
|
+
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
// @flow
|
|
2
1
|
import {validateConfig} from './validateConfig';
|
|
3
2
|
import {Transformer} from '@atlaspack/plugin';
|
|
4
3
|
import nullthrows from 'nullthrows';
|
|
5
4
|
import WorkerFarm from '@atlaspack/workers';
|
|
5
|
+
// @ts-expect-error TS1192
|
|
6
6
|
import loadSharp from './loadSharp';
|
|
7
7
|
|
|
8
8
|
// from https://github.com/lovell/sharp/blob/df7b8ba73808fc494be413e88cfb621b6279218c/lib/output.js#L6-L17
|
|
@@ -20,7 +20,7 @@ const FORMATS = new Map([
|
|
|
20
20
|
|
|
21
21
|
let isSharpLoadedOnMainThread = false;
|
|
22
22
|
|
|
23
|
-
export default
|
|
23
|
+
export default new Transformer({
|
|
24
24
|
async loadConfig({config}) {
|
|
25
25
|
let configFile: any = await config.getConfig(
|
|
26
26
|
['sharp.config.json'], // '.sharprc', '.sharprc.json'
|
|
@@ -46,15 +46,17 @@ export default (new Transformer({
|
|
|
46
46
|
}
|
|
47
47
|
|
|
48
48
|
const width = asset.query.has('width')
|
|
49
|
-
?
|
|
49
|
+
? // @ts-expect-error TS2345
|
|
50
|
+
parseInt(asset.query.get('width'), 10)
|
|
50
51
|
: null;
|
|
51
52
|
const height = asset.query.has('height')
|
|
52
|
-
?
|
|
53
|
+
? // @ts-expect-error TS2345
|
|
54
|
+
parseInt(asset.query.get('height'), 10)
|
|
53
55
|
: null;
|
|
54
56
|
const quality = asset.query.has('quality')
|
|
55
|
-
?
|
|
56
|
-
|
|
57
|
-
|
|
57
|
+
? // @ts-expect-error TS2345
|
|
58
|
+
parseInt(asset.query.get('quality'), 10)
|
|
59
|
+
: config.quality;
|
|
58
60
|
let targetFormat = asset.query.get('as')?.toLowerCase().trim();
|
|
59
61
|
if (targetFormat && !FORMATS.has(targetFormat)) {
|
|
60
62
|
throw new Error(
|
|
@@ -63,7 +65,6 @@ export default (new Transformer({
|
|
|
63
65
|
}
|
|
64
66
|
|
|
65
67
|
const format = nullthrows(FORMATS.get(targetFormat || originalFormat));
|
|
66
|
-
// $FlowFixMe
|
|
67
68
|
const outputOptions = config[format];
|
|
68
69
|
|
|
69
70
|
if (width || height || quality || targetFormat || outputOptions) {
|
|
@@ -119,4 +120,4 @@ export default (new Transformer({
|
|
|
119
120
|
|
|
120
121
|
return [asset];
|
|
121
122
|
},
|
|
122
|
-
})
|
|
123
|
+
}) as Transformer<unknown>;
|
package/tsconfig.json
ADDED