Skip to content

Commit

Permalink
Merge branch 'main-beta' into epic/esl-carousel
Browse files Browse the repository at this point in the history
  • Loading branch information
ala-n committed Feb 7, 2024
2 parents eaea901 + 8b46b2b commit 0bb5eda
Show file tree
Hide file tree
Showing 26 changed files with 3,587 additions and 3,399 deletions.
4 changes: 2 additions & 2 deletions .releaserc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ branches:
# Release configuration
plugins:
- - "@semantic-release/commit-analyzer"
- preset: angular
- preset: conventionalcommits
releaseRules:
- type: style
release: patch
Expand All @@ -43,7 +43,7 @@ plugins:
release: patch

- - "@semantic-release/release-notes-generator"
- preset: angular
- preset: conventionalcommits
parserOpts:
noteKeywords:
- BREAKING CHANGE
Expand Down
2,944 changes: 2,944 additions & 0 deletions CHANGELOG(legacy-4.0.0).md

Large diffs are not rendered by default.

2,944 changes: 0 additions & 2,944 deletions CHANGELOG.md

Large diffs are not rendered by default.

172 changes: 86 additions & 86 deletions package-lock.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@
"@semantic-release/github": "^9.2.6",
"@semantic-release/npm": "^11.0.2",
"@semantic-release/release-notes-generator": "^12.1.0",
"@types/jest": "^29.5.11",
"@typescript-eslint/eslint-plugin": "^6.19.1",
"@typescript-eslint/parser": "^6.19.1",
"@types/jest": "^29.5.12",
"@typescript-eslint/eslint-plugin": "^6.20.0",
"@typescript-eslint/parser": "^6.20.0",
"chokidar-cli": "^3.0.0",
"concurrently": "^8.2.2",
"copyfiles": "^2.4.1",
Expand All @@ -114,19 +114,19 @@
"eslint-plugin-sonarjs": "^0.23.0",
"eslint-plugin-tsdoc": "^0.2.17",
"foreach-cli": "^1.8.1",
"husky": "^9.0.6",
"husky": "^9.0.10",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"kleur": "^4.1.5",
"less": "^4.2.0",
"lint-staged": "^15.2.0",
"lint-staged": "^15.2.1",
"postcss": "^8.4.33",
"postcss-less": "^6.0.0",
"prettier": "^3.2.4",
"prettier": "^3.2.5",
"rimraf": "^5.0.5",
"semantic-release": "^23.0.0",
"smoothscroll-polyfill": "^0.4.4",
"stylelint": "^16.2.0",
"stylelint": "^16.2.1",
"stylelint-prettier": "^5.0.0",
"ts-jest": "^29.1.2",
"typescript": "5.3.3"
Expand Down
8 changes: 5 additions & 3 deletions site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,17 @@
"minify:css": "cleancss -o \"dist/bundles/localdev.css\" \"dist/bundles/localdev.css\"",
"build": "npm run clean && concurrently \"npm run build:ts\" \"npm run build:less && npm run minify:css\" && npm run build:eleventy",
"build:ts": "webpack --mode=production",
"build:less": "lessc \"src/localdev.less\" \"dist/bundles/localdev.css\" --source-map=dist/bundles/localdev.css.map",
"build:less": "concurrently --kill-others \"npm run build:less:site\" \"npm run build:less:lib\"",
"build:less:site": "lessc \"src/localdev.less\" \"dist/bundles/localdev.css\" --source-map=dist/bundles/localdev.css.map",
"build:less:lib": "lessc \"src/playground/export/lib.less\" \"dist/bundles/lib.css\" --source-map=dist/bundles/lib.css.map",
"build:eleventy": "eleventy -- --env=production",
"build:analyzer": "webpack --mode=production --profile --json ../.report/stats.json && webpack-bundle-analyzer ../.report/stats.json dist/bundles -s gzip -m static -r ../.report/stats.html"
},
"dependencies": {
"@11ty/eleventy": "^2.0.1",
"@11ty/eleventy-dev-server": "^1.0.4",
"@exadel/esl": "../",
"@exadel/ui-playground": "2.0.0-beta.11",
"@exadel/ui-playground": "2.0.0-beta.12",
"@juggle/resize-observer": "^3.4.0",
"@types/prismjs": "^1.26.3",
"@types/smoothscroll-polyfill": "^0.3.3",
Expand All @@ -39,7 +41,7 @@
"prismjs": "^1.29.0",
"smoothscroll-polyfill": "^0.4.4",
"ts-loader": "^9.5.1",
"webpack": "^5.90.0",
"webpack": "^5.90.1",
"webpack-bundle-analyzer": "^4.10.1",
"webpack-cli": "^5.1.4"
},
Expand Down
2 changes: 1 addition & 1 deletion site/src/localdev.less
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@
@import './back-link/back-link';

// TODO: load separately async
@import './ui-playground/ui-playground.less';
@import './playground/ui-playground.less';
6 changes: 1 addition & 5 deletions site/src/localdev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,5 @@ import (/* webpackChunkName: 'common/esl-share' */'./esl-share/esl-share');

if (document.querySelector('uip-root')) {
// Init UI Playground
import (
/* webpackPrefetch: true */
/* webpackChunkName: "common/playground" */
'@exadel/ui-playground/esm/registration.js'
).then(({init}) => init());
import (/* webpackChunkName: "common/playground" */'./playground/ui-playground');
}
7 changes: 2 additions & 5 deletions site/src/navigation/header/header.less
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,8 @@
}

&-share-popup.esl-popup {
&,
& > .esl-popup-arrow {
background: @landing-bg-color;
border-color: gray;
}
--esl-popup-background-color: @landing-bg-color;
--esl-popup-border-color: gray;
.esl-share-list {
margin: 0.75rem;
gap: 0.25rem;
Expand Down
23 changes: 23 additions & 0 deletions site/src/playground/export/lib.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
@import '../../common/reboot.less';
@import '../../common/typography.less';
@import '../../common/colors.less';

@import '@exadel/esl/modules/all.less';

@import '../../common/accent-lines.less';
@import '../../common/accordion.less';
@import '../../common/alert.less';
@import '../../common/badge.less';
@import '../../common/buttons.less';
@import '../../common/code.less';
@import '../../common/links.less';
@import '../../common/close.less';
@import '../../common/containers.less';
@import '../../common/simple-grid.less';
@import '../../common/forms.less';
@import '../../common/flex.less';
@import '../../common/helpers.less';
@import '../../common/marquee.less';
@import '../../common/scrollbar.less';
@import '../../common/tabs.less';
@import '../../common/dropdown-menu.less';
1 change: 1 addition & 0 deletions site/src/playground/export/lib.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from '@exadel/esl';
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,8 @@ html {
.uip-inactive-setting {
display: none;
}

.uip-preview-h-scroll[inactive] {
display: none;
}
}
23 changes: 23 additions & 0 deletions site/src/playground/ui-playground.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import {init, UIPJSRenderingPreprocessors, UIPRenderingTemplatesService} from '@exadel/ui-playground';

// Add ESL lib alias
UIPJSRenderingPreprocessors.addRegexReplacer(
'esl-alias',
/["']@exadel\/esl["']/g,
'"/bundles/lib.js"'
);

// Add template
UIPRenderingTemplatesService.add('default', `
<html>
<head>
<title>{title}</title>
<base href="${location.origin}"/>
<link rel="stylesheet" href="/bundles/lib.css">
<script type="module">{script}</script>
</head>
<body>{content}</body>
</html>
`);

init();
12 changes: 4 additions & 8 deletions site/views/_includes/popup.njk
Original file line number Diff line number Diff line change
@@ -1,29 +1,25 @@
<esl-popup id="popup-t-a" position="top">
<div style="height: 70px; width:250px;"></div>
<span class="esl-popup-arrow"></span>
</esl-popup>
<esl-popup id="popup-b-a" position="bottom">
<div style="height: 70px; width:250px;"></div>
<span class="esl-popup-arrow"></span>
</esl-popup>
<esl-popup id="popup-l-a" position="left">
<div style="height: 250px; width:70px;"></div>
<span class="esl-popup-arrow"></span>
</esl-popup>
<esl-popup id="popup-r-a" position="right">
<div style="height: 250px; width:70px;"></div>
<span class="esl-popup-arrow"></span>
</esl-popup>

<esl-popup id="popup-t" position="top">
<esl-popup id="popup-t" class="disable-arrow" position="top">
<div style="height: 70px; width:250px;"></div>
</esl-popup>
<esl-popup id="popup-b" position="bottom">
<esl-popup id="popup-b" class="disable-arrow" position="bottom">
<div style="height: 70px; width:250px;"></div>
</esl-popup>
<esl-popup id="popup-l" position="left">
<esl-popup id="popup-l" class="disable-arrow" position="left">
<div style="height: 250px; width:50px;"></div>
</esl-popup>
<esl-popup id="popup-r" position="right">
<esl-popup id="popup-r" class="disable-arrow" position="right">
<div style="height: 250px; width:50px;"></div>
</esl-popup>
4 changes: 0 additions & 4 deletions site/views/draft/popup-scroll-parents.njk
Original file line number Diff line number Diff line change
Expand Up @@ -77,19 +77,15 @@ aside:

<esl-popup id="popup-container-top" position="top" container="#popup-scroll-parents-a">
<div style="height: 70px; width:250px;"></div>
<span class="esl-popup-arrow"></span>
</esl-popup>
<esl-popup id="popup-container-bottom" position="bottom" container="#popup-scroll-parents-a" offset-arrow="50">
<div style="height: 70px; width:250px;"></div>
<span class="esl-popup-arrow"></span>
</esl-popup>
<esl-popup id="popup-container-left" position="left" container="#popup-scroll-parents-a">
<div style="height: 250px; width:70px;"></div>
<span class="esl-popup-arrow"></span>
</esl-popup>
<esl-popup id="popup-container-right" position="right" container="#popup-scroll-parents-a">
<div style="height: 250px; width:70px;"></div>
<span class="esl-popup-arrow"></span>
</esl-popup>
</div>
</section>
Expand Down
Loading

0 comments on commit 0bb5eda

Please sign in to comment.