@uploadcare/file-uploader 1.19.5-alpha.0 → 1.19.6-alpha.0

package/abstract/UploaderBlock.d.ts

@@ -20,6 +20,10 @@ export class UploaderBlock extends ActivityBlock {
     };
     /** @private */
     private get hasCtxOwner();
+    /** @private */
+    private _unobserveCollection;
+    /** @private */
+    private _unobserveCollectionProperties;
     /**
      * @returns {ValidationManager}
      * @protected
@@ -32,12 +36,6 @@ export class UploaderBlock extends ActivityBlock {
     get uploadCollection(): TypedCollection<typeof uploadEntrySchema>;
     /** @private */
     private initCtxOwner;
-    /** @private */
-    private _unobserveCollection;
-    /** @private */
-    private _unobserveCollectionProperties;
-    /** @private */
-    private destroyCtxOwner;
     /**
      * @private
      * @param {import('../types').OutputCollectionState} collectionState

package/abstract/UploaderBlock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UploaderBlock.d.ts","sourceRoot":"","sources":["UploaderBlock.js"],"names":[],"mappings":"AAmBA;IACE,iBAAiB;IACjB,mCAAwB;IAExB,eAAe;IACf,mBAAmB;IAEnB;;;;;;;;;;;;;;MAA+B;IAE/B,eAAe;IACf,0BAOC;IA2BD;;;OAGG;IACH,mCAHa,iBAAiB,CAQ7B;IAED,mCAAmC;IACnC,WADc,iBAAiB,CAM9B;IAED,4BAEC;IAED,2DAA2D;IAC3D,wBADc,eAAe,CAAC,OAAO,iBAAiB,CAAC,CAMtD;IAsBD,eAAe;IACf,qBAkBC;IAfC,eAAe;IACf,6BAAiG;IAEjG,eAAe;IACf,uCAEC;IAWH,eAAe;IACf,wBASC;IAED;;;OAGG;IACH,qBAkBC;IAED,eAAe;IACf,0BAYQ;IAER;;;OAGG;IACH,gCAkCE;IAEF;;;OAGG;IACH,0CA6FE;IAEF,eAAe;IACf,mCAsBE;IAEF,6BAiBC;IAED,eAAe;IACf,uBAkDC;IAED;;;OAGG;IACH,kCAHW,MAAM,qEAWhB;IAED;;;OAGG;IACH,oCAHa,OAAO,CAAC,OAAO,2BAA2B,EAAE,eAAe,CAAC,CA4BxE;IAED,kEAAkE;IAClE,iBADc,OAAO,sBAAsB,EAAE,eAAe,EAAE,CAK7D;CACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BAxd6B,oBAAoB;qCAWb,2BAA2B;kCAG9B,wBAAwB;kCADxB,wBAAwB;gCAD1B,sBAAsB;kCAGpB,wBAAwB"}
+{"version":3,"file":"UploaderBlock.d.ts","sourceRoot":"","sources":["UploaderBlock.js"],"names":[],"mappings":"AAmBA;IACE,iBAAiB;IACjB,mCAAwB;IAExB,eAAe;IACf,mBAAmB;IAEnB;;;;;;;;;;;;;;MAA+B;IAE/B,eAAe;IACf,0BAOC;IAcC,eAAe;IACf,6BAAiG;IAEjG,eAAe;IACf,uCAEC;IAeH;;;OAGG;IACH,mCAHa,iBAAiB,CAQ7B;IAED,mCAAmC;IACnC,WADc,iBAAiB,CAM9B;IAED,4BAEC;IAED,2DAA2D;IAC3D,wBADc,eAAe,CAAC,OAAO,iBAAiB,CAAC,CAMtD;IAmBD,eAAe;IACf,qBAUC;IAED;;;OAGG;IACH,qBAkBC;IAED,eAAe;IACf,0BAYQ;IAER;;;OAGG;IACH,gCAkCE;IAEF;;;OAGG;IACH,0CA6FE;IAEF,eAAe;IACf,mCAsBE;IAEF,6BAiBC;IAED,eAAe;IACf,uBAkDC;IAED;;;OAGG;IACH,kCAHW,MAAM,qEAWhB;IAED;;;OAGG;IACH,oCAHa,OAAO,CAAC,OAAO,2BAA2B,EAAE,eAAe,CAAC,CA4BxE;IAED,kEAAkE;IAClE,iBADc,OAAO,sBAAsB,EAAE,eAAe,EAAE,CAK7D;CACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BAzc6B,oBAAoB;qCAWb,2BAA2B;kCAG9B,wBAAwB;kCADxB,wBAAwB;gCAD1B,sBAAsB;kCAGpB,wBAAwB"}

package/abstract/UploaderBlock.js

@@ -48,6 +48,14 @@ export class UploaderBlock extends ActivityBlock {
       this.add('*uploadCollection', uploadCollection);
     }
 
+    /** @private */
+    this._unobserveCollection = this.uploadCollection.observeCollection(this._handleCollectionUpdate);
+
+    /** @private */
+    this._unobserveCollectionProperties = this.uploadCollection.observeProperties(
+      this._handleCollectionPropertiesUpdate,
+    );
+
     if (!this.has('*publicApi')) {
       this.add('*publicApi', new UploaderPublicApi(this));
     }
@@ -94,9 +102,6 @@ export class UploaderBlock extends ActivityBlock {
 
   /** @protected */
   destroyCtxCallback() {
-    if (this.isCtxOwner) {
-      this.destroyCtxOwner();
-    }
     this.uploadCollection.destroy();
     this.$['*uploadCollection'] = null;
 
@@ -106,9 +111,9 @@ export class UploaderBlock extends ActivityBlock {
   destroyCallback() {
     super.destroyCallback();
 
-    if (this.isCtxOwner) {
-      this.destroyCtxOwner();
-    }
+    this._unobserveCollectionProperties?.();
+    this._unobserveCollection?.();
+
     this._flushOutputItems.cancel();
   }
 
@@ -116,14 +121,6 @@ export class UploaderBlock extends ActivityBlock {
   initCtxOwner() {
     this.isCtxOwner = true;
 
-    /** @private */
-    this._unobserveCollection = this.uploadCollection.observeCollection(this._handleCollectionUpdate);
-
-    /** @private */
-    this._unobserveCollectionProperties = this.uploadCollection.observeProperties(
-      this._handleCollectionPropertiesUpdate,
-    );
-
     this.subConfigValue('maxConcurrentRequests', (value) => {
       this.$['*uploadQueue'].concurrency = Number(value) || 1;
     });
@@ -133,18 +130,6 @@ export class UploaderBlock extends ActivityBlock {
     }
   }
 
-  /** @private */
-  destroyCtxOwner() {
-    if (!this.isCtxOwner) {
-      return;
-    }
-
-    this._unobserveCollectionProperties?.();
-    this._unobserveCollection?.();
-    this.$['*secureUploadsManager'] = null;
-    this.isCtxOwner = false;
-  }
-
   /**
    * @private
    * @param {import('../types').OutputCollectionState} collectionState

package/env.d.ts

@@ -1,4 +1,4 @@
 /** Do not edit this file manually. It's generated during build process. */
 export const PACKAGE_NAME: "blocks";
-export const PACKAGE_VERSION: "1.19.4";
+export const PACKAGE_VERSION: "1.19.5";
 //# sourceMappingURL=env.d.ts.map

package/env.js

@@ -1,3 +1,3 @@
 /** Do not edit this file manually. It's generated during build process. */
 export const PACKAGE_NAME = 'blocks';
-export const PACKAGE_VERSION = '1.19.4';
+export const PACKAGE_VERSION = '1.19.5';

package/index.ssr.d.ts

@@ -550,7 +550,7 @@ export namespace ModalEvents {
     let DESTROY: string;
 }
 export const PACKAGE_NAME: "blocks";
-export const PACKAGE_VERSION: "1.19.4";
+export const PACKAGE_VERSION: "1.19.5";
 export const PresenceToggle: {
     new (): {};
     template: string;

package/index.ssr.js

@@ -1070,7 +1070,7 @@ export const ModalEvents = {
   DESTROY: "modal:destroy",
 };
 export const PACKAGE_NAME = `blocks`;
-export const PACKAGE_VERSION = `1.19.4`;
+export const PACKAGE_VERSION = `1.19.5`;
 export const PresenceToggle = class {
   static template = `<slot></slot> `;
   static reg = () => {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uploadcare/file-uploader",
-  "version": "1.19.5-alpha.0",
+  "version": "1.19.6-alpha.0",
   "description": "Building blocks for Uploadcare products integration",
   "keywords": [
     "web components",

package/utils/parseCdnUrl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseCdnUrl.d.ts","sourceRoot":"","sources":["parseCdnUrl.js"],"names":[],"mappings":"AAIO,8CADK;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE;;;;SAgB3C"}
+{"version":3,"file":"parseCdnUrl.d.ts","sourceRoot":"","sources":["parseCdnUrl.js"],"names":[],"mappings":"AAMO,8CADK;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE;;;;SAiB3C"}

package/utils/parseCdnUrl.js

@@ -1,12 +1,15 @@
+import { DEFAULT_CDN_CNAME } from '../blocks/Config/initialConfig.js';
+
 const uuidRegex = /[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}/i;
 const cdnUrlRegex = new RegExp(`^/?(${uuidRegex.source})(?:/(-/(?:[^/]+/)+)?([^/]*))?$`, 'i');
 
 /** @param {{ url: string; cdnBase: string }} options */
 export const parseCdnUrl = ({ url, cdnBase }) => {
   const cdnBaseUrlObj = new URL(cdnBase);
+  const fallbackCdnBaseUrlObj = new URL(DEFAULT_CDN_CNAME);
   const urlObj = new URL(url);
 
-  if (cdnBaseUrlObj.host !== urlObj.host) {
+  if (cdnBaseUrlObj.host !== urlObj.host && fallbackCdnBaseUrlObj.host !== urlObj.host) {
     return null;
   }
 

package/utils/parseCdnUrl.test.js

@@ -75,4 +75,17 @@ describe('parseCdnUrl', () => {
       filename: null,
     });
   });
+
+  it('should fallback to ucarecdn.com if cdnBase is not matched', () => {
+    expect(
+      parseCdnUrl({
+        url: 'https://ucarecdn.com/12345678-1234-5678-1234-567812345678/',
+        cdnBase: 'https://cdn.example.com',
+      }),
+    ).to.deep.equal({
+      uuid: '12345678-1234-5678-1234-567812345678',
+      cdnUrlModifiers: '',
+      filename: null,
+    });
+  });
 });