@gravity-ui/app-builder 0.8.5 → 0.8.7

package/dist/common/models/index.d.ts

@@ -12,6 +12,7 @@ import type { ForkTsCheckerWebpackPluginOptions } from 'fork-ts-checker-webpack-
 import type { Options as StatoscopeOptions } from '@statoscope/webpack-plugin';
 import type { SentryWebpackPluginOptions } from '@sentry/webpack-plugin';
 import type { WebpackMode } from '../webpack/config';
+import type { UploadOptions } from '../s3-upload/upload';
 export interface Entities<T> {
     data: Record<string, T>;
     keys: string[];
@@ -187,12 +188,13 @@ export interface ClientConfig {
         configType: `${WebpackMode}`;
     }) => Babel.TransformOptions | Promise<Babel.TransformOptions>;
 }
-interface CdnUploadConfig {
+export interface CdnUploadConfig {
     bucket: string;
     prefix?: string;
     region?: string;
     endpoint?: string;
     compress?: boolean;
+    cacheControl?: UploadOptions['cacheControl'];
     /**
      * pattern for additional files in build that need to be loaded to CDN
      */

package/dist/common/s3-upload/s3-client.d.ts

@@ -10,6 +10,7 @@ export declare function getS3Client(options: S3ClientOptions): {
 interface UploadOptionsCommon {
     expires?: PutObjectCommandInput['Expires'];
     meta?: PutObjectCommandInput['Metadata'];
+    cacheControl?: PutObjectCommandInput['CacheControl'];
 }
 export interface S3UploadDirOptions extends UploadOptionsCommon {
     concurrency?: number;

package/dist/common/s3-upload/s3-client.js

@@ -64,6 +64,9 @@ function getS3Client(options) {
             if (expires) {
                 params.Metadata = { ...params.Metadata, Expires: expires.toString() };
             }
+            if (opts.cacheControl) {
+                params.CacheControl = opts.cacheControl;
+            }
             return s3Client.send(new client_s3_1.PutObjectCommand(params));
         },
         uploadDir(bucket, dirPath, keyPrefix = '', { concurrency = 512, ...opts } = {}) {

package/dist/common/s3-upload/upload.d.ts

@@ -5,6 +5,7 @@ export interface UploadOptions {
     sourcePath: string;
     targetPath?: string;
     existsBehavior?: 'overwrite' | 'throw' | 'ignore';
+    cacheControl?: string | ((filename: string) => string);
 }
 export interface UploadFilesOptions {
     s3: S3ClientOptions;

package/dist/common/s3-upload/upload.js

@@ -75,7 +75,12 @@ function uploadFiles(files, config) {
                     }
                 }
             }
-            return uploadFile(options.bucket, sourceFilePath, targetFilePath)
+            const cacheControl = typeof options.cacheControl === 'function'
+                ? options.cacheControl(targetFilePath)
+                : options.cacheControl;
+            return uploadFile(options.bucket, sourceFilePath, targetFilePath, {
+                cacheControl,
+            })
                 .then(() => {
                 log.message(`Uploaded ${relativeFilePath} => ${targetFilePath}`);
                 return relativeFilePath;

package/dist/common/s3-upload/webpack-plugin.d.ts

@@ -7,7 +7,7 @@ interface S3UploadPluginOptions {
     exclude?: Rule | Rule[];
     compress?: boolean;
     s3ClientOptions: S3ClientOptions;
-    s3UploadOptions: Pick<UploadOptions, 'bucket' | 'targetPath' | 'existsBehavior'>;
+    s3UploadOptions: Pick<UploadOptions, 'bucket' | 'targetPath' | 'existsBehavior' | 'cacheControl'>;
     additionalPattern?: string | string[];
     logger?: Logger;
 }

package/dist/common/webpack/config.js

@@ -709,6 +709,7 @@ function configurePlugins(options) {
                 s3UploadOptions: {
                     bucket: cdn.bucket,
                     targetPath: cdn.prefix,
+                    cacheControl: cdn.cacheControl,
                 },
                 additionalPattern: cdn.additionalPattern,
                 logger: options.logger,

package/dist/common/webpack/worker/web-worker.mjs

@@ -20,7 +20,7 @@ function generateWorkerLoader(url) {
     const publicPath = __webpack_public_path__;
     const workerPublicPath = publicPath.match(/^https?:\/\//)
         ? publicPath
-        : new URL(publicPath, window.location.href).toString();
+        : new URL(publicPath, window.location.origin).toString();
     const objectURL = URL.createObjectURL(new Blob([
         [
             `self.__PUBLIC_PATH__ = ${JSON.stringify(workerPublicPath)}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/app-builder",
-  "version": "0.8.5",
+  "version": "0.8.7",
   "description": "Develop and build your React client-server projects, powered by typescript and webpack",
   "license": "MIT",
   "type": "commonjs",