Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file. The format

### Changed

- ⚠️ Update the default breakpoints to match `@studiometa/tailwind-config` ([#708](https://github.com/studiometa/js-toolkit/pull/708))
- Assemble the published package in `packages/js-toolkit/` instead of a repository-level `dist/`. The subpaths a consumer imports are unchanged ([#777](https://github.com/studiometa/js-toolkit/pull/777))
- Build with tsdown (rolldown) instead of esbuild plus a separate `tsgo --build` pass, in every package ([#777](https://github.com/studiometa/js-toolkit/pull/777))
- Format with `oxfmt` instead of Prettier, across the whole tree; the demo keeps Prettier for its Twig templates ([#777](https://github.com/studiometa/js-toolkit/pull/777))
Expand Down Expand Up @@ -177,6 +178,7 @@ All notable changes to this project will be documented in this file. The format

- Deprecate `$parent`, `$children` and `$root` instance properties in favor of `$closest(name)` and `$query(name)` ([#694](https://github.com/studiometa/js-toolkit/issues/694))

||||||| parent of 74613a7a (Update changelog)

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick: Remove the leftover merge-conflict marker

The literal token ||||||| parent of 74613a7a (Update changelog) is present in the published changelog, leaving an unresolved merge-conflict artifact in the Markdown. Delete this line before merging.

Confidence: high.


Reviewed by @weareikko/code-review v0.9.5 for commit dfbc093.

## [v3.4.3](https://github.com/studiometa/js-toolkit/compare/3.4.2..3.4.3) (2025-11-13)

### Fixed
Expand Down
8 changes: 4 additions & 4 deletions packages/docs/api/decorators/withBreakpointManager.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import MenuMobile from './MenuMobile';
import MenuDesktop from './MenuDesktop';

export default class Menu extends withBreakpointManager(Base, [
['xxs xs s', MenuMobile],
['m l xl xxl', MenuDesktop],
['2xs xs s', MenuMobile],
['m l xl 2xl', MenuDesktop],
]) {
static config = {
name: 'Menu',
Expand Down Expand Up @@ -48,8 +48,8 @@ import MenuMobile from './MenuMobile';
import MenuDesktop from './MenuDesktop';

export default class Menu extends withBreakpointManager(Base, [
['xxs xs s', MenuMobile],
['m l xl xxl', MenuDesktop],
['2xs xs s', MenuMobile],
['m l xl 2xl', MenuDesktop],
]) {
static config = {
name: 'Menu',
Expand Down
6 changes: 3 additions & 3 deletions packages/docs/api/decorators/withBreakpointObserver.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default class MobileComponent extends withBreakpointObserver(Base) {
options: {
activeBreakpoints: {
type: String,
default: 'xxs xs s',
default: '2xs xs s',
},
},
};
Expand Down Expand Up @@ -49,7 +49,7 @@ export default class MobileComponent extends withBreakpointObserver(Base) {
options: {
activeBreakpoints: {
type: String,
default: 'xxs xs s',
default: '2xs xs s',
},
},
};
Expand All @@ -70,7 +70,7 @@ export default class MobileComponent extends withBreakpointObserver(Base) {
options: {
inactiveBreakpoints: {
type: String,
default: 'm l xl xxl',
default: 'm l xl 2xl',
},
},
};
Expand Down
14 changes: 7 additions & 7 deletions packages/docs/api/services/useResize.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@ Configure the breakpoints used for responsive features of this service. This par

```js
{
xxs: '0rem', // 0px
'2xs': '0rem',
xs: '30rem', // 480px
s: '48rem', // 768px
m: '64rem', // 1024px
l: '80rem', // 1280px
xl: '90rem', // 1440px
xxl: '120rem', // 1920px
xxxl: '160rem', // 2560px
s: '40rem', // 640px
m: '48rem', // 768px
l: '64rem', // 1024px
xl: '80rem', // 1280px
'2xl': '96rem', // 1440px
'3xl': '120rem', // 1920px
}
```

Expand Down
14 changes: 7 additions & 7 deletions packages/js-toolkit/src/Base/features.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ export const features = new Map<keyof Features, Features[keyof Features]>([
[
'breakpoints',
{
xxs: '0rem',
'2xs': '0rem',
xs: '30rem', // 480px
s: '48rem', // 768px
m: '64rem', // 1024px
l: '80rem', // 1280px
xl: '90rem', // 1440px
xxl: '120rem', // 1920px
xxxl: '160rem', // 2560px
s: '40rem', // 640px
m: '48rem', // 768px
l: '64rem', // 1024px
xl: '80rem', // 1280px
'2xl': '96rem', // 1440px
'3xl': '120rem', // 1920px
},
],
['prefix', 'tk'],
Expand Down
Loading