Skip to content

Commit fcb1894

Browse files
akash-amanakash-aman
authored
Merge pull request #84 from xcode-studio/fix/v1-final-patch
fix: final 1.x patch (React 18, types, require) with 2.0 deprecations
2 parents b17b695 + a8295a7 commit fcb1894

33 files changed

Lines changed: 245 additions & 71 deletions

‎.changeset/v1-final-patch.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
'@dynamix-layout/core': patch
3+
'@dynamix-layout/react': patch
4+
'@dynamix-layout/solid': patch
5+
---
6+
7+
Packaging fixes for 1.x, and deprecation notes ahead of 2.0.
8+
9+
- **React 18 works.** The React bundle no longer inlines React 19's `react/jsx-runtime`, and the peer dependencies are `react` and `react-dom` `^18.0.0 || ^19.0.0` (the `react` peer was `^0.0.1`). The React package's unused IIFE/UMD builds are gone; they weren't reachable through `exports`.
10+
- **Types resolve.** The published declarations of the React and Solid packages imported `../../../core/src`, a path that doesn't exist in the package, so core types were `any`. Each package now ships one self-contained declaration file, plus `index.d.cts` for CommonJS.
11+
- **`require()` works.** The CommonJS builds were named `*.cjs.js` in `"type": "module"` packages, so Node loaded them as ESM. They're now `*.cjs`. Core's `browser` field, which pointed at an IIFE without exports, is removed.
12+
- **Installs on Node 18 and later** (it required Node 22).
13+
- **Solid:** `solid-js` is a peer dependency, so apps don't end up with two copies.
14+
- **Docs:**
15+
- The README now gives the correct stylesheet path, `@dynamix-layout/react/style.css` (`styles.css` also works).
16+
- Repository links point to `xcode-studio/dynamix-layout`.
17+
- **Deprecations:** the props and exports that 2.0 renames or removes are marked `@deprecated`, each naming its replacement and linking the migration guide. Behaviour is unchanged.

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ First off, thank you for considering contributing to Dynamix Layout! It's people
66

77
### Reporting Bugs
88

9-
If you find a bug, please open an issue on our [GitHub Issues page](https://github.com/akash-aman/dynamix-layout/issues). Please include a clear title and description, as much relevant information as possible, and a code sample or an executable test case demonstrating the expected behavior that is not occurring.
9+
If you find a bug, please open an issue on our [GitHub Issues page](https://github.com/xcode-studio/dynamix-layout/issues). Please include a clear title and description, as much relevant information as possible, and a code sample or an executable test case demonstrating the expected behavior that is not occurring.
1010

1111
### Suggesting Enhancements
1212

13-
If you have an idea for an enhancement, please open an issue on our [GitHub Issues page](https://github.com/akash-aman/dynamix-layout/issues). Please provide a clear title and a detailed description of your suggestion.
13+
If you have an idea for an enhancement, please open an issue on our [GitHub Issues page](https://github.com/xcode-studio/dynamix-layout/issues). Please provide a clear title and a detailed description of your suggestion.
1414

1515
### Pull Requests
1616

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<a href="https://www.npmjs.com/package/@dynamix-layout/core">
1717
<img src="https://img.shields.io/npm/v/@dynamix-layout/core?style=for-the-badge&label=Core" alt="NPM">
1818
</a>
19-
<img src="https://img.shields.io/github/license/akash-aman/dynamix-layout?style=for-the-badge" alt="License">
19+
<img src="https://img.shields.io/github/license/xcode-studio/dynamix-layout?style=for-the-badge" alt="License">
2020
</p>
2121

2222
<p align="center">
@@ -49,7 +49,7 @@ Dynamix Layout is a powerful JavaScript library designed to help you build compl
4949

5050
---
5151

52-
![Demo](https://raw.githubusercontent.com/akash-aman/dynamix-layout/main/assets/demo1.gif)
52+
![Demo](https://raw.githubusercontent.com/xcode-studio/dynamix-layout/main/assets/demo1.gif)
5353

5454
---
5555

@@ -167,7 +167,7 @@ export default App
167167

168168
## 🤝 Contributing
169169

170-
Contributions, issues, and feature requests are welcome\! Feel free to check the [issues page](https://github.com/akash-aman/dynamix-layout/issues).
170+
Contributions, issues, and feature requests are welcome\! Feel free to check the [issues page](https://github.com/xcode-studio/dynamix-layout/issues).
171171

172172
## 📝 License
173173

‎SECURITY.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The team takes the security of our project seriously. We appreciate your efforts
66

77
If you discover a security vulnerability, please report it to us privately. **Do not create a public GitHub issue.**
88

9-
We encourage you to report vulnerabilities through **[GitHub's Private Vulnerability Reporting](https://github.com/akash-aman/dynamix-layout/security)** feature. You can do this by going to the "Security" tab of our repository and clicking on "Report a vulnerability".
9+
We encourage you to report vulnerabilities through **[GitHub's Private Vulnerability Reporting](https://github.com/xcode-studio/dynamix-layout/security)** feature. You can do this by going to the "Security" tab of our repository and clicking on "Report a vulnerability".
1010

1111
Alternatively, you can email us at **[sir.akashaman@gmail.com]**.
1212

‎apps/site/src/components/Footer.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const Footer = () => {
6060
<ul className="space-y-3 text-sm">
6161
<li>
6262
<a
63-
href="https://github.com/akash-aman/dynamix-layout/blob/main/README.md"
63+
href="https://github.com/xcode-studio/dynamix-layout/blob/main/README.md"
6464
target="_blank"
6565
rel="noopener noreferrer"
6666
className="text-muted-foreground hover:text-primary transition-colors"
@@ -70,7 +70,7 @@ const Footer = () => {
7070
</li>
7171
<li>
7272
<a
73-
href="https://github.com/akash-aman/dynamix-layout/tree/main/examples"
73+
href="https://github.com/xcode-studio/dynamix-layout/tree/main/examples"
7474
target="_blank"
7575
rel="noopener noreferrer"
7676
className="text-muted-foreground hover:text-primary transition-colors"
@@ -80,7 +80,7 @@ const Footer = () => {
8080
</li>
8181
<li>
8282
<a
83-
href="https://github.com/akash-aman/dynamix-layout/blob/main/packages/core/README.md"
83+
href="https://github.com/xcode-studio/dynamix-layout/blob/main/packages/core/README.md"
8484
target="_blank"
8585
rel="noopener noreferrer"
8686
className="text-muted-foreground hover:text-primary transition-colors"
@@ -90,7 +90,7 @@ const Footer = () => {
9090
</li>
9191
<li>
9292
<a
93-
href="https://github.com/akash-aman/dynamix-layout/blob/main/packages/react/README.md"
93+
href="https://github.com/xcode-studio/dynamix-layout/blob/main/packages/react/README.md"
9494
target="_blank"
9595
rel="noopener noreferrer"
9696
className="text-muted-foreground hover:text-primary transition-colors"
@@ -107,7 +107,7 @@ const Footer = () => {
107107
<ul className="space-y-3 text-sm">
108108
<li>
109109
<a
110-
href="https://github.com/akash-aman/dynamix-layout/issues"
110+
href="https://github.com/xcode-studio/dynamix-layout/issues"
111111
target="_blank"
112112
rel="noopener noreferrer"
113113
className="text-muted-foreground hover:text-primary transition-colors"
@@ -117,7 +117,7 @@ const Footer = () => {
117117
</li>
118118
<li>
119119
<a
120-
href="https://github.com/akash-aman/dynamix-layout/discussions/44"
120+
href="https://github.com/xcode-studio/dynamix-layout/discussions/44"
121121
target="_blank"
122122
rel="noopener noreferrer"
123123
className="text-muted-foreground hover:text-primary transition-colors"
@@ -126,13 +126,13 @@ const Footer = () => {
126126
</a>
127127
</li>
128128
{/* <li>
129-
<a href="https://github.com/akash-aman/dynamix-layout/issues" target="_blank" rel="noopener noreferrer" className="text-muted-foreground hover:text-primary transition-colors">
129+
<a href="https://github.com/xcode-studio/dynamix-layout/issues" target="_blank" rel="noopener noreferrer" className="text-muted-foreground hover:text-primary transition-colors">
130130
Discord
131131
</a>
132132
</li> */}
133133
<li>
134134
<a
135-
href="https://github.com/akash-aman/dynamix-layout/blob/main/CONTRIBUTING.md"
135+
href="https://github.com/xcode-studio/dynamix-layout/blob/main/CONTRIBUTING.md"
136136
target="_blank"
137137
rel="noopener noreferrer"
138138
className="text-muted-foreground hover:text-primary transition-colors"
@@ -228,7 +228,7 @@ const Footer = () => {
228228
asChild
229229
>
230230
<a
231-
href="http://github.com/akash-aman/dynamix-layout"
231+
href="http://github.com/xcode-studio/dynamix-layout"
232232
target="_blank"
233233
rel="noopener noreferrer"
234234
title="GitHub Repository"

‎apps/site/src/components/Header.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ const Header = () => {
4242
Demo
4343
</a>
4444
<a
45-
href="https://github.com/akash-aman/dynamix-layout/blob/main/README.md"
45+
href="https://github.com/xcode-studio/dynamix-layout/blob/main/README.md"
4646
target="_blank"
4747
rel="noopener noreferrer"
4848
className="text-muted-foreground hover:text-primary transition-colors"
4949
>
5050
Docs
5151
</a>
5252
<a
53-
href="https://github.com/akash-aman/dynamix-layout/discussions/44"
53+
href="https://github.com/xcode-studio/dynamix-layout/discussions/44"
5454
target="_blank"
5555
rel="noopener noreferrer"
5656
className="text-muted-foreground hover:text-primary transition-colors"
@@ -62,7 +62,7 @@ const Header = () => {
6262
{/* Actions */}
6363
<div className="flex items-center gap-3">
6464
<a
65-
href="https://raw.githubusercontent.com/akash-aman/dynamix-layout/refs/heads/main/LICENSE"
65+
href="https://raw.githubusercontent.com/xcode-studio/dynamix-layout/refs/heads/main/LICENSE"
6666
target="_blank"
6767
rel="noopener noreferrer"
6868
>
@@ -93,7 +93,7 @@ const Header = () => {
9393
asChild
9494
>
9595
<a
96-
href="http://github.com/akash-aman/dynamix-layout"
96+
href="http://github.com/xcode-studio/dynamix-layout"
9797
target="_blank"
9898
rel="noopener noreferrer"
9999
>
@@ -133,15 +133,15 @@ const Header = () => {
133133
Demo
134134
</a>
135135
<a
136-
href="https://github.com/akash-aman/dynamix-layout/blob/main/README.md"
136+
href="https://github.com/xcode-studio/dynamix-layout/blob/main/README.md"
137137
target="_blank"
138138
rel="noopener noreferrer"
139139
className="text-muted-foreground hover:text-primary transition-colors"
140140
>
141141
Installation
142142
</a>
143143
<a
144-
href="https://github.com/akash-aman/dynamix-layout/issues"
144+
href="https://github.com/xcode-studio/dynamix-layout/issues"
145145
target="_blank"
146146
rel="noopener noreferrer"
147147
className="text-muted-foreground hover:text-primary transition-colors"
@@ -156,7 +156,7 @@ const Header = () => {
156156
asChild
157157
>
158158
<a
159-
href="http://github.com/akash-aman/dynamix-layout"
159+
href="http://github.com/xcode-studio/dynamix-layout"
160160
target="_blank"
161161
rel="noopener noreferrer"
162162
>

‎apps/site/src/components/HeroSection.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ const HeroSection = () => {
5858
asChild
5959
>
6060
<a
61-
href="http://github.com/akash-aman/dynamix-layout"
61+
href="http://github.com/xcode-studio/dynamix-layout"
6262
target="_blank"
6363
rel="noopener noreferrer"
6464
>

‎apps/site/src/components/InstallationSection.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ export default App`
301301
asChild
302302
>
303303
<a
304-
href="https://github.com/akash-aman/dynamix-layout/blob/main/README.md"
304+
href="https://github.com/xcode-studio/dynamix-layout/blob/main/README.md"
305305
target="_blank"
306306
rel="noopener noreferrer"
307307
>
@@ -314,15 +314,15 @@ export default App`
314314
asChild
315315
>
316316
<a
317-
href="https://github.com/akash-aman/dynamix-layout/tree/main/examples"
317+
href="https://github.com/xcode-studio/dynamix-layout/tree/main/examples"
318318
target="_blank"
319319
rel="noopener noreferrer"
320320
>
321321
Browse Examples
322322
</a>
323323
</Button>
324324
{/* <Button variant="ghost" className="hover:bg-primary/10" asChild>
325-
<a href="https://github.com/akash-aman/dynamix-layout/issues" target="_blank" rel="noopener noreferrer">
325+
<a href="https://github.com/xcode-studio/dynamix-layout/issues" target="_blank" rel="noopener noreferrer">
326326
Join Discord
327327
</a>
328328
</Button> */}

‎packages/core/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
---
2020

21-
![alt text](https://raw.githubusercontent.com/akash-aman/dynamix-layout/main/assets/demo1.gif)
21+
![alt text](https://raw.githubusercontent.com/xcode-studio/dynamix-layout/main/assets/demo1.gif)
2222

2323
---
2424

‎packages/core/package.json‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,27 @@
2121
],
2222
"repository": {
2323
"type": "git",
24-
"url": "https://github.com/xcode-studio/dynamix-layout.git",
24+
"url": "git+https://github.com/xcode-studio/dynamix-layout.git",
2525
"directory": "packages/core"
2626
},
2727
"bugs": {
2828
"url": "https://github.com/xcode-studio/dynamix-layout/issues"
2929
},
3030
"homepage": "https://github.com/xcode-studio/dynamix-layout#readme",
31-
"main": "./dist/core.cjs.js",
31+
"main": "./dist/core.cjs",
3232
"module": "./dist/core.es.js",
33-
"browser": "./dist/core.iife.js",
3433
"types": "./dist/types/index.d.ts",
3534
"typings": "./dist/types/index.d.ts",
3635
"exports": {
3736
".": {
38-
"types": "./dist/types/index.d.ts",
39-
"import": "./dist/core.es.js",
40-
"require": "./dist/core.cjs.js"
37+
"import": {
38+
"types": "./dist/types/index.d.ts",
39+
"default": "./dist/core.es.js"
40+
},
41+
"require": {
42+
"types": "./dist/types/index.d.cts",
43+
"default": "./dist/core.cjs"
44+
}
4145
}
4246
},
4347
"files": [
@@ -53,8 +57,7 @@
5357
},
5458
"type": "module",
5559
"engines": {
56-
"node": ">=22.16.0",
57-
"pnpm": ">=10.13.1"
60+
"node": ">=18"
5861
},
5962
"scripts": {
6063
"dev": "vite build --watch",

0 commit comments

Comments
 (0)