Skip to content

Commit

Permalink
Fly's Docker build system requires relative paths
Browse files Browse the repository at this point in the history
  • Loading branch information
jrief committed Jun 26, 2024
1 parent 473142a commit 2744a66
Show file tree
Hide file tree
Showing 13 changed files with 64 additions and 64 deletions.
22 changes: 11 additions & 11 deletions client/django-formset.monolith.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import '@ungap/custom-elements';
import {DjangoFormsetElement} from 'django-formset/DjangoFormset';
import {StyleHelpers} from 'django-formset/helpers';
import {DjangoFormsetElement} from './django-formset/DjangoFormset';
import {StyleHelpers} from './django-formset/helpers';

// remember to always reflect imports below here also in django-formset.ts
import {DjangoSelectizeElement} from 'django-formset/DjangoSelectize';
import {CountrySelectizeElement} from 'django-formset/CountrySelectize';
import {SortableSelectElement} from 'django-formset/SortableSelect';
import {DualSelectorElement} from 'django-formset/DualSelector';
import {PhoneNumberElement} from 'django-formset/PhoneNumber';
import {RichTextAreaElement} from 'django-formset/RichtextArea';
import {DjangoSlugElement} from 'django-formset/DjangoSlug';
import {DateCalendarElement, DateTimeCalendarElement, DateRangeCalendarElement, DateTimeRangeCalendarElement} from 'django-formset/Calendar';
import {DateFieldElement, DatePickerElement, DateTimeFieldElement, DateTimePickerElement, DateRangeFieldElement, DateTimeRangeFieldElement, DateRangePickerElement, DateTimeRangePickerElement} from 'django-formset/DateTime';
import {DjangoSelectizeElement} from './django-formset/DjangoSelectize';
import {CountrySelectizeElement} from './django-formset/CountrySelectize';
import {SortableSelectElement} from './django-formset/SortableSelect';
import {DualSelectorElement} from './django-formset/DualSelector';
import {PhoneNumberElement} from './django-formset/PhoneNumber';
import {RichTextAreaElement} from './django-formset/RichtextArea';
import {DjangoSlugElement} from './django-formset/DjangoSlug';
import {DateCalendarElement, DateTimeCalendarElement, DateRangeCalendarElement, DateTimeRangeCalendarElement} from './django-formset/Calendar';
import {DateFieldElement, DatePickerElement, DateTimeFieldElement, DateTimePickerElement, DateRangeFieldElement, DateTimeRangeFieldElement, DateRangePickerElement, DateTimeRangePickerElement} from './django-formset/DateTime';


window.addEventListener('DOMContentLoaded', (event) => {
Expand Down
40 changes: 20 additions & 20 deletions client/django-formset.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import '@ungap/custom-elements';
import {DjangoFormsetElement} from 'django-formset/DjangoFormset';
import {StyleHelpers} from 'django-formset/helpers';
import {DjangoFormsetElement} from './django-formset/DjangoFormset';
import {StyleHelpers} from './django-formset/helpers';


window.addEventListener('DOMContentLoaded', (event) => {
Expand All @@ -18,21 +18,21 @@ window.addEventListener('DOMContentLoaded', (event) => {
// remember to always reflect imports below here also in django-formset.monolith.ts
if (fragmentRoot.querySelector('select[is="django-selectize"]')) {
promises.push(new Promise((resolve, reject) => {
import('django-formset/DjangoSelectize').then(({DjangoSelectizeElement}) => {
import('./django-formset/DjangoSelectize').then(({DjangoSelectizeElement}) => {
defineComponent(resolve, 'django-selectize', DjangoSelectizeElement, {extends: 'select'});
}).catch(err => reject(err));
}));
}
if (fragmentRoot.querySelector('select[is="django-country-selectize"]')) {
promises.push(new Promise((resolve, reject) => {
import('django-formset/CountrySelectize').then(({CountrySelectizeElement}) => {
import('./django-formset/CountrySelectize').then(({CountrySelectizeElement}) => {
defineComponent(resolve, 'django-country-selectize', CountrySelectizeElement, {extends: 'select'});
}).catch(err => reject(err));
}));
}
if (fragmentRoot.querySelector('select[is="django-dual-selector"], django-sortable-select')) {
promises.push(new Promise((resolve, reject) => {
import('django-formset/DualSelector').then(({DualSelectorElement, SortableSelectElement}) => {
import('./django-formset/DualSelector').then(({DualSelectorElement, SortableSelectElement}) => {
Promise.all([
window.customElements.whenDefined('django-sortable-select'),
window.customElements.whenDefined('django-dual-selector'),
Expand All @@ -48,14 +48,14 @@ window.addEventListener('DOMContentLoaded', (event) => {
}
if (fragmentRoot.querySelector('input[is="django-phone-number"]')) {
promises.push(new Promise((resolve, reject) => {
import('django-formset/PhoneNumber').then(({PhoneNumberElement}) => {
import('./django-formset/PhoneNumber').then(({PhoneNumberElement}) => {
defineComponent(resolve, 'django-phone-number', PhoneNumberElement, {extends: 'input'});
}).catch(err => reject(err));
}));
}
if (fragmentRoot.querySelector('textarea[is="django-richtext"]')) {
promises.push(new Promise((resolve, reject) => {
import('django-formset/RichtextArea').then(({RichTextAreaElement}) => {
import('./django-formset/RichtextArea').then(({RichTextAreaElement}) => {
const textareaElements = fragmentRoot.querySelectorAll('textarea[is="django-richtext"]');
window.customElements.whenDefined('django-richtext').then(() => {
Promise.all(Array.from(textareaElements).map(textareaElement => new Promise<void>(resolve => {
Expand All @@ -74,91 +74,91 @@ window.addEventListener('DOMContentLoaded', (event) => {
}
if (fragmentRoot.querySelector('input[is="django-slug"]')) {
promises.push(new Promise((resolve, reject) => {
import('django-formset/DjangoSlug').then(({DjangoSlugElement}) => {
import('./django-formset/DjangoSlug').then(({DjangoSlugElement}) => {
defineComponent(resolve, 'django-slug', DjangoSlugElement, {extends: 'input'});
}).catch(err => reject(err));
}));
}
if (fragmentRoot.querySelector('input[is="django-datefield"]')) {
promises.push(new Promise((resolve, reject) => {
import('django-formset/DateTime').then(({DateFieldElement}) => {
import('./django-formset/DateTime').then(({DateFieldElement}) => {
defineComponent(resolve, 'django-datefield', DateFieldElement, {extends: 'input'});
}).catch(err => reject(err));
}));
}
if (fragmentRoot.querySelector('input[is="django-datecalendar"]')) {
promises.push(new Promise((resolve, reject) => {
import('django-formset/Calendar').then(({DateCalendarElement}) => {
import('./django-formset/Calendar').then(({DateCalendarElement}) => {
defineComponent(resolve, 'django-datecalendar', DateCalendarElement, {extends: 'input'});
}).catch(err => reject(err));
}));
}
if (fragmentRoot.querySelector('input[is="django-datepicker"]')) {
promises.push(new Promise((resolve, reject) => {
import('django-formset/DateTime').then(({DatePickerElement}) => {
import('./django-formset/DateTime').then(({DatePickerElement}) => {
defineComponent(resolve, 'django-datepicker', DatePickerElement, {extends: 'input'});
}).catch(err => reject(err));
}));
}
if (fragmentRoot.querySelector('input[is="django-datetimefield"]')) {
promises.push(new Promise((resolve, reject) => {
import('django-formset/DateTime').then(({DateTimeFieldElement}) => {
import('./django-formset/DateTime').then(({DateTimeFieldElement}) => {
defineComponent(resolve, 'django-datetimefield', DateTimeFieldElement, {extends: 'input'});
}).catch(err => reject(err));
}));
}
if (fragmentRoot.querySelector('input[is="django-datetimecalendar"]')) {
promises.push(new Promise((resolve, reject) => {
import('django-formset/Calendar').then(({DateTimeCalendarElement}) => {
import('./django-formset/Calendar').then(({DateTimeCalendarElement}) => {
defineComponent(resolve, 'django-datetimecalendar', DateTimeCalendarElement, {extends: 'input'});
}).catch(err => reject(err));
}));
}
if (fragmentRoot.querySelector('input[is="django-datetimepicker"]')) {
promises.push(new Promise((resolve, reject) => {
import('django-formset/DateTime').then(({DateTimePickerElement}) => {
import('./django-formset/DateTime').then(({DateTimePickerElement}) => {
defineComponent(resolve, 'django-datetimepicker', DateTimePickerElement, {extends: 'input'});
}).catch(err => reject(err));
}));
}
if (fragmentRoot.querySelector('input[is="django-daterangefield"]')) {
promises.push(new Promise((resolve, reject) => {
import('django-formset/DateTime').then(({DateRangeFieldElement}) => {
import('./django-formset/DateTime').then(({DateRangeFieldElement}) => {
defineComponent(resolve, 'django-daterangefield', DateRangeFieldElement, {extends: 'input'});
}).catch(err => reject(err));
}));
}
if (fragmentRoot.querySelector('input[is="django-daterangecalendar"]')) {
promises.push(new Promise((resolve, reject) => {
import('django-formset/Calendar').then(({DateRangeCalendarElement}) => {
import('./django-formset/Calendar').then(({DateRangeCalendarElement}) => {
defineComponent(resolve, 'django-daterangecalendar', DateRangeCalendarElement, {extends: 'input'});
}).catch(err => reject(err));
}));
}
if (fragmentRoot.querySelector('input[is="django-daterangepicker"]')) {
promises.push(new Promise((resolve, reject) => {
import('django-formset/DateTime').then(({DateRangePickerElement}) => {
import('./django-formset/DateTime').then(({DateRangePickerElement}) => {
defineComponent(resolve, 'django-daterangepicker', DateRangePickerElement, {extends: 'input'});
}).catch(err => reject(err));
}));
}
if (fragmentRoot.querySelector('input[is="django-datetimerangefield"]')) {
promises.push(new Promise((resolve, reject) => {
import('django-formset/DateTime').then(({DateTimeRangeFieldElement}) => {
import('./django-formset/DateTime').then(({DateTimeRangeFieldElement}) => {
defineComponent(resolve, 'django-datetimerangefield', DateTimeRangeFieldElement, {extends: 'input'});
}).catch(err => reject(err));
}));
}
if (fragmentRoot.querySelector('input[is="django-datetimerangecalendar"]')) {
promises.push(new Promise((resolve, reject) => {
import('django-formset/Calendar').then(({DateTimeRangeCalendarElement}) => {
import('./django-formset/Calendar').then(({DateTimeRangeCalendarElement}) => {
defineComponent(resolve, 'django-datetimerangecalendar', DateTimeRangeCalendarElement, {extends: 'input'});
}).catch(err => reject(err));
}));
}
if (fragmentRoot.querySelector('input[is="django-datetimerangepicker"]')) {
promises.push(new Promise((resolve, reject) => {
import('django-formset/DateTime').then(({DateTimeRangePickerElement}) => {
import('./django-formset/DateTime').then(({DateTimeRangePickerElement}) => {
defineComponent(resolve, 'django-datetimerangepicker', DateTimeRangePickerElement, {extends: 'input'});
}).catch(err => reject(err));
}));
Expand Down
8 changes: 4 additions & 4 deletions client/django-formset/Calendar.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {StyleHelpers} from 'django-formset/helpers';
import {Widget} from 'django-formset/Widget';
import contractLeftIcon from 'icons/contract-left.svg';
import contractRightIcon from 'icons/contract-right.svg';
import {StyleHelpers} from './helpers';
import {Widget} from './Widget';
import contractLeftIcon from '../icons/contract-left.svg';
import contractRightIcon from '../icons/contract-right.svg';
import styles from './Calendar.scss';


Expand Down
2 changes: 1 addition & 1 deletion client/django-formset/CountrySelectize.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {DjangoSelectize} from 'django-formset/DjangoSelectize';
import {DjangoSelectize} from './DjangoSelectize';
import {RecursivePartial, TomOption} from 'tom-select/src/types';
import {TomSettings} from 'tom-select/src/types/settings';
import template from 'lodash.template';
Expand Down
8 changes: 4 additions & 4 deletions client/django-formset/DateTime.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {autoUpdate, computePosition, flip, shift} from '@floating-ui/dom';
import {CalendarSheet, CalendarSettings} from 'django-formset/Calendar';
import {Widget} from 'django-formset/Widget';
import {StyleHelpers} from 'django-formset/helpers';
import {CalendarSheet, CalendarSettings} from './Calendar';
import {Widget} from './Widget';
import {StyleHelpers} from './helpers';
import styles from './DateTime.scss';
import calendarIcon from 'icons/calendar.svg';
import calendarIcon from '../icons/calendar.svg';


enum FieldPart {
Expand Down
14 changes: 7 additions & 7 deletions client/django-formset/DjangoFormset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import isString from 'lodash.isstring';
import setDataValue from 'lodash.set';
import template from 'lodash.template';
import Sortable, {SortableEvent} from 'sortablejs';
import {FileUploadWidget} from 'django-formset/FileUploadWidget';
import {FormDialog} from 'django-formset/FormDialog';
import {ErrorKey, FieldErrorMessages} from 'django-formset/Widget';
import {parse} from 'build/tag-attributes';
import spinnerIcon from 'icons/spinner.svg';
import okayIcon from 'icons/okay.svg';
import bummerIcon from 'icons/bummer.svg';
import {FileUploadWidget} from './FileUploadWidget';
import {FormDialog} from './FormDialog';
import {ErrorKey, FieldErrorMessages} from './Widget';
import {parse} from '../build/tag-attributes';
import spinnerIcon from '../icons/spinner.svg';
import okayIcon from '../icons/okay.svg';
import bummerIcon from '../icons/bummer.svg';
import styles from './DjangoFormset.scss';

type FieldElement = HTMLInputElement|HTMLSelectElement|HTMLTextAreaElement;
Expand Down
4 changes: 2 additions & 2 deletions client/django-formset/DjangoSelectize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {TomSettings} from 'tom-select/src/types/settings';
import {RecursivePartial, TomOption} from 'tom-select/src/types';
import TomSelect_remove_button from 'tom-select/src/plugins/remove_button/plugin';
import template from 'lodash.template';
import {IncompleteSelect} from 'django-formset/IncompleteSelect';
import {StyleHelpers} from 'django-formset/helpers';
import {IncompleteSelect} from './IncompleteSelect';
import {StyleHelpers} from './helpers';
import styles from './DjangoSelectize.scss';

TomSelect.define('remove_button', TomSelect_remove_button);
Expand Down
6 changes: 3 additions & 3 deletions client/django-formset/DualSelector.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import isString from 'lodash.isstring';
import template from 'lodash.template';
import {IncompleteSelect} from 'django-formset/IncompleteSelect';
import {SortableSelectElement} from 'django-formset/SortableSelect';
import {StyleHelpers} from 'django-formset/helpers';
import {IncompleteSelect} from './IncompleteSelect';
import {SortableSelectElement} from './SortableSelect';
import {StyleHelpers} from './helpers';


export class DualSelector extends IncompleteSelect {
Expand Down
4 changes: 2 additions & 2 deletions client/django-formset/FormDialog.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import isString from 'lodash.isstring';
import {StyleHelpers} from 'django-formset/helpers';
import {parse} from 'build/tag-attributes';
import {StyleHelpers} from './helpers';
import {parse} from '../build/tag-attributes';
import styles from './DjangoFormset.scss';


Expand Down
2 changes: 1 addition & 1 deletion client/django-formset/IncompleteSelect.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import isString from 'lodash.isstring';
import {Widget} from 'django-formset/Widget';
import {Widget} from './Widget';


export abstract class IncompleteSelect extends Widget {
Expand Down
4 changes: 2 additions & 2 deletions client/django-formset/PhoneNumber.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {autoPlacement, autoUpdate, computePosition} from '@floating-ui/dom';
import {AsYouType, CountryCode, CountryCallingCode, getCountries, getCountryCallingCode} from 'libphonenumber-js/max';
import {StyleHelpers} from 'django-formset/helpers';
import {countries} from 'django-formset/countries';
import {StyleHelpers} from './helpers';
import {countries} from './countries';
import styles from './PhoneNumber.scss';


Expand Down
12 changes: 6 additions & 6 deletions client/django-formset/RichtextArea.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ import Superscript from '@tiptap/extension-superscript';
import Text from '@tiptap/extension-text';
import {TextAlign, TextAlignOptions} from '@tiptap/extension-text-align';
import Underline from '@tiptap/extension-underline';
import {TextIndent, TextIndentOptions } from 'tiptap-extensions/indent';
import {TextMargin, TextMarginOptions } from 'tiptap-extensions/margin';
import {TextColor} from 'tiptap-extensions/color';
import {StyleHelpers} from 'django-formset/helpers';
import {FormDialog} from 'django-formset/FormDialog';
import {parse} from 'build/function-code';
import {TextIndent, TextIndentOptions } from '../tiptap-extensions/indent';
import {TextMargin, TextMarginOptions } from '../tiptap-extensions/margin';
import {TextColor} from '../tiptap-extensions/color';
import {StyleHelpers} from './helpers';
import {FormDialog} from './FormDialog';
import {parse} from '../build/function-code';
import styles from './RichtextArea.scss';


Expand Down
2 changes: 1 addition & 1 deletion client/django-formset/SortableSelect.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Sortable, {MultiDrag, SortableEvent} from 'sortablejs';
import {StyleHelpers} from 'django-formset/helpers';
import {StyleHelpers} from './helpers';
import styles from './SortableSelect.scss';

Sortable.mount(new MultiDrag());
Expand Down

0 comments on commit 2744a66

Please sign in to comment.