mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-10-05 17:52:03 +02:00
merge transpiling branch into master
This commit is contained in:
ralf
commit
d3eed5b738
@ -12,12 +12,12 @@
|
||||
import {css, html} from "@lion/core";
|
||||
import 'lit-flatpickr';
|
||||
import {dateStyles} from "./DateStyles";
|
||||
import {Instance} from 'flatpickr/dist/types/instance';
|
||||
import "flatpickr/dist/plugins/scrollPlugin.js";
|
||||
import "shortcut-buttons-flatpickr/dist/shortcut-buttons-flatpickr";
|
||||
import type {Instance} from 'flatpickr/dist/types/instance';
|
||||
import {default as scrollPlugin} from "flatpickr/dist/plugins/scrollPlugin.js";
|
||||
import {default as ShortcutButtonsPlugin} from "shortcut-buttons-flatpickr/dist/shortcut-buttons-flatpickr";
|
||||
import flatpickr from "flatpickr";
|
||||
import {egw} from "../../jsapi/egw_global";
|
||||
import {HTMLElementWithValue} from "@lion/form-core/types/FormControlMixinTypes";
|
||||
import type {HTMLElementWithValue} from "@lion/form-core/types/FormControlMixinTypes";
|
||||
import {Et2Textbox} from "../Et2Textbox/Et2Textbox";
|
||||
import {Et2ButtonIcon} from "../Et2Button/Et2ButtonIcon";
|
||||
import {FormControlMixin} from "@lion/form-core";
|
||||
@ -687,6 +687,11 @@ export class Et2Date extends Et2InputWidget(FormControlMixin(LitFlatpickr))
|
||||
return formatDate;
|
||||
}
|
||||
|
||||
set format(_format)
|
||||
{
|
||||
// ignored, trying to fix TypeError opening a new contact
|
||||
}
|
||||
|
||||
/**
|
||||
* Inline calendars need a slot
|
||||
*
|
||||
|
||||
@ -3,8 +3,9 @@ import {FormControlMixin} from "@lion/form-core";
|
||||
import {classMap, css, html, ifDefined, LitElement, TemplateResult} from "@lion/core";
|
||||
import shoelace from "../Styles/shoelace";
|
||||
import {dateStyles} from "./DateStyles";
|
||||
import "flatpickr/dist/plugins/rangePlugin";
|
||||
import {formatDate, parseDate} from "./Et2Date";
|
||||
import flatpickr from "flatpickr";
|
||||
import {default as rangePlugin} from "flatpickr/dist/plugins/rangePlugin";
|
||||
import {Et2Date, formatDate, parseDate} from "./Et2Date";
|
||||
import {egw} from "../../jsapi/egw_global";
|
||||
|
||||
/**
|
||||
@ -54,6 +55,30 @@ export class Et2DateRange extends Et2InputWidget(FormControlMixin(LitElement))
|
||||
super();
|
||||
}
|
||||
|
||||
getUpdateComplete() {
|
||||
const p = super.getUpdateComplete();
|
||||
if(!this.relative)
|
||||
{
|
||||
p.then(() => this.setupFlatpickr());
|
||||
}
|
||||
return p;
|
||||
}
|
||||
protected setupFlatpickr()
|
||||
{
|
||||
if(!this.fromElement || !this.fromElement._inputElement) return;
|
||||
|
||||
this.fromElement._instance = flatpickr((<Et2Date>this.fromElement).findInputField(), {
|
||||
...(<Et2Date>this.fromElement).getOptions(),
|
||||
...{
|
||||
plugins: [
|
||||
rangePlugin({
|
||||
input: this.toElement
|
||||
})
|
||||
]
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
render()
|
||||
{
|
||||
const hasLabel = this.label ? true : false
|
||||
@ -345,4 +370,4 @@ export class Et2DateRange extends Et2InputWidget(FormControlMixin(LitElement))
|
||||
];
|
||||
}
|
||||
|
||||
customElements.define("et2-date-range", Et2DateRange);
|
||||
customElements.define("et2-date-range", Et2DateRange);
|
||||
|
||||
@ -11,7 +11,8 @@
|
||||
|
||||
import {css} from "@lion/core";
|
||||
import {Et2Date} from "./Et2Date";
|
||||
import {Instance} from "flatpickr/dist/types/instance";
|
||||
import type {Instance} from "flatpickr/dist/types/instance";
|
||||
import {default as ShortcutButtonsPlugin} from "shortcut-buttons-flatpickr/dist/shortcut-buttons-flatpickr";
|
||||
|
||||
|
||||
export class Et2DateTime extends Et2Date
|
||||
@ -115,7 +116,6 @@ export class Et2DateTime extends Et2Date
|
||||
*/
|
||||
protected _buttonPlugin()
|
||||
{
|
||||
// @ts-ignore TypeScript can't find ShortcutButtonsPlugin, but rollup does
|
||||
return ShortcutButtonsPlugin({
|
||||
button: [
|
||||
{label: this.egw().lang("ok")},
|
||||
@ -144,4 +144,4 @@ export class Et2DateTime extends Et2Date
|
||||
}
|
||||
|
||||
// @ts-ignore TypeScript is not recognizing that Et2DateTime is a LitElement
|
||||
customElements.define("et2-date-time", Et2DateTime);
|
||||
customElements.define("et2-date-time", Et2DateTime);
|
||||
@ -87,8 +87,8 @@ export class et2_nextmatch_controller extends et2_dataview_controller implements
|
||||
super(_parentController, _grid);
|
||||
|
||||
this.setDataProvider(this);
|
||||
this.setRowCallback(this._rowCallback);
|
||||
this.setLinkCallback(this._linkCallback);
|
||||
this.setRowCallback(this._nmRowCallback);
|
||||
this.setLinkCallback(this._nmLinkCallback);
|
||||
this.setContext(this);
|
||||
|
||||
// Copy the egw reference
|
||||
@ -560,7 +560,7 @@ export class et2_nextmatch_controller extends et2_dataview_controller implements
|
||||
* this special case used to store the rowWidget reference, so that it can
|
||||
* be properly freed.
|
||||
*/
|
||||
_rowCallback( _data, _tr, _idx, _entry)
|
||||
_nmRowCallback(_data, _tr, _idx, _entry)
|
||||
{
|
||||
// Let the row provider fill in the data row -- store the returned
|
||||
// rowWidget inside the _entry
|
||||
@ -585,7 +585,7 @@ export class et2_nextmatch_controller extends et2_dataview_controller implements
|
||||
*
|
||||
* @return Array List of action names that valid for the row
|
||||
*/
|
||||
_linkCallback( _data, _idx, _uid)
|
||||
_nmLinkCallback( _data, _idx, _uid)
|
||||
{
|
||||
if(_uid.trim() != "")
|
||||
{
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
et2_core_inputWidget;
|
||||
api.Resumable.resumable;
|
||||
*/
|
||||
import "../Resumable/resumable.js";
|
||||
import {Resumable} from "../Resumable/resumable.js";
|
||||
import {et2_inputWidget} from "./et2_core_inputWidget";
|
||||
import {et2_register_widget, WidgetConfig} from "./et2_core_widget";
|
||||
import {ClassWithAttributes} from "./et2_core_inheritance";
|
||||
|
||||
@ -24,7 +24,7 @@ import './fw_browser.js';
|
||||
import './fw_ui.js';
|
||||
import './fw_classes.js';
|
||||
import '../jsapi/egw_inheritance.js';
|
||||
import "sortablejs/Sortable.min.js";
|
||||
import Sortable from "sortablejs/modular/sortable.complete.esm";
|
||||
/**
|
||||
*
|
||||
* @param {DOMWindow} window
|
||||
|
||||
3536
package-lock.json
generated
3536
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -12,6 +12,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.14.6",
|
||||
"@babel/preset-env": "^7.20.2",
|
||||
"@babel/preset-typescript": "^7.14.5",
|
||||
"@interactjs/interactjs": "^1.10.11",
|
||||
"@open-wc/testing": "^3.0.3",
|
||||
@ -27,7 +28,7 @@
|
||||
"grunt": "^1.5.3",
|
||||
"grunt-contrib-cssmin": "^2.2.1",
|
||||
"rimraf": "^3.0.2",
|
||||
"rollup": "^2.52.2",
|
||||
"rollup": "^2.79.1",
|
||||
"rollup-plugin-terser": "^7.0.2",
|
||||
"sinon": "^11.1.2",
|
||||
"terser": "^4.8.1",
|
||||
@ -62,9 +63,11 @@
|
||||
"@lion/listbox": "^0.12.0",
|
||||
"@lion/select": "^0.15.0",
|
||||
"@lion/textarea": "^0.14.0",
|
||||
"@rollup/plugin-commonjs": "^24.0.1",
|
||||
"@shoelace-style/shoelace": "2.0.0-beta.81",
|
||||
"blueimp-gallery": "^3.4.0",
|
||||
"colortranslator": "^1.9.2",
|
||||
"core-js": "^3.29.1",
|
||||
"lit-flatpickr": "^0.3.0",
|
||||
"shortcut-buttons-flatpickr": "^0.4.0",
|
||||
"sortablejs": "^1.14.0"
|
||||
@ -72,4 +75,4 @@
|
||||
"engines": {
|
||||
"node": ">=14.0.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -15,12 +15,13 @@ import { readFileSync, readdirSync, statSync, unlinkSync } from "fs";
|
||||
//import rimraf from 'rimraf';
|
||||
import { minify } from 'terser';
|
||||
import resolve from '@rollup/plugin-node-resolve';
|
||||
import commonjs from '@rollup/plugin-commonjs';
|
||||
|
||||
// Best practice: use this
|
||||
//rimraf.sync('./dist/');
|
||||
//rimraf.sync('./chunks/');
|
||||
|
||||
// remove only chunks older then 2 days, to allow UI to still load them and not require a reload / F5
|
||||
// remove only chunks older than 2 days, to allow UI to still load them and not require a reload / F5
|
||||
const rm_older = Date.now() - 48*3600000;
|
||||
readdirSync('./chunks').forEach(name => {
|
||||
const stat = statSync('./chunks/'+name);
|
||||
@ -55,6 +56,11 @@ const config = {
|
||||
// app.ts/js are added automatic by addAppsConfig() below
|
||||
},
|
||||
external: function(id,parentId,isResolved) {
|
||||
// core-js used require and needs to be run through RollupJS and NOT treated as external
|
||||
if (id.includes("/node_modules/core-js/"))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
if(!isResolved)
|
||||
{
|
||||
return;
|
||||
@ -113,6 +119,8 @@ const config = {
|
||||
resolve({
|
||||
browser: true
|
||||
}),
|
||||
// core-js uses require, which needs to be transformed to es-modules
|
||||
commonjs(),
|
||||
{
|
||||
transform (code, id) {
|
||||
if (id.endsWith('.ts'))
|
||||
@ -127,7 +135,22 @@ const config = {
|
||||
// plugins: stage3Syntax,
|
||||
errorRecovery: true
|
||||
},
|
||||
presets: ['@babel/preset-typescript']
|
||||
presets: [
|
||||
['@babel/preset-typescript', {
|
||||
//onlyRemoveTypeImports: true // seems not necessary and generates a lot of warnings about not exported symbols
|
||||
}],
|
||||
['@babel/preset-env', {
|
||||
corejs: {
|
||||
version: "3"
|
||||
},
|
||||
useBuiltIns: "usage",
|
||||
modules: false,
|
||||
targets : {
|
||||
esmodules: true,
|
||||
safari: "14"
|
||||
}
|
||||
}],
|
||||
]
|
||||
}, function (err, result) {
|
||||
if (err)
|
||||
return reject(err);
|
||||
@ -193,4 +216,4 @@ export default function addAppsConfig()
|
||||
}
|
||||
}
|
||||
return conf;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user