@tramvai/cli 4.4.4 → 4.4.6

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.
Files changed (13) hide show
  1. package/lib/library/webpack/loaders/image-loader/getImageMiniatureURL.d.ts +1 -1
  2. package/lib/library/webpack/loaders/image-loader/getImageMiniatureURL.d.ts.map +1 -1
  3. package/lib/library/webpack/loaders/image-loader/getImageMiniatureURL.js +7 -1
  4. package/lib/library/webpack/loaders/image-loader/getImageMiniatureURL.js.map +1 -1
  5. package/lib/library/webpack/loaders/image-loader/index.d.ts.map +1 -1
  6. package/lib/library/webpack/loaders/image-loader/index.js +1 -1
  7. package/lib/library/webpack/loaders/image-loader/index.js.map +1 -1
  8. package/lib/typings/application.d.ts +1 -1
  9. package/lib/typings/application.d.ts.map +1 -1
  10. package/package.json +2 -2
  11. package/src/library/webpack/loaders/image-loader/getImageMiniatureURL.ts +9 -8
  12. package/src/library/webpack/loaders/image-loader/index.ts +1 -6
  13. package/src/typings/application.ts +1 -1
package/lib/library/webpack/loaders/image-loader/getImageMiniatureURL.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- export declare const getImageMiniatureDataURL: (content: Buffer, width: number, height: number, extension: string) => Promise<string>;
1
+ export declare const getImageMiniatureDataURL: (content: Buffer, extension: string) => Promise<string>;
2
2
  //# sourceMappingURL=getImageMiniatureURL.d.ts.map
package/lib/library/webpack/loaders/image-loader/getImageMiniatureURL.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getImageMiniatureURL.d.ts","sourceRoot":"","sources":["../../../../../src/library/webpack/loaders/image-loader/getImageMiniatureURL.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,wBAAwB,YAC1B,MAAM,SACR,MAAM,UACL,MAAM,aACH,MAAM,oBAwBlB,CAAC"}
1
+ {"version":3,"file":"getImageMiniatureURL.d.ts","sourceRoot":"","sources":["../../../../../src/library/webpack/loaders/image-loader/getImageMiniatureURL.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,wBAAwB,YAAmB,MAAM,aAAa,MAAM,oBA6BhF,CAAC"}
package/lib/library/webpack/loaders/image-loader/getImageMiniatureURL.js CHANGED
@@ -2,9 +2,14 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getImageMiniatureDataURL = void 0;
4
4
  const tslib_1 = require("tslib");
5
+ const safeRequire_1 = require("../../../../utils/safeRequire");
5
6
  const BLUR_WIDTH = 10;
6
7
  const BLUR_HEIGHT = 10;
7
- const getImageMiniatureDataURL = (content, width, height, extension) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
8
+ const getImageMiniatureDataURL = (content, extension) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
9
+ const isSharpInstalled = Boolean((0, safeRequire_1.safeRequireResolve)('sharp'));
10
+ if (!isSharpInstalled) {
11
+ return null;
12
+ }
8
13
  try {
9
14
  const sharp = require('sharp');
10
15
  const image = sharp(content, { sequentialRead: true });
@@ -23,6 +28,7 @@ const getImageMiniatureDataURL = (content, width, height, extension) => tslib_1.
23
28
  }
24
29
  catch (e) {
25
30
  console.error('image placeholder generation error: ', e);
31
+ return null;
26
32
  }
27
33
  });
28
34
  exports.getImageMiniatureDataURL = getImageMiniatureDataURL;
package/lib/library/webpack/loaders/image-loader/getImageMiniatureURL.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getImageMiniatureURL.js","sourceRoot":"","sources":["../../../../../src/library/webpack/loaders/image-loader/getImageMiniatureURL.ts"],"names":[],"mappings":";;;;AAEA,MAAM,UAAU,GAAG,EAAE,CAAC;AACtB,MAAM,WAAW,GAAG,EAAE,CAAC;AAEhB,MAAM,wBAAwB,GAAG,CACtC,OAAe,EACf,KAAa,EACb,MAAc,EACd,SAAiB,EACjB,EAAE;IACF,IAAI;QACF,MAAM,KAAK,GAAiB,OAAO,CAAC,OAAO,CAAC,CAAC;QAE7C,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,oDAAoD;QACpD,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,WAAW,EAAE;YACpC,GAAG,EAAE,QAAQ;SACd,CAAC,CAAC;QACH,IAAI,SAAS,KAAK,MAAM,IAAI,SAAS,KAAK,KAAK,EAAE;YAC/C,KAAK,CAAC,IAAI,CAAC;gBACT,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;SACJ;QAED,MAAM,eAAe,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;QAE/C,MAAM,OAAO,GAAG,cAAc,SAAS,WAAW,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAEvF,OAAO,OAAO,CAAC;KAChB;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,CAAC,CAAC,CAAC;KAC1D;AACH,CAAC,CAAA,CAAC;AA5BW,QAAA,wBAAwB,4BA4BnC"}
1
+ {"version":3,"file":"getImageMiniatureURL.js","sourceRoot":"","sources":["../../../../../src/library/webpack/loaders/image-loader/getImageMiniatureURL.ts"],"names":[],"mappings":";;;;AAAA,+DAAmE;AAEnE,MAAM,UAAU,GAAG,EAAE,CAAC;AACtB,MAAM,WAAW,GAAG,EAAE,CAAC;AAEhB,MAAM,wBAAwB,GAAG,CAAO,OAAe,EAAE,SAAiB,EAAE,EAAE;IACnF,MAAM,gBAAgB,GAAG,OAAO,CAAC,IAAA,gCAAkB,EAAC,OAAO,CAAC,CAAC,CAAC;IAC9D,IAAI,CAAC,gBAAgB,EAAE;QACrB,OAAO,IAAI,CAAC;KACb;IAED,IAAI;QACF,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QAE/B,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,oDAAoD;QACpD,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,WAAW,EAAE;YACpC,GAAG,EAAE,QAAQ;SACd,CAAC,CAAC;QACH,IAAI,SAAS,KAAK,MAAM,IAAI,SAAS,KAAK,KAAK,EAAE;YAC/C,KAAK,CAAC,IAAI,CAAC;gBACT,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;SACJ;QAED,MAAM,eAAe,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;QAE/C,MAAM,OAAO,GAAG,cAAc,SAAS,WAAW,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAEvF,OAAO,OAAO,CAAC;KAChB;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,CAAC,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAA,CAAC;AA7BW,QAAA,wBAAwB,4BA6BnC"}
package/lib/library/webpack/loaders/image-loader/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/library/webpack/loaders/image-loader/index.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAI7C;;GAEG;AACH,yBAA+B,IAAI,EAAE,aAAa,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,gBA2BtE;AAED,eAAO,MAAM,GAAG,OAAO,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/library/webpack/loaders/image-loader/index.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAI7C;;GAEG;AACH,yBAA+B,IAAI,EAAE,aAAa,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,gBAsBtE;AAED,eAAO,MAAM,GAAG,OAAO,CAAC"}
package/lib/library/webpack/loaders/image-loader/index.js CHANGED
@@ -14,7 +14,7 @@ function default_1(content) {
14
14
  const dimensions = (0, image_size_1.default)(this.resourcePath);
15
15
  const options = this.getOptions();
16
16
  const extension = (0, loader_utils_1.interpolateName)(this, '[ext]', options);
17
- const dataURL = yield (0, getImageMiniatureURL_1.getImageMiniatureDataURL)(content, dimensions.width, dimensions.height, extension);
17
+ const dataURL = yield (0, getImageMiniatureURL_1.getImageMiniatureDataURL)(content, extension);
18
18
  return result.replace(/^export default (__webpack_public_path__ \+ .+);$/, `const path = $1;
19
19
 
20
20
  export default path;
package/lib/library/webpack/loaders/image-loader/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/library/webpack/loaders/image-loader/index.ts"],"names":[],"mappings":";;;;AAAA,oEAAgC;AAEhC,+CAA+C;AAC/C,iEAAkE;AAElE;;GAEG;AACH,mBAAwD,OAAe;;QACrE,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1D,MAAM,UAAU,GAAG,IAAA,oBAAM,EAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAElC,MAAM,SAAS,GAAG,IAAA,8BAAe,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAE1D,MAAM,OAAO,GAAG,MAAM,IAAA,+CAAwB,EAC5C,OAAO,EACP,UAAU,CAAC,KAAK,EAChB,UAAU,CAAC,MAAM,EACjB,SAAS,CACV,CAAC;QAEF,OAAO,MAAM,CAAC,OAAO,CACnB,mDAAmD,EACnD;;;;;;WAMO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC;YAC/B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC;iBAC5B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;GACrC,CACA,CAAC;IACJ,CAAC;CAAA;AA3BD,4BA2BC;AAEY,QAAA,GAAG,GAAG,IAAI,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/library/webpack/loaders/image-loader/index.ts"],"names":[],"mappings":";;;;AAAA,oEAAgC;AAEhC,+CAA+C;AAC/C,iEAAkE;AAElE;;GAEG;AACH,mBAAwD,OAAe;;QACrE,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1D,MAAM,UAAU,GAAG,IAAA,oBAAM,EAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAElC,MAAM,SAAS,GAAG,IAAA,8BAAe,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAE1D,MAAM,OAAO,GAAG,MAAM,IAAA,+CAAwB,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAEnE,OAAO,MAAM,CAAC,OAAO,CACnB,mDAAmD,EACnD;;;;;;WAMO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC;YAC/B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC;iBAC5B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;GACrC,CACA,CAAC;IACJ,CAAC;CAAA;AAtBD,4BAsBC;AAEY,QAAA,GAAG,GAAG,IAAI,CAAC"}
package/lib/typings/application.d.ts CHANGED
@@ -2,7 +2,7 @@ interface ImageObject {
2
2
  src: string;
3
3
  width: number;
4
4
  height: number;
5
- blurDataURL: string;
5
+ blurDataURL: string | null;
6
6
  }
7
7
  declare module '*.css' {
8
8
  interface IClassNames {
package/lib/typings/application.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../src/typings/application.ts"],"names":[],"mappings":"AAAA,UAAU,WAAW;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,OAAO,QAAQ,OAAO,CAAC;IACrB,UAAU,WAAW;QACnB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;KAC7B;IACD,MAAM,UAAU,EAAE,WAAW,CAAC;IAC9B,SAAS,UAAU,CAAC;CACrB;AAED,OAAO,QAAQ,SAAS,CAAC;IACvB,MAAM,IAAI,EAAE,MAAM,CAAC;IACnB,SAAS,IAAI,CAAC;CACf;AAED,KAAK,WAAW,GAAG,MAAM,CAAC;AAE1B,OAAO,QAAQ,OAAO,CAAC;IACrB,MAAM,GAAG,EAAE,WAAW,CAAC;IACvB,eAAe,GAAG,CAAC;IACnB,MAAM,CAAC,MAAM,KAAK,EAAE,WAAW,CAAC;CACjC;AACD,OAAO,QAAQ,OAAO,CAAC;IACrB,MAAM,GAAG,EAAE,WAAW,CAAC;IACvB,eAAe,GAAG,CAAC;IACnB,MAAM,CAAC,MAAM,KAAK,EAAE,WAAW,CAAC;CACjC;AACD,OAAO,QAAQ,QAAQ,CAAC;IACtB,MAAM,GAAG,EAAE,WAAW,CAAC;IACvB,eAAe,GAAG,CAAC;IACnB,MAAM,CAAC,MAAM,KAAK,EAAE,WAAW,CAAC;CACjC;AACD,OAAO,QAAQ,QAAQ,CAAC;IACtB,MAAM,GAAG,EAAE,WAAW,CAAC;IACvB,eAAe,GAAG,CAAC;IACnB,MAAM,CAAC,MAAM,KAAK,EAAE,WAAW,CAAC;CACjC;AAED,OAAO,QAAQ,OAAO,CAAC;IACrB,MAAM,KAAK,EAAE,WAAW,CAAC;IACzB,SAAS,KAAK,CAAC;CAChB;AACD,OAAO,QAAQ,aAAa,CAAC;IAC3B,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;IAErD,KAAK,YAAY,GAAG,aAAa,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;IAExD;;OAEG;IACH,MAAM,GAAG,EAAE,YAAY,CAAC;IAExB,SAAS,GAAG,CAAC;CACd"}
1
+ {"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../src/typings/application.ts"],"names":[],"mappings":"AAAA,UAAU,WAAW;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,OAAO,QAAQ,OAAO,CAAC;IACrB,UAAU,WAAW;QACnB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;KAC7B;IACD,MAAM,UAAU,EAAE,WAAW,CAAC;IAC9B,SAAS,UAAU,CAAC;CACrB;AAED,OAAO,QAAQ,SAAS,CAAC;IACvB,MAAM,IAAI,EAAE,MAAM,CAAC;IACnB,SAAS,IAAI,CAAC;CACf;AAED,KAAK,WAAW,GAAG,MAAM,CAAC;AAE1B,OAAO,QAAQ,OAAO,CAAC;IACrB,MAAM,GAAG,EAAE,WAAW,CAAC;IACvB,eAAe,GAAG,CAAC;IACnB,MAAM,CAAC,MAAM,KAAK,EAAE,WAAW,CAAC;CACjC;AACD,OAAO,QAAQ,OAAO,CAAC;IACrB,MAAM,GAAG,EAAE,WAAW,CAAC;IACvB,eAAe,GAAG,CAAC;IACnB,MAAM,CAAC,MAAM,KAAK,EAAE,WAAW,CAAC;CACjC;AACD,OAAO,QAAQ,QAAQ,CAAC;IACtB,MAAM,GAAG,EAAE,WAAW,CAAC;IACvB,eAAe,GAAG,CAAC;IACnB,MAAM,CAAC,MAAM,KAAK,EAAE,WAAW,CAAC;CACjC;AACD,OAAO,QAAQ,QAAQ,CAAC;IACtB,MAAM,GAAG,EAAE,WAAW,CAAC;IACvB,eAAe,GAAG,CAAC;IACnB,MAAM,CAAC,MAAM,KAAK,EAAE,WAAW,CAAC;CACjC;AAED,OAAO,QAAQ,OAAO,CAAC;IACrB,MAAM,KAAK,EAAE,WAAW,CAAC;IACzB,SAAS,KAAK,CAAC;CAChB;AACD,OAAO,QAAQ,aAAa,CAAC;IAC3B,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;IAErD,KAAK,YAAY,GAAG,aAAa,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;IAExD;;OAEG;IACH,MAAM,GAAG,EAAE,YAAY,CAAC;IAExB,SAAS,GAAG,CAAC;CACd"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tramvai/cli",
3
- "version": "4.4.4",
3
+ "version": "4.4.6",
4
4
  "description": "Cli инструмент для сборки и запуска приложений",
5
5
  "files": [
6
6
  "src",
@@ -72,7 +72,7 @@
72
72
  "@tinkoff/utils": "^2.1.3",
73
73
  "@tinkoff/webpack-dedupe-plugin": "3.0.1",
74
74
  "@tramvai/build": "5.0.1",
75
- "@tramvai/react": "4.4.4",
75
+ "@tramvai/react": "4.4.6",
76
76
  "@tramvai/tools-check-versions": "0.6.1",
77
77
  "@tramvai/tools-migrate": "0.8.1",
78
78
  "ajv": "^8.12.0",
package/src/library/webpack/loaders/image-loader/getImageMiniatureURL.ts CHANGED
@@ -1,16 +1,16 @@
1
- import type Sharp from 'sharp';
1
+ import { safeRequireResolve } from '../../../../utils/safeRequire';
2
2
 
3
3
  const BLUR_WIDTH = 10;
4
4
  const BLUR_HEIGHT = 10;
5
5
 
6
- export const getImageMiniatureDataURL = async (
7
- content: Buffer,
8
- width: number,
9
- height: number,
10
- extension: string
11
- ) => {
6
+ export const getImageMiniatureDataURL = async (content: Buffer, extension: string) => {
7
+ const isSharpInstalled = Boolean(safeRequireResolve('sharp'));
8
+ if (!isSharpInstalled) {
9
+ return null;
10
+ }
11
+
12
12
  try {
13
- const sharp: typeof Sharp = require('sharp');
13
+ const sharp = require('sharp');
14
14
 
15
15
  const image = sharp(content, { sequentialRead: true });
16
16
  // https://sharp.pixelplumbing.com/api-resize#resize
@@ -30,5 +30,6 @@ export const getImageMiniatureDataURL = async (
30
30
  return dataURL;
31
31
  } catch (e) {
32
32
  console.error('image placeholder generation error: ', e);
33
+ return null;
33
34
  }
34
35
  };
package/src/library/webpack/loaders/image-loader/index.ts CHANGED
@@ -13,12 +13,7 @@ export default async function (this: LoaderContext<{}>, content: Buffer) {
13
13
 
14
14
  const extension = interpolateName(this, '[ext]', options);
15
15
 
16
- const dataURL = await getImageMiniatureDataURL(
17
- content,
18
- dimensions.width,
19
- dimensions.height,
20
- extension
21
- );
16
+ const dataURL = await getImageMiniatureDataURL(content, extension);
22
17
 
23
18
  return result.replace(
24
19
  /^export default (__webpack_public_path__ \+ .+);$/,
package/src/typings/application.ts CHANGED
@@ -2,7 +2,7 @@ interface ImageObject {
2
2
  src: string;
3
3
  width: number;
4
4
  height: number;
5
- blurDataURL: string;
5
+ blurDataURL: string | null;
6
6
  }
7
7
 
8
8
  declare module '*.css' {