Skip to content

Commit 8d45fa1

Browse files
titouanmathistitouanmathis
committed
Merge branch 'release/2.4.2'
2 parents d8e31e0 + 4b64b81 commit 8d45fa1

File tree

22 files changed

+2245
-475
lines changed

22 files changed

+2245
-475
lines changed

‎package-lock.json‎

Lines changed: 1877 additions & 377 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@studiometa/js-toolkit-workspace",
3-
"version": "2.4.1",
3+
"version": "2.4.2",
44
"private": true,
55
"workspaces": [
66
"packages/*"
@@ -23,19 +23,19 @@
2323
"build-for-export-size": "node scripts/add-utils-export.js && rm -rf dist && npm run build:pkg && npm run build:cp-files"
2424
},
2525
"devDependencies": {
26-
"@studiometa/eslint-config": "^3.0.1",
26+
"@studiometa/eslint-config": "^3.0.5",
2727
"@studiometa/prettier-config": "^2.1.1",
2828
"@studiometa/stylelint-config": "^2.0.0",
29-
"@types/estree": "^0.0.51",
29+
"@types/estree": "^0.0.52",
3030
"@types/jest": "^27.5.2",
31-
"@types/node": "^17.0.42",
32-
"@typescript-eslint/eslint-plugin": "^5.27.1",
33-
"@typescript-eslint/parser": "^5.27.1",
34-
"esbuild": "^0.14.43",
35-
"eslint": "^8.16.0",
36-
"eslint-plugin-jest": "^26.5.3",
31+
"@types/node": "^17.0.45",
32+
"@typescript-eslint/eslint-plugin": "^5.33.1",
33+
"@typescript-eslint/parser": "^5.33.1",
34+
"esbuild": "^0.15.5",
35+
"eslint": "^8.22.0",
36+
"eslint-plugin-jest": "^26.8.3",
3737
"fast-glob": "^3.2.11",
3838
"prettier": "^2.7.1",
39-
"typescript": "^4.7.2"
39+
"typescript": "^4.7.4"
4040
}
4141
}

‎packages/demo/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
22
"name": "@studiometa/js-toolkit-demo",
3-
"version": "2.4.1",
3+
"version": "2.4.2",
44
"private": true,
55
"type": "commonjs",
66
"scripts": {
77
"dev": "meta dev",
88
"build": "meta build"
99
},
1010
"dependencies": {
11-
"@studiometa/eslint-config": "^3.0.1",
11+
"@studiometa/eslint-config": "^3.0.5",
1212
"@studiometa/stylelint-config": "^2.0.0",
1313
"@studiometa/tailwind-config": "^1.1.0",
14-
"@studiometa/ui": "^0.2.7",
14+
"@studiometa/ui": "^0.2.11",
1515
"@studiometa/webpack-config": "^3.1.2",
16-
"eslint": "^8.16.0",
17-
"postcss": "^8.4.14",
16+
"eslint": "^8.22.0",
17+
"postcss": "^8.4.16",
1818
"prettier": "^2.7.1",
1919
"stylefire": "^7.0.3",
2020
"stylelint": "^13.13.1",
21-
"tailwindcss": "^3.1.3"
21+
"tailwindcss": "^3.1.8"
2222
}
2323
}

‎packages/demo/src/js/app.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
importOnInteraction,
88
withBreakpointObserver,
99
} from '@studiometa/js-toolkit';
10-
import { matrix } from '@studiometa/js-toolkit/utils/css';
10+
import { matrix } from '@studiometa/js-toolkit/utils';
1111
import ScrollToDemo from './components/ScrollToDemo.js';
1212
import Parallax from './components/Parallax.js';
1313
import ResponsiveOptions from './components/ResponsiveOptions.js';

‎packages/demo/src/js/components/AnimateTest.js‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,20 @@ import { animate, ease, domScheduler } from '@studiometa/js-toolkit/utils';
33

44
/**
55
* AnimateTest class.
6+
* @typedef {{
7+
* target: HTMLElement,
8+
* start: HTMLButtonElement,
9+
* pause: HTMLButtonElement,
10+
* play: HTMLButtonElement,
11+
* finish: HTMLButtonElement,
12+
* progress: HTMLInputElement,
13+
* }} AnimateTestRefs
14+
* @typedef {{
15+
* steps: Parameters<animate>[1],
16+
* duration: number,
17+
* easing: string,
18+
* }} AnimateTestOptions
19+
* @augments {Base<{ $refs: AnimateTestRefs, $options: AnimateTestOptions }>}
620
*/
721
export default class AnimateTest extends Base {
822
/**

‎packages/demo/src/js/components/BreakPointManagerDemo/index.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { Base } from '@studiometa/js-toolkit';
2-
import { withBreakpointManager } from '@studiometa/js-toolkit/decorators';
1+
import { Base, withBreakpointManager } from '@studiometa/js-toolkit';
32
import BreakpointManagerDemoMobile from './BreakpointManagerDemoMobile.js';
43
import BreakpointManagerDemoTablet from './BreakpointManagerDemoTablet.js';
54
import BreakpointManagerDemoDesktop from './BreakpointManagerDemoDesktop.js';

‎packages/demo/src/js/components/BreakpointObserverDemo.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { Base } from '@studiometa/js-toolkit';
2-
import { withBreakpointObserver } from '@studiometa/js-toolkit/decorators';
1+
import { Base, withBreakpointObserver } from '@studiometa/js-toolkit';
32

43
export default class BreakpointObserverDemo extends withBreakpointObserver(Base) {
54
static config = {

‎packages/demo/src/js/components/Lazyload.js‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1-
import { Base } from '@studiometa/js-toolkit';
2-
import { withIntersectionObserver } from '@studiometa/js-toolkit/decorators';
3-
import transition, { setClassesOrStyles } from '@studiometa/js-toolkit/utils/css/transition';
1+
import { Base, withIntersectionObserver } from '@studiometa/js-toolkit';
2+
import { transition, isString, isArray, addClass, addStyle } from '@studiometa/js-toolkit/utils';
3+
4+
function setClassesOrStyles(element, classesOrStyles) {
5+
if (isString(classesOrStyles) || isArray(classesOrStyles)) {
6+
addClass(element, classesOrStyles);
7+
} else {
8+
addStyle(element, classesOrStyles);
9+
}
10+
}
411

512
export default class Lazyload extends withIntersectionObserver(Base) {
613
static config = {

‎packages/demo/src/js/components/ScrollToDemo.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Base } from '@studiometa/js-toolkit';
2-
import scrollTo from '@studiometa/js-toolkit/utils/scrollTo';
2+
import { scrollTo } from '@studiometa/js-toolkit/utils';
33

44
export default class ScrollToDemo extends Base {
55
static config = {

‎packages/docs/.vitepress/config.js‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ const pkg = JSON.parse(
88
export default defineConfig({
99
lang: 'en-US',
1010
title: 'JS Toolkit',
11-
description: 'The JS Toolkit by Studio Meta is a JavaScript data-attributes driven micro-framework shipped with plenty of useful utility functions to boost your project.',
11+
description:
12+
'The JS Toolkit by Studio Meta is a JavaScript data-attributes driven micro-framework shipped with plenty of useful utility functions to boost your project.',
1213
lastUpdated: true,
1314
head: [['link', { rel: 'icon', type: 'image/x-icon', href: '/logo.png' }]],
1415
themeConfig: {
@@ -65,6 +66,7 @@ function getGuideSidebar() {
6566
{
6667
text: 'Going further',
6768
items: [
69+
{ text: 'Typing components', link: '/guide/going-further/typing-components.html' },
6870
{ text: 'Using decorators', link: '/guide/going-further/using-decorators.html' },
6971
{ text: 'Lazy imports', link: '/guide/going-further/lazy-imports.html' },
7072
{
@@ -107,21 +109,25 @@ function getApiSidebar({ expanded = 'api' } = {}) {
107109
{
108110
text: 'Base class',
109111
link: '/api/',
112+
collapsible: true,
110113
items: expanded === 'api' ? getBaseSidebar() : getBaseSidebar(),
111114
},
112115
{
113116
text: 'Helpers',
114117
link: '/api/helpers/',
118+
collapsible: true,
115119
items: expanded === 'helpers' ? getHelpersSidebar() : getHelpersSidebar(),
116120
},
117121
{
118122
text: 'Services',
119123
link: '/api/services/',
124+
collapsible: true,
120125
items: expanded === 'services' ? getServicesSidebar() : getServicesSidebar(),
121126
},
122127
{
123128
text: 'Decorators',
124129
link: '/api/decorators/',
130+
collapsible: true,
125131
items: expanded === 'decorators' ? getDecoratorsSidebar() : getDecoratorsSidebar(),
126132
},
127133
];
@@ -212,6 +218,7 @@ function getUtilsSidebar() {
212218
{
213219
text: 'Utils',
214220
link: '/utils/',
221+
collapsible: true,
215222
items: [
216223
{ text: 'debounce', link: '/utils/debounce.html' },
217224
{ text: 'focusTrap', link: '/utils/focusTrap.html' },
@@ -229,6 +236,7 @@ function getUtilsSidebar() {
229236
{
230237
text: 'Collision utils',
231238
link: '/utils/collision/',
239+
collapsible: true,
232240
items: [
233241
{ text: 'boundingRectToCircle', link: '/utils/collision/boundingRectToCircle.html' },
234242
{ text: 'collideCircleCircle', link: '/utils/collision/collideCircleCircle.html' },
@@ -241,6 +249,7 @@ function getUtilsSidebar() {
241249
{
242250
text: 'CSS utils',
243251
// link: '/utils/css/',
252+
collapsible: true,
244253
items: [
245254
{ text: 'addClass', link: '/utils/css/addClass.html' },
246255
{ text: 'addStyle', link: '/utils/css/addStyle.html' },
@@ -257,6 +266,7 @@ function getUtilsSidebar() {
257266
{
258267
text: 'History utils',
259268
link: '/utils/history/',
269+
collapsible: true,
260270
items: [
261271
{ text: 'historyPush', link: '/utils/history/historyPush.html' },
262272
{ text: 'historyReplace', link: '/utils/history/historyReplace.html' },
@@ -266,6 +276,7 @@ function getUtilsSidebar() {
266276
{
267277
text: 'Math utils',
268278
// link: '/utils/math/',
279+
collapsible: true,
269280
items: [
270281
{ text: 'clamp', link: '/utils/math/clamp.html' },
271282
{ text: 'clamp01', link: '/utils/math/clamp01.html' },
@@ -282,6 +293,7 @@ function getUtilsSidebar() {
282293
{
283294
text: 'String utils',
284295
link: '/utils/string/',
296+
collapsible: true,
285297
items: [
286298
{ text: 'withLeadingCharacters', link: '/utils/string/withLeadingCharacters.html' },
287299
{ text: 'withLeadingSlash', link: '/utils/string/withLeadingSlash.html' },

0 commit comments

Comments
 (0)