From a9bc98738e910fdc7919f9fcbd8d6cde651bf034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 27 Jun 2022 14:51:48 +0200 Subject: [PATCH] fix weird bug with ts import --- .../Resources/public/types.ts | 2 +- .../Resources/public/vuejs/Calendar/api.ts | 8 ++++---- .../public/vuejs/Calendar/store/utils.ts | 8 ++++---- .../vuejs/MyCalendarRange/store/index.ts | 4 ++-- .../store/modules/calendarRanges.ts | 8 ++++---- .../store/modules/calendarRemotes.ts | 9 ++++----- .../vuejs/MyCalendarRange/store/modules/me.ts | 2 +- .../public/module/async_upload/downloader.js | 6 +++--- .../Resources/public/lib/api/apiMethods.ts | 2 +- .../lib/download-report/download-report.js | 18 +++++++++--------- .../Resources/public/vuejs/_js/i18n.ts | 2 +- 11 files changed, 34 insertions(+), 35 deletions(-) diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/types.ts b/src/Bundle/ChillCalendarBundle/Resources/public/types.ts index fee734152..3537da314 100644 --- a/src/Bundle/ChillCalendarBundle/Resources/public/types.ts +++ b/src/Bundle/ChillCalendarBundle/Resources/public/types.ts @@ -1,5 +1,5 @@ import {EventInput} from '@fullcalendar/vue3'; -import {DateTime, User, UserAssociatedInterface} from 'ChillMainAssets/types'; +import {DateTime, User, UserAssociatedInterface} from '../../../ChillMainBundle/Resources/public/types' ; export interface CalendarRange { id: number; diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/api.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/api.ts index 3abd9a90a..ee769877c 100644 --- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/api.ts +++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/api.ts @@ -1,7 +1,7 @@ -import {fetchResults} from 'ChillMainAssets/lib/api/apiMethods'; -import {datetimeToISO} from 'ChillMainAssets/chill/js/date'; -import {User} from 'ChillMainAssets/types'; -import {CalendarRange, CalendarRemote} from 'ChillCalendarAssets/types'; +import {fetchResults} from '../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods'; +import {datetimeToISO} from '../../../../../ChillMainBundle/Resources/public/chill/js/date'; +import {User} from '../../../../../ChillMainBundle/Resources/public/types'; +import {CalendarRange, CalendarRemote} from '../../types'; export const whoami = (): Promise => { const url = `/api/1.0/main/whoami.json`; diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/utils.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/utils.ts index c13c2015e..1b32f234c 100644 --- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/utils.ts +++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/utils.ts @@ -1,8 +1,8 @@ import {COLORS} from '../const'; -import {ISOToDatetime} from 'ChillMainAssets/chill/js/date'; -import {DateTime, User} from 'ChillMainAssets/types'; -import {CalendarRange, CalendarRemote} from 'ChillCalendarAssets/types'; -import type {EventInputCalendarRange} from 'ChillCalendarAssets/types'; +import {ISOToDatetime} from '../../../../../../ChillMainBundle/Resources/public/chill/js/date'; +import {DateTime, User} from '../../../../../../ChillMainBundle/Resources/public/types'; +import {CalendarRange, CalendarRemote} from '../../../types'; +import type {EventInputCalendarRange} from '../../../types'; import {EventInput} from '@fullcalendar/vue3'; export interface UserData { diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/index.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/index.ts index 39d118b19..1cfa3b434 100644 --- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/index.ts +++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/index.ts @@ -8,8 +8,8 @@ import me, {MeState} from './modules/me'; import fullCalendar, {FullCalendarState} from './modules/fullcalendar'; import calendarRanges, {CalendarRangesState} from './modules/calendarRanges'; import calendarRemotes, {CalendarRemotesState} from './modules/calendarRemotes'; -import {whoami} from 'ChillCalendarAssets/vuejs/Calendar/api'; -import {User} from 'ChillMainAssets/types'; +import {whoami} from '../../Calendar/api'; +import {User} from '../../../../../../ChillMainBundle/Resources/public/types'; const debug = process.env.NODE_ENV !== 'production'; diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRanges.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRanges.ts index e932af01d..d57b427c8 100644 --- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRanges.ts +++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRanges.ts @@ -1,13 +1,13 @@ import {State} from './../index'; import {ActionContext, Module} from 'vuex'; -import {CalendarRange, CalendarRangeEdit} from "ChillCalendarAssets/types"; -import {fetchCalendarRangeForUser} from 'ChillCalendarAssets/vuejs/Calendar/api'; -import {calendarRangeToFullCalendarEvent} from 'ChillCalendarAssets/vuejs/Calendar/store/utils'; +import {CalendarRange, CalendarRangeEdit} from "../../../../types"; +import {fetchCalendarRangeForUser} from '../../../Calendar/api'; +import {calendarRangeToFullCalendarEvent} from '../../../Calendar/store/utils'; import {UserAssociatedInterface} from "../../../../../../../ChillMainBundle/Resources/public/types"; import {EventInput} from '@fullcalendar/vue3'; import {makeFetch} from "../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods"; import {datetimeToISO} from "../../../../../../../ChillMainBundle/Resources/public/chill/js/date"; -import type {EventInputCalendarRange} from "ChillCalendarAssets/types"; +import type {EventInputCalendarRange} from "../../../../types"; export interface CalendarRangesState { ranges: (EventInput | EventInputCalendarRange) [], diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRemotes.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRemotes.ts index 63db16589..a4bf13e8d 100644 --- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRemotes.ts +++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRemotes.ts @@ -1,12 +1,11 @@ import {State} from './../index'; import {ActionContext, Module} from 'vuex'; -import {CalendarRemote} from 'ChillCalendarAssets/types'; -import {fetchCalendarRemoteForUser} from 'ChillCalendarAssets/vuejs/Calendar/api'; -import {calendarRangeToFullCalendarEvent} from 'ChillCalendarAssets/vuejs/Calendar/store/utils'; +import {CalendarRemote} from '../../../../types'; +import {fetchCalendarRemoteForUser} from '../../../Calendar/api'; import {EventInput, EventSource} from '@fullcalendar/vue3'; import {remoteToFullCalendarEvent} from "../../../Calendar/store/utils"; -import {TransportExceptionInterface} from "ChillMainAssets/lib/api/apiMethods"; -import {COLORS} from "ChillCalendarAssets/vuejs/Calendar/const"; +import {TransportExceptionInterface} from "../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods"; +import {COLORS} from "../../../Calendar/const"; export interface CalendarRemotesState { remotes: EventInput[], diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/me.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/me.ts index b4bf13fae..8610b76d3 100644 --- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/me.ts +++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/me.ts @@ -1,5 +1,5 @@ import {State} from './../index'; -import {User} from 'ChillMainAssets/types'; +import {User} from '../../../../../../../ChillMainBundle/Resources/public/types'; import {ActionContext} from 'vuex'; export interface MeState { diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/downloader.js b/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/downloader.js index 0e889c373..2b6a1b8ae 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/downloader.js +++ b/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/downloader.js @@ -1,4 +1,4 @@ -var mime = require('mime-types'); +var mime = require('mime'); var algo = 'AES-CBC'; @@ -28,7 +28,7 @@ var download = (button) => { labelPreparing = button.dataset.labelPreparing, labelReady = button.dataset.labelReady, mimeType = button.dataset.mimeType, - extension = mime.extension(mimeType), + extension = mime.getExtension(mimeType), decryptError = "Error while decrypting file", fetchError = "Error while fetching file", key, url @@ -93,4 +93,4 @@ window.addEventListener('load', function(e) { initializeButtons(e.target); }); -export { initializeButtons, download }; \ No newline at end of file +export { initializeButtons, download }; diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts index c00e377e4..7ef909884 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts +++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts @@ -1,4 +1,4 @@ -import {Scope} from 'ChillMainAssets/types'; +import {Scope} from '../../types'; export type body = {[key: string]: boolean|string|number|null}; export type fetchOption = {[key: string]: boolean|string|number|null}; diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/download-report/download-report.js b/src/Bundle/ChillMainBundle/Resources/public/lib/download-report/download-report.js index c7b7bb59a..041e94c45 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/lib/download-report/download-report.js +++ b/src/Bundle/ChillMainBundle/Resources/public/lib/download-report/download-report.js @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2018 Champs Libres Cooperative * * This program is free software: you can redistribute it and/or modify @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -var mime = require('mime-types') +var mime = require('mime') var download_report = (url, container) => { var download_text = container.dataset.downloadText, alias = container.dataset.alias; - + window.fetch(url, { credentials: 'same-origin' }) .then(response => { if (!response.ok) { @@ -29,21 +29,21 @@ var download_report = (url, container) => { return response.blob(); }).then(blob => { - + var content = URL.createObjectURL(blob), link = document.createElement("a"), type = blob.type, hasForcedType = 'mimeType' in container.dataset, extension; - + if (hasForcedType) { // force a type type = container.dataset.mimeType; blob = new Blob([ blob ], { 'type': type }); content = URL.createObjectURL(blob); } - - extension = mime.extension(type); + + extension = mime.getExtension(type); link.appendChild(document.createTextNode(download_text)); link.classList.add("btn", "btn-action"); @@ -56,7 +56,7 @@ var download_report = (url, container) => { container.appendChild(link); }).catch(function(error) { console.log(error); - var problem_text = + var problem_text = document.createTextNode("Problem during download"); container @@ -64,4 +64,4 @@ var download_report = (url, container) => { }); }; -module.exports = download_report; \ No newline at end of file +module.exports = download_report; diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.ts b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.ts index 12c9b2813..966c79544 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.ts +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.ts @@ -1,5 +1,5 @@ import { createI18n } from 'vue-i18n'; -import datetimeFormats from 'ChillMainAssets/vuejs/i18n/datetimeFormats'; +import datetimeFormats from '../i18n/datetimeFormats'; const messages = { fr: {