mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-21 23:43:17 +01:00
Docs: Get the ETemplate2 webComponent widets working on doc site
Sort of. This breaks shoelace images due to them not being imported / copied, and not using the CDN
This commit is contained in:
parent
6e0301d249
commit
d15c63198c
@ -1706,7 +1706,7 @@ function transformAttributes(widget, mgr : et2_arrayMgr, attributes)
|
|||||||
*/
|
*/
|
||||||
export function cssImage(image_name : string, app_name? : string)
|
export function cssImage(image_name : string, app_name? : string)
|
||||||
{
|
{
|
||||||
let url = egw?.image(image_name, app_name);
|
let url = egw?.image && egw?.image(image_name, app_name);
|
||||||
if(url)
|
if(url)
|
||||||
{
|
{
|
||||||
return css`url(${unsafeCSS(url)})`;
|
return css`url(${unsafeCSS(url)})`;
|
||||||
|
@ -15,7 +15,7 @@ import {egw} from "../../jsapi/egw_global";
|
|||||||
registerIconLibrary('default', {
|
registerIconLibrary('default', {
|
||||||
resolver: name =>
|
resolver: name =>
|
||||||
{
|
{
|
||||||
return typeof egw !== "undefined" ? `${egw.webserverUrl}/node_modules/@shoelace-style/shoelace/dist/assets/icons/${name}.svg` : ''
|
return typeof egw !== "undefined" ? `${egw.webserverUrl || ""}/node_modules/@shoelace-style/shoelace/dist/assets/icons/${name}.svg` : ''
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -24,12 +24,15 @@ registerIconLibrary('default', {
|
|||||||
* @example <sl-icon library="egw" name="infolog/navbar"/>
|
* @example <sl-icon library="egw" name="infolog/navbar"/>
|
||||||
* @example <sl-icon library="egw" name="5_day_view"/>
|
* @example <sl-icon library="egw" name="5_day_view"/>
|
||||||
*/
|
*/
|
||||||
registerIconLibrary('egw', {
|
if(typeof egw !== "undefined" && typeof egw.image == "function")
|
||||||
resolver: name =>
|
{
|
||||||
{
|
registerIconLibrary('egw', {
|
||||||
return typeof egw !== "undefined" ? (egw.image(name) || '') : ''
|
resolver: name =>
|
||||||
},
|
{
|
||||||
});
|
return (egw.image(name) || '');
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Customise shoelace styles to match our stuff
|
* Customise shoelace styles to match our stuff
|
||||||
@ -39,10 +42,10 @@ export default [sl_css, css`
|
|||||||
:root,
|
:root,
|
||||||
:host,
|
:host,
|
||||||
.sl-theme-light {
|
.sl-theme-light {
|
||||||
--sl-font-size-medium: ${typeof egw != "undefined" && egw.preference('textsize', 'common') != '12' ? parseInt(egw.preference('textsize', 'common')) : 12}px;
|
--sl-font-size-medium: ${typeof egw != "undefined" && egw.preference && egw.preference('textsize', 'common') != '12' ? parseInt(egw.preference('textsize', 'common')) : 12}px;
|
||||||
--sl-input-height-small: 24px;
|
--sl-input-height-small: 24px;
|
||||||
--sl-input-height-medium: 32px;
|
--sl-input-height-medium: 32px;
|
||||||
--sl-button-font-size-medium: ${typeof egw != "undefined" && egw.preference('textsize', 'common') != '12' ? parseInt(egw.preference('textsize', 'common')) : 12}px;
|
--sl-button-font-size-medium: ${typeof egw != "undefined" && egw.preference && egw.preference('textsize', 'common') != '12' ? parseInt(egw.preference('textsize', 'common')) : 12}px;
|
||||||
--sl-input-help-text-font-size-medium: var(--sl-font-size-medium);
|
--sl-input-help-text-font-size-medium: var(--sl-font-size-medium);
|
||||||
--sl-spacing-small: 0.1rem;
|
--sl-spacing-small: 0.1rem;
|
||||||
--sl-spacing-medium: 0.5rem;
|
--sl-spacing-medium: 0.5rem;
|
||||||
|
@ -7,5 +7,6 @@
|
|||||||
* @subpackage ajax
|
* @subpackage ajax
|
||||||
* @author Ralf Becker <rb@egroupware.org>
|
* @author Ralf Becker <rb@egroupware.org>
|
||||||
*/
|
*/
|
||||||
|
import "../../../vendor/bower-asset/jquery/dist/jquery.min.js";
|
||||||
|
|
||||||
jQuery.noConflict();
|
jQuery.noConflict();
|
@ -35,10 +35,11 @@
|
|||||||
|
|
||||||
{# Shoelace #}
|
{# Shoelace #}
|
||||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@shoelace-style/shoelace@{{ meta.shoelaceVersion }}/cdn/themes/light.css" />
|
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@shoelace-style/shoelace@{{ meta.shoelaceVersion }}/cdn/themes/light.css" />
|
||||||
|
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@shoelace-style/shoelace@{{ meta.shoelaceVersion }}/cdn/themes/dark.css" />
|
||||||
<script type="module" src="https://cdn.jsdelivr.net/npm/@shoelace-style/shoelace@{{ meta.shoelaceVersion }}/cdn/shoelace-autoloader.js"></script>
|
<script type="module" src="https://cdn.jsdelivr.net/npm/@shoelace-style/shoelace@{{ meta.shoelaceVersion }}/cdn/shoelace-autoloader.js"></script>
|
||||||
|
|
||||||
{# EGroupware #}
|
{# EGroupware #}
|
||||||
<!--<script src="{{ assetUrl('scripts/etemplate/etemplate2.js') }}" type="module"></script>-->
|
<script src="{{ assetUrl('scripts/sub/dir/etemplate/etemplate2.js') }}" type="module" id="egw_script_id"></script>
|
||||||
|
|
||||||
{# Set the initial theme and menu states here to prevent flashing #}
|
{# Set the initial theme and menu states here to prevent flashing #}
|
||||||
<script>
|
<script>
|
||||||
|
@ -57,10 +57,24 @@ module.exports = function (eleventyConfig)
|
|||||||
//
|
//
|
||||||
// Copy EGw stuff in
|
// Copy EGw stuff in
|
||||||
//
|
//
|
||||||
|
// General assets
|
||||||
eleventyConfig.addPassthroughCopy({"../../api/templates/default/images/logo.svg": "assets/images/logo.svg"});
|
eleventyConfig.addPassthroughCopy({"../../api/templates/default/images/logo.svg": "assets/images/logo.svg"});
|
||||||
eleventyConfig.addPassthroughCopy({"../../pixelegg/css/monochrome.css": "assets/styles/monochrome.css"});
|
eleventyConfig.addPassthroughCopy({"../../pixelegg/css/monochrome.css": "assets/styles/monochrome.css"});
|
||||||
//eleventyConfig.addPassthroughCopy({"../../api/js": "assets/scripts/chunks"});
|
|
||||||
eleventyConfig.addPassthroughCopy({"../../api/js/etemplate/etemplate2.js": "assets/scripts/etemplate/etemplate2.js"});
|
// vendor requirements
|
||||||
|
eleventyConfig.addPassthroughCopy({
|
||||||
|
"../../vendor/bower-asset/jquery/dist/jquery.min.js": "assets/scripts/vendor/bower-asset/jquery/dist/jquery.min.js",
|
||||||
|
"../../vendor/bower-asset/cropper/dist/cropper.min.js": "assets/scripts/vendor/bower-asset/cropper/dist/cropper.min.js",
|
||||||
|
"../../vendor/bower-asset/diff2html/dist/diff2html.min.js": "assets/scripts/vendor/bower-asset/diff2html/dist/diff2html.min.js",
|
||||||
|
"../../vendor/tinymce/tinymce/tinymce.min.js": "assets/scripts/vendor/tinymce/tinymce/tinymce.min.js",
|
||||||
|
})
|
||||||
|
|
||||||
|
// Etemplate2
|
||||||
|
eleventyConfig.addPassthroughCopy({"../../chunks": "assets/scripts/chunks"});
|
||||||
|
eleventyConfig.addPassthroughCopy({"../../api/js/etemplate/etemplate2.js": "assets/scripts/sub/dir/etemplate/etemplate2.js"});
|
||||||
|
|
||||||
|
//eleventyConfig.addPassthroughCopy({"../../vendor/**/*min.js": "assets/scripts/vendor/"});
|
||||||
|
//eleventyConfig.addPassthroughCopy("../dist/etemplate2.js", "assets/scripts/etemplate2.js");
|
||||||
|
|
||||||
// Shoelace is done via CDN in default.njk
|
// Shoelace is done via CDN in default.njk
|
||||||
|
|
||||||
|
@ -94,7 +94,7 @@ async function buildTheDocs(watch = false)
|
|||||||
//
|
//
|
||||||
async function buildTheSource()
|
async function buildTheSource()
|
||||||
{
|
{
|
||||||
const alwaysExternal = ['@lit'];
|
const alwaysExternal = [/*'@lit',*/ 'jquery'];
|
||||||
|
|
||||||
const cdnConfig = {
|
const cdnConfig = {
|
||||||
format: 'esm',
|
format: 'esm',
|
||||||
@ -104,21 +104,21 @@ async function buildTheSource()
|
|||||||
// NOTE: Entry points must be mapped in package.json > exports, otherwise users won't be able to import them!
|
// NOTE: Entry points must be mapped in package.json > exports, otherwise users won't be able to import them!
|
||||||
//
|
//
|
||||||
// The whole shebang
|
// The whole shebang
|
||||||
'./src/shoelace.ts',
|
'./api/js/etemplate/etemplate2.ts',
|
||||||
// The auto-loader
|
// The auto-loader
|
||||||
'./src/shoelace-autoloader.ts',
|
//'./src/shoelace-autoloader.ts',
|
||||||
// Components
|
// Components
|
||||||
...(await globby('./src/components/**/!(*.(style|test)).ts')),
|
//...(await globby('./src/components/**/!(*.(style|test)).ts')),
|
||||||
// Translations
|
// Translations
|
||||||
...(await globby('./src/translations/**/*.ts')),
|
//...(await globby('./src/translations/**/*.ts')),
|
||||||
// Public utilities
|
// Public utilities
|
||||||
...(await globby('./src/utilities/**/!(*.(style|test)).ts')),
|
//...(await globby('./src/utilities/**/!(*.(style|test)).ts')),
|
||||||
// Theme stylesheets
|
// Theme stylesheets
|
||||||
...(await globby('./src/themes/**/!(*.test).ts')),
|
//...(await globby('./src/themes/**/!(*.test).ts')),
|
||||||
// React wrappers
|
// React wrappers
|
||||||
...(await globby('./src/react/**/*.ts'))
|
//...(await globby('./src/react/**/*.ts'))
|
||||||
],
|
],
|
||||||
outdir: cdndir,
|
outdir: sitedir + '/assets/scripts',
|
||||||
chunkNames: 'chunks/[name].[hash]',
|
chunkNames: 'chunks/[name].[hash]',
|
||||||
define: {
|
define: {
|
||||||
// Floating UI requires this to be set
|
// Floating UI requires this to be set
|
||||||
|
Loading…
Reference in New Issue
Block a user