Skip to content

Commit d1b98ac

Browse files
jorgedaniscjorgedanisc
authored
Merge pull request #153 from ducflair/dev
Dev
2 parents d7c9d11 + 708d5d2 commit d1b98ac

64 files changed

Lines changed: 4307 additions & 1072 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.documentation/SchemaUpdates.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
these are the files you must change from the duc repo of the @scopture-monolith/scopture-monolith.code-workspace :
1+
these are the files you must change from the duc repo:
22

33
on the typescript side:
44
@duc/packages/ducjs/src/types/index.ts

‎.vscode/extensions.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"recommendations": [
3+
"rust-lang.rust-analyzer",
4+
"streetsidesoftware.code-spell-checker",
5+
"gaborv.flatbuffers",
6+
"PKief.material-icon-theme",
7+
"bradlc.vscode-tailwindcss",
8+
"ducflair.duc",
9+
"tamasfe.even-better-toml",
10+
"ms-toolsai.jupyter",
11+
"ms-python.python",
12+
"ms-python.vscode-pylance",
13+
"jock.svg",
14+
]
15+
}

‎Cargo.lock‎

Lines changed: 1 addition & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ members = [
55
"packages/ducpdf/src/duc2pdf"
66
]
77

8+
[workspace.dependencies]
9+
duc = { version = "1" }
10+
811
[profile.release]
912
lto = true
10-
opt-level = "s"
11-
12-
[patch.crates-io]
13-
duc = { path = "packages/ducrs" }
13+
opt-level = "s"

‎apps/web/app/layout.tsx‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,14 @@ export default function Layout({ children }: { children: ReactNode }) {
4545
return (
4646
<html lang="en" className={robotoMono.className} suppressHydrationWarning>
4747
<body className="flex flex-col min-h-screen">
48-
<Script
49-
defer
50-
src="https://duc-analytics.vercel.app/script.js"
51-
data-website-id="dbb88890-f4f6-45b1-8970-cb5d7d7b02b6"
52-
data-domains="duc.ducflair.com,"
53-
/>
48+
{process.env.NODE_ENV === 'production' && (
49+
<Script
50+
defer
51+
src="https://umami-liart-kappa.vercel.app/script.js"
52+
data-website-id="dbb88890-f4f6-45b1-8970-cb5d7d7b02b6"
53+
data-domains="duc.ducflair.com,"
54+
/>
55+
)}
5456
<RootProvider
5557
search={{
5658
links: [

‎apps/web/content/docs/roadmap/y1.mdx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,4 @@ authors: [jorgedanisc]
1010
- Expand the library’s toolset to include more advanced CAD functionalities.
1111
- **Achieve `90% completion` of the file base format**
1212
- Finalize the `duc` file format, ensuring it can handle a wide range of CAD use cases and is robust enough for production use.
13-
- Conduct `extensive testing` to validate the format’s performance and reliability.
14-
- **Assess the `costs of maintaining` an `open-source` project**
15-
- Analyze the financial and operational implications of releasing the project as open-source.
16-
- Develop a sustainability plan that includes potential funding sources, community engagement strategies, and long-term maintenance plans.
13+
- Conduct `extensive testing` to validate the format’s performance and reliability.

‎apps/web/content/docs/roadmap/y2.mdx‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,4 @@ authors: [jorgedanisc]
1111
- Determine if there is significant interest and demand from the broader community for an `open-source 2D CAD library` and `file format`.
1212
- **Quality and readiness of the file and library**
1313
- Ensure that the `duc` file format and the `associated libraries` are mature, stable, and feature-complete.
14-
- Gather feedback from initial users to refine and improve the library and file format.
15-
- **Affordability and sustainability**
16-
- Assess Ducflair’s financial capacity to support an open-source initiative, including potential costs for infrastructure, core maintainers, managers, reviewers, and continuous development.
17-
- Explore how `Vercel` manages to sustain a project like `Next.js` efficiently and consider similar models for `Ducflair`.
18-
- By this time pool the `developer audience` captured and evaluate whether the project is `ready` to be open-sourced.
14+
- Gather feedback from initial users to refine and improve the library and file format.

‎bun.lock‎

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

‎package.json‎

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,41 @@
66
"@semantic-release/commit-analyzer": "^13.0.1",
77
"@semantic-release/exec": "^7.1.0",
88
"@semantic-release/git": "^10.0.1",
9-
"@semantic-release/github": "^11.0.3",
10-
"@semantic-release/npm": "^12.0.1",
11-
"@semantic-release/release-notes-generator": "^14.0.3",
9+
"@semantic-release/github": "^11.0.6",
10+
"@semantic-release/npm": "^12.0.2",
11+
"@semantic-release/release-notes-generator": "^14.1.0",
1212
"@types/node": "22.14.1",
13-
"@types/react": "^19.1.8",
14-
"@types/react-dom": "^19.1.6",
15-
"autoprefixer": "^10.4.21",
13+
"@types/react": "^19.2.7",
14+
"@types/react-dom": "^19.2.3",
15+
"autoprefixer": "^10.4.22",
1616
"conventional-changelog-conventionalcommits": "^9.1.0",
1717
"del-cli": "^6.0.0",
18-
"postcss": "^8.5.5",
19-
"semantic-release": "^24.2.5",
20-
"tailwindcss": "^4.1.10",
21-
"turbo": "^2.5.5",
22-
"typescript": "^5.8.3"
18+
"postcss": "^8.5.6",
19+
"semantic-release": "^24.2.9",
20+
"tailwindcss": "^4.1.17",
21+
"turbo": "^2.6.3",
22+
"typescript": "^5.9.3"
2323
},
2424
"dependencies": {
25-
"@fumadocs/mdx-remote": "^1.3.3",
26-
"@radix-ui/react-avatar": "^1.1.10",
27-
"@radix-ui/react-slot": "^1.2.3",
28-
"@tailwindcss/postcss": "^4.1.10",
25+
"@fumadocs/mdx-remote": "^1.4.3",
26+
"@radix-ui/react-avatar": "^1.1.11",
27+
"@radix-ui/react-slot": "^1.2.4",
28+
"@tailwindcss/postcss": "^4.1.17",
2929
"class-variance-authority": "^0.7.1",
3030
"clsx": "^2.1.1",
3131
"fumadocs-core": "15.2.8",
3232
"fumadocs-mdx": "11.6.0",
3333
"fumadocs-ui": "15.2.8",
3434
"lucide-react": "^0.501.0",
35-
"next": "^15.3.1",
35+
"next": "^15.5.7",
3636
"next-themes": "^0.4.6",
37-
"react": "^19.1.0",
38-
"react-dom": "^19.1.0",
37+
"react": "^19.2.1",
38+
"react-dom": "^19.2.1",
3939
"remark-smartypants": "^3.0.2",
40-
"sst": "^3.13.14",
41-
"tailwind-merge": "^3.3.1",
42-
"tw-animate-css": "^1.3.4",
43-
"zod": "^3.25.64"
40+
"sst": "^3.17.25",
41+
"tailwind-merge": "^3.4.0",
42+
"tw-animate-css": "^1.4.0",
43+
"zod": "^3.25.76"
4444
},
4545
"engines": {
4646
"node": ">=20"
@@ -49,6 +49,9 @@
4949
"packageManager": "bun@1.1.24",
5050
"private": true,
5151
"scripts": {
52+
"build": "turbo build",
53+
"build:packages": "turbo build --filter=ducjs --filter=ducpy --filter=ducrs --filter=ducsvg --filter=ducpdf",
54+
"sst:wrap": "bash -c 'CMD=\"$1\"; shift; [ -n \"$1\" ] && [ \"$1\" != \"_\" ] && export SST_STAGE=\"$1\"; eval \"$CMD\"' _",
5255
"flatc:gen": "bun run flatc:gen:duc",
5356
"flatc:gen:duc": "cd schema && bash flatc-duc-generate.sh",
5457
"clean": "bun del-cli \"**/dist\" \".turbo\" \"**/node_modules\" \"**/package-lock.json\" \"**/tsconfig.tsbuildinfo\" \"**/tsconfig.node.tsbuildinfo\" \"**/vite.config.js\"",
@@ -65,14 +68,14 @@
6568
"ducpdf:build": "turbo build --filter=ducpdf",
6669
"ducpdf:test": "turbo run test --filter=ducpdf",
6770
"semantic-release": "turbo run semantic-release",
68-
"sst:build": "bash -c 'bun run sst:clean && sst unlock ${1:+--stage $1} && sst refresh ${1:+--stage $1} && sst deploy ${1:+--stage $1}' --",
71+
"sst:deploy": "bun sst:wrap 'bun run sst:clean && sst unlock && sst refresh && sst deploy'",
6972
"sst:clean": "bun del-cli \".sst\" \"**/sst-env.d.ts\" \"**/sst.pyi\"",
7073
"sst:dev": "bun run sst dev",
71-
"knip:deps": "bash -c 'bun run sst unlock ${1:+--stage $1} && bun sst shell ${1:+--stage $1} -- bunx knip --dependencies' --",
72-
"knip": "bash -c 'bun run sst unlock ${1:+--stage $1} && bun sst shell ${1:+--stage $1} -- bunx knip' --"
74+
"knip:deps": "bun sst:wrap 'bun run sst unlock && sst shell -- bunx knip --dependencies'",
75+
"knip": "bun sst:wrap 'bun run sst unlock && sst shell -- bunx knip'"
7376
},
7477
"workspaces": [
7578
"apps/*",
7679
"packages/*"
7780
]
78-
}
81+
}

‎packages/ducjs/scripts/build.js‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,13 @@ function main() {
3333

3434
// Clean previous build artifacts
3535
const distDir = path.join(manifestDir, '..', 'dist');
36-
const tsbuildinfo = path.join(manifestDir, '..', 'tsconfig.tsbuildinfo');
3736

3837
try {
3938
fs.rmSync(distDir, { recursive: true, force: true });
4039
} catch (error) {
4140
console.log('No dist directory to clean or error:', error.message);
4241
}
4342

44-
try {
45-
fs.unlinkSync(tsbuildinfo);
46-
} catch (error) {
47-
console.log('No tsconfig.tsbuildinfo to remove or error:', error.message);
48-
}
49-
5043
// Set environment variable and run TypeScript compiler
5144
const env = { ...process.env, DUC_SCHEMA_VERSION: version };
5245

0 commit comments

Comments
 (0)