Skip to content

yarn package manager support, build package node 20, tif patch #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

yarn package manager support, build package node 20, tif patch #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19fa66a
update package install to support use of yarn rather than npm, update…
Oct 23, 2023
b057d63
patch issue from tif/tiff files erroring out when generating image pr…
Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions dist/demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1 @@
<meta charset="utf-8">
<title>vue-file-agent demo</title>
<script src="./vue-file-agent.umd.js"></script>

<link rel="stylesheet" href="./vue-file-agent.css">


<script>
console.log(vue-file-agent)
</script>
<!doctype html><meta charset="utf-8"><title>vue-file-agent demo</title><script src="./vue-file-agent.umd.js"></script><link rel="stylesheet" href="./vue-file-agent.css"><script>console.log(vue-file-agent)</script>
5,915 changes: 3,037 additions & 2,878 deletions dist/vue-file-agent.common.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/vue-file-agent.common.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/vue-file-agent.css
View file
Open in desktop

Large diffs are not rendered by default.

5,908 changes: 3,038 additions & 2,870 deletions dist/vue-file-agent.umd.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/vue-file-agent.umd.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/vue-file-agent.umd.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/vue-file-agent.umd.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

16,906 changes: 0 additions & 16,906 deletions package-lock.json
View file
Open in desktop

This file was deleted.

18 changes: 10 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,24 @@
"/types"
],
"dependencies": {
"vue": "^2.6.11"
"vue": "^2.6.12"
},
"devDependencies": {
"@types/jest": "^25.2.1",
"@types/tus-js-client": "^1.8.0",
"@vue/cli-plugin-typescript": "^4.3.1",
"@vue/cli-plugin-unit-jest": "^4.3.1",
"@vue/cli-service": "^4.3.1",
"@vue/cli-plugin-typescript": "~5.0.8",
"@vue/cli-plugin-unit-jest": "~5.0.8",
"@vue/cli-service": "~5.0.8",
"@vue/test-utils": "1.0.2",
"node-sass": "^4.14.1",
"@vue/vue2-jest": "^29.2.6",
"prettier": "2.0.5",
"sass-loader": "^8.0.2",
"sass": "^1.69.4",
"sass-loader": "^10.1.1",
"ts-jest": "^29.1.1",
"tus-js-client": "^2.1.1",
"typescript": "^3.9.2",
"typescript": "^4.9.2",
"vue-slicksort": "^1.1.3",
"vue-template-compiler": "^2.6.11"
"vue-template-compiler": "^2.6.12"
},
"postcss": {
"plugins": {
Expand Down
4 changes: 2 additions & 2 deletions src/components/vue-file-agent-mixin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export default Vue.extend({
canvas,
fileRecord.thumbnailSize,
this.averageColor !== false,
this.withCredentials
// this.withCredentials
)
.then((thumbnail) => {
fileRecord.imageColor = thumbnail.color;
Expand Down Expand Up @@ -351,6 +351,7 @@ export default Vue.extend({
if (this.hasMultiple && this.maxFiles && files.length > this.maxFiles - this.fileRecords.length) {
files = files.slice(0, this.maxFiles - this.fileRecords.length);
}

for (const file of files) {
fileRecords.push(
new FileRecord(
Expand Down Expand Up @@ -381,7 +382,6 @@ export default Vue.extend({
} else {
this.fileRecords = fileRecords;
}

FileRecord.readFiles(fileRecords).then((fileRecordsNew: FileRecord[]) => {
const allFileRecordsRaw = FileRecord.toRawArray(this.fileRecords);
this.rawFileRecords = allFileRecordsRaw;
Expand Down
2 changes: 1 addition & 1 deletion src/components/vue-file-preview-mixin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export default Vue.extend({
canvas,
this.fileRecord.thumbnailSize,
this.averageColor !== false,
this.withCredentials === true
// this.withCredentials === true
)
.then((thumbnail) => {
fileRecord.imageColor = thumbnail.color;
Expand Down
6 changes: 3 additions & 3 deletions src/lib/upload-helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ class UploadHelper {
uploadData: any,
configureFn?: ConfigureFn
) {
return new Promise((resolve, reject) => {
return new Promise((resolve: any, reject) => {
if (fileRecord.xhr) {
// probably updated while being uploaded.
fileRecord.xhrQueue = () => {
Expand Down Expand Up @@ -381,7 +381,7 @@ class UploadHelper {
}

public tusDeleteUpload(tus: any, url: string, headers: object, fileRecord: FileRecord) {
return new Promise((resolve, reject) => {
return new Promise((resolve: any, reject) => {
if (!tus) {
return reject('tus required');
}
Expand All @@ -390,7 +390,7 @@ class UploadHelper {
}
// const shouldTerminate = true;
const abort = (shouldTerminate: boolean) => {
return new Promise((res, rej) => {
return new Promise((res: any, rej) => {
fileRecord.tusUpload.abort(shouldTerminate, (err: any) => {
if (err) {
this.prepareUploadError(fileRecord, err);
Expand Down
6 changes: 5 additions & 1 deletion src/lib/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ class Utils {
if (!(file instanceof File)) {
return reject('Invalid file object. Use url or a valid instance of File class');
}
if (createObjectURL && revokeObjectURL) {
if (createObjectURL && !!revokeObjectURL) {
shouldRevoke = true;
image.src = createObjectURL(file);
return;
Expand All @@ -374,6 +374,10 @@ class Utils {
): Promise<ImageThumbnail | null> {
const image = new Image();
image.setAttribute('crossOrigin', withCredentials ? 'use-credentials' : 'anonymous');
// FLAG: tif/tiff is not supported by most modern browsers
if (file?.type.includes('image/tif')) {
return Promise.reject(new Error('Unsupported image format for thumbnail preview'));
}
return url
? this.resizeImageUrl(image, url, thumbnailSize, calculateAverageColor)
: this.resizeImageFile(image, file as File, thumbnailSize, calculateAverageColor);
Expand Down
15 changes: 8 additions & 7 deletions types/src/components/vue-file-agent-mixin.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import VueFileIcon from './vue-file-icon.vue';
import FileRecord from '../lib/file-record';
import { RawFileRecord } from '../lib/file-record';
import Vue from 'vue';
import { ConfigureFn } from '../lib/ajax-request';
declare const _default: import("vue/types/vue").ExtendedVue<Vue, {
declare const _default: import("vue/types/vue").ExtendedVue<VueFileIcon<Record<string, any>, Record<string, any>, never, never, (event: string, ...args: any[]) => VueFileIcon<Record<string, any>, Record<string, any>, never, never, any>>, {
fileRecords: FileRecord[];
rawFileRecords: RawFileRecord[];
isDragging: boolean;
Expand All @@ -18,10 +18,10 @@ declare const _default: import("vue/types/vue").ExtendedVue<Vue, {
getFileRecordOrRawInstance(fileRecordOrRaw: FileRecord | RawFileRecord, raw: boolean): FileRecord | RawFileRecord;
getFileRecordRawInstance(fileRecordOrRaw: FileRecord | RawFileRecord): RawFileRecord;
getFileRecordInstance(fileRecordOrRaw: FileRecord | RawFileRecord): FileRecord;
prepareConfigureFn(configureXhr?: ConfigureFn | undefined): ConfigureFn | undefined;
upload(url: string, headers: object, fileRecordsOrRaw: FileRecord[] | RawFileRecord[], createFormData?: ((fileRecord: FileRecord) => FormData) | undefined, configureXhr?: ConfigureFn | undefined): Promise<any>;
deleteUpload(url: string, headers: object, fileRecordOrRaw: FileRecord | RawFileRecord, uploadData?: any, configureXhr?: ConfigureFn | undefined): Promise<any>;
updateUpload(url: string, headers: object, fileRecord: FileRecord | RawFileRecord, uploadData?: any, configureXhr?: ConfigureFn | undefined): Promise<any>;
prepareConfigureFn(configureXhr?: ConfigureFn): ConfigureFn | undefined;
upload(url: string, headers: object, fileRecordsOrRaw: FileRecord[] | RawFileRecord[], createFormData?: ((fileRecord: FileRecord) => FormData) | undefined, configureXhr?: ConfigureFn): Promise<any>;
deleteUpload(url: string, headers: object, fileRecordOrRaw: FileRecord | RawFileRecord, uploadData?: any, configureXhr?: ConfigureFn): Promise<any>;
updateUpload(url: string, headers: object, fileRecord: FileRecord | RawFileRecord, uploadData?: any, configureXhr?: ConfigureFn): Promise<any>;
autoUpload(fileRecords: FileRecord[] | RawFileRecord[]): Promise<any>;
autoDeleteUpload(fileRecord: FileRecord | RawFileRecord): Promise<any>;
autoUpdateUpload(fileRecord: FileRecord): Promise<any>;
Expand All @@ -45,11 +45,12 @@ declare const _default: import("vue/types/vue").ExtendedVue<Vue, {
collection: any;
}): void;
}, {
withCredentials: boolean | undefined;
canAddMore: boolean;
helpTextComputed: string;
isDeletable: boolean;
isSortable: boolean;
hasMultiple: boolean;
shouldRead: boolean;
}, Record<"accept" | "auto" | "averageColor" | "capture" | "compact" | "deletable" | "disabled" | "editable" | "errorText" | "helpText" | "linkable" | "maxFiles" | "maxSize" | "meta" | "multiple" | "progress" | "read" | "readonly" | "resumable" | "sortable" | "theme" | "thumbnailSize" | "uploadConfig" | "uploadHeaders" | "uploadUrl" | "uploadWithCredentials" | "value", any>>;
}, Record<"accept" | "auto" | "averageColor" | "capture" | "compact" | "deletable" | "disabled" | "editable" | "errorText" | "helpText" | "linkable" | "maxFiles" | "maxSize" | "meta" | "multiple" | "progress" | "read" | "readonly" | "resumable" | "sortable" | "theme" | "thumbnailSize" | "uploadConfig" | "uploadHeaders" | "uploadUrl" | "uploadWithCredentials" | "value", any>, {}, import("vue/types/v3-component-options").ComponentOptionsMixin, import("vue/types/v3-component-options").ComponentOptionsMixin>;
export default _default;
52 changes: 51 additions & 1 deletion types/src/components/vue-file-agent.vue.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,53 @@
import Vue from 'vue';
declare const _default: import("vue/types/vue").ExtendedVue<Vue, unknown, unknown, unknown, Record<never, any>>;
declare const _default: import("vue/types/vue").ExtendedVue<Vue<Record<string, any>, Record<string, any>, never, never, (event: string, ...args: any[]) => Vue<Record<string, any>, Record<string, any>, never, never, any>>, unknown, unknown, unknown, Record<never, any>, {}, import("vue/types/vue").ExtendedVue<Vue<Record<string, any>, Record<string, any>, never, never, (event: string, ...args: any[]) => Vue<Record<string, any>, Record<string, any>, never, never, any>>, {
fileRecords: import("../lib/file-record").default[];
rawFileRecords: import("../lib/file-record").RawFileRecord[];
isDragging: boolean;
isSorting: boolean;
isSortingActive: boolean;
transitionDuration: number;
overallProgress: number;
uniqueId: string;
sortTimeout: number;
}, {
createThumbnail(fileRecord: import("../lib/file-record").default, video: HTMLVideoElement): Promise<void>;
initVideo(fileRecord: import("../lib/file-record").default): void;
getFileRecordOrRawInstance(fileRecordOrRaw: import("../lib/file-record").default | import("../lib/file-record").RawFileRecord, raw: boolean): import("../lib/file-record").default | import("../lib/file-record").RawFileRecord;
getFileRecordRawInstance(fileRecordOrRaw: import("../lib/file-record").default | import("../lib/file-record").RawFileRecord): import("../lib/file-record").RawFileRecord;
getFileRecordInstance(fileRecordOrRaw: import("../lib/file-record").default | import("../lib/file-record").RawFileRecord): import("../lib/file-record").default;
prepareConfigureFn(configureXhr?: import("../lib/ajax-request").ConfigureFn | undefined): import("../lib/ajax-request").ConfigureFn | undefined;
upload(url: string, headers: object, fileRecordsOrRaw: import("../lib/file-record").default[] | import("../lib/file-record").RawFileRecord[], createFormData?: ((fileRecord: import("../lib/file-record").default) => FormData) | undefined, configureXhr?: import("../lib/ajax-request").ConfigureFn | undefined): Promise<any>;
deleteUpload(url: string, headers: object, fileRecordOrRaw: import("../lib/file-record").default | import("../lib/file-record").RawFileRecord, uploadData?: any, configureXhr?: import("../lib/ajax-request").ConfigureFn | undefined): Promise<any>;
updateUpload(url: string, headers: object, fileRecord: import("../lib/file-record").default | import("../lib/file-record").RawFileRecord, uploadData?: any, configureXhr?: import("../lib/ajax-request").ConfigureFn | undefined): Promise<any>;
autoUpload(fileRecords: import("../lib/file-record").default[] | import("../lib/file-record").RawFileRecord[]): Promise<any>;
autoDeleteUpload(fileRecord: import("../lib/file-record").default | import("../lib/file-record").RawFileRecord): Promise<any>;
autoUpdateUpload(fileRecord: import("../lib/file-record").default): Promise<any>;
equalFiles(file1: File, file2: File): boolean;
isFileAddedAlready(file: File): boolean;
handleFiles(files: File[] | FileList): void;
filesChanged(event: InputEvent): void;
drop(event: DragEvent): void;
dragEnter(event: DragEvent): void;
dragOver(event: DragEvent): void;
dragLeave(event: DragEvent): void;
removeFileRecord(fileRecordOrRaw: import("../lib/file-record").default | import("../lib/file-record").RawFileRecord): void;
deleteFileRecord(fileRecordOrRaw: import("../lib/file-record").default | import("../lib/file-record").RawFileRecord): void;
filenameChanged(fileRecord: import("../lib/file-record").default): void;
checkValue(): void;
sortStart(): void;
sortEnd(sortData: {
event: Event;
newIndex: number;
oldIndex: number;
collection: any;
}): void;
}, {
withCredentials: boolean | undefined;
canAddMore: boolean;
helpTextComputed: string;
isDeletable: boolean;
isSortable: boolean;
hasMultiple: boolean;
shouldRead: boolean;
}, Record<"accept" | "auto" | "averageColor" | "capture" | "compact" | "deletable" | "disabled" | "editable" | "errorText" | "helpText" | "linkable" | "maxFiles" | "maxSize" | "meta" | "multiple" | "progress" | "read" | "readonly" | "resumable" | "sortable" | "theme" | "thumbnailSize" | "uploadConfig" | "uploadHeaders" | "uploadUrl" | "uploadWithCredentials" | "value", any>, {}, import("vue/types/v3-component-options").ComponentOptionsMixin, import("vue/types/v3-component-options").ComponentOptionsMixin>, import("vue/types/v3-component-options").ComponentOptionsMixin>;
export default _default;
4 changes: 2 additions & 2 deletions types/src/components/vue-file-icon.vue.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { SvgIcon } from '../lib/icons';
import Vue from 'vue';
declare const _default: import("vue/types/vue").ExtendedVue<Vue, unknown, unknown, {
declare const _default: import("vue/types/vue").ExtendedVue<Vue<Record<string, any>, Record<string, any>, never, never, (event: string, ...args: any[]) => Vue<Record<string, any>, Record<string, any>, never, never, any>>, unknown, unknown, {
viewBoxComputed: string;
icon: SvgIcon;
}, Record<"ext" | "name" | "viewBox", any>>;
}, Record<"name" | "ext" | "viewBox", any>, {}, import("vue/types/v3-component-options").ComponentOptionsMixin, import("vue/types/v3-component-options").ComponentOptionsMixin>;
export default _default;
2 changes: 1 addition & 1 deletion types/src/components/vue-file-list-item.vue.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import Vue from 'vue';
declare const _default: import("vue/types/vue").ExtendedVue<Vue, unknown, unknown, unknown, Record<"index", any>>;
declare const _default: import("vue/types/vue").ExtendedVue<Vue<Record<string, any>, Record<string, any>, never, never, (event: string, ...args: any[]) => Vue<Record<string, any>, Record<string, any>, never, never, any>>, unknown, unknown, unknown, Record<"index", any>, {}, import("vue/types/v3-component-options").ComponentOptionsMixin, import("vue/types/v3-component-options").ComponentOptionsMixin>;
export default _default;
2 changes: 1 addition & 1 deletion types/src/components/vue-file-list.vue.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import Vue from 'vue';
declare const _default: import("vue/types/vue").ExtendedVue<Vue, unknown, unknown, unknown, Record<"value" | "axis" | "appendTo", any>>;
declare const _default: import("vue/types/vue").ExtendedVue<Vue<Record<string, any>, Record<string, any>, never, never, (event: string, ...args: any[]) => Vue<Record<string, any>, Record<string, any>, never, never, any>>, unknown, unknown, unknown, Record<"value" | "axis" | "appendTo", any>, {}, import("vue/types/v3-component-options").ComponentOptionsMixin, import("vue/types/v3-component-options").ComponentOptionsMixin>;
export default _default;
8 changes: 4 additions & 4 deletions types/src/components/vue-file-preview-mixin.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import VueFileIcon from './vue-file-icon.vue';
import FileRecord from '../lib/file-record';
import Vue from 'vue';
declare const _default: import("vue/types/vue").ExtendedVue<Vue, {
declare const _default: import("vue/types/vue").ExtendedVue<VueFileIcon<Record<string, any>, Record<string, any>, never, never, (event: string, ...args: any[]) => VueFileIcon<Record<string, any>, Record<string, any>, never, never, any>>, {
isEditInputFocused: boolean;
isEditCancelable: boolean;
fileRecord: FileRecord;
Expand All @@ -12,11 +12,11 @@ declare const _default: import("vue/types/vue").ExtendedVue<Vue, {
editFileName(): void;
editInputFocused(): void;
editInputBlured(): void;
filenameChanged(completed?: boolean | undefined): void;
filenameChanged(completed?: boolean): void;
filenameClearPressed(): void;
clearFilename(): boolean;
dismissError(): void;
}, {
hasLinkableUrl: boolean;
}, Record<"averageColor" | "deletable" | "disabled" | "editable" | "errorText" | "linkable" | "thumbnailSize" | "value", any>>;
}, Record<"averageColor" | "deletable" | "disabled" | "editable" | "errorText" | "linkable" | "thumbnailSize" | "value" | "withCredentials", any>, {}, import("vue/types/v3-component-options").ComponentOptionsMixin, import("vue/types/v3-component-options").ComponentOptionsMixin>;
export default _default;
20 changes: 19 additions & 1 deletion types/src/components/vue-file-preview.vue.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
import Vue from 'vue';
declare const _default: import("vue/types/vue").ExtendedVue<Vue, unknown, unknown, unknown, Record<never, any>>;
declare const _default: import("vue/types/vue").ExtendedVue<Vue<Record<string, any>, Record<string, any>, never, never, (event: string, ...args: any[]) => Vue<Record<string, any>, Record<string, any>, never, never, any>>, unknown, unknown, unknown, Record<never, any>, {}, import("vue/types/vue").ExtendedVue<Vue<Record<string, any>, Record<string, any>, never, never, (event: string, ...args: any[]) => Vue<Record<string, any>, Record<string, any>, never, never, any>>, {
isEditInputFocused: boolean;
isEditCancelable: boolean;
fileRecord: import("../lib/file-record").default;
}, {
updateFileRecord(): void;
createThumbnail(fileRecord: import("../lib/file-record").default, video: HTMLVideoElement): void;
playAv(fileRecord: import("../lib/file-record").default): void;
removeFileRecord(fileRecord: import("../lib/file-record").default): void;
editFileName(): void;
editInputFocused(): void;
editInputBlured(): void;
filenameChanged(completed?: boolean | undefined): void;
filenameClearPressed(): void;
clearFilename(): boolean;
dismissError(): void;
}, {
hasLinkableUrl: boolean;
}, Record<"averageColor" | "deletable" | "disabled" | "editable" | "errorText" | "linkable" | "thumbnailSize" | "value" | "withCredentials", any>, {}, import("vue/types/v3-component-options").ComponentOptionsMixin, import("vue/types/v3-component-options").ComponentOptionsMixin>, import("vue/types/v3-component-options").ComponentOptionsMixin>;
export default _default;
Loading