From fbfc404696247d45be1b30e95fb0faeb049843b8 Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Wed, 27 Nov 2024 17:47:35 +0100 Subject: [PATCH 01/31] Bun workspaces draft. --- .github/workflows/ci.yml | 9 ++- bun.lockb | Bin 92738 -> 100008 bytes package.json | 63 ++---------------- .../integration-test}/.gitignore | 0 .../integration-test}/integration.spec.ts | 0 .../integration-test}/tsconfig.json | 2 +- packages/merge-sx/package.json | 62 +++++++++++++++++ {src => packages/merge-sx/src}/index.spec.ts | 0 {src => packages/merge-sx/src}/index.ts | 0 packages/merge-sx/tsconfig.json | 4 ++ .../merge-sx/tsdown.config.ts | 0 tools/benchmark.bench.ts | 2 +- tsconfig.json | 1 - 13 files changed, 78 insertions(+), 65 deletions(-) rename {integration-test => packages/integration-test}/.gitignore (100%) rename {integration-test => packages/integration-test}/integration.spec.ts (100%) rename {integration-test => packages/integration-test}/tsconfig.json (66%) create mode 100644 packages/merge-sx/package.json rename {src => packages/merge-sx/src}/index.spec.ts (100%) rename {src => packages/merge-sx/src}/index.ts (100%) create mode 100644 packages/merge-sx/tsconfig.json rename tsdown.config.ts => packages/merge-sx/tsdown.config.ts (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2a27b2a6..22004f50 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,20 +120,19 @@ jobs: env: MUI_VERSION: ${{ matrix.mui-version }} run: | - bun link - cat >integration-test/package.json <packages/integration-test/package.json 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 diff --git a/package.json b/package.json index 1ec9cfed..7ca78a2b 100644 --- a/package.json +++ b/package.json @@ -1,77 +1,26 @@ { - "name": "merge-sx", - "version": "3.2.4", - "description": "Combines multiple SxProps for Material UI components.", - "main": "dist/index.cjs", - "module": "dist/index.js", - "types": "dist/index.d.ts", - "type": "module", - "exports": { - ".": { - "import": { - "types": "./dist/index.d.ts", - "default": "./dist/index.js" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } - } - }, - "files": [ - "dist", - "*.md" - ], - "sideEffects": false, - "repository": { - "type": "git", - "url": "git+https://github.com/RobinTail/merge-sx.git" - }, - "homepage": "https://github.com/RobinTail/merge-sx", + "private": true, + "workspaces": ["packages/*"], "author": { "name": "Anna Bocharova", "url": "https://robintail.cz" }, - "bugs": "https://github.com/RobinTail/merge-sx/issues", - "funding": "https://github.com/sponsors/RobinTail", "license": "MIT", "scripts": { - "build": "tsdown && attw --pack", + "build": "bun run --filter merge-sx build", "lint": "bun run biome check", - "test": "tsc --noEmit && bun test src", - "intTest": "tsc -p integration-test/tsconfig.json && bun test integration-test", + "test": "tsc --noEmit -p packages/merge-sx && bun test --filter merge-sx", + "intTest": "tsc -p packages/integration-test && bun test --filter integration-test", "mdfix": "bunx --bun prettier *.md --write", "postversion": "git push && git push --tags", "prepublishOnly": "bun run lint && bun run test && bun run build" }, - "peerDependencies": { - "@mui/material": "^5.1.0 || ^6.0.0" - }, "devDependencies": { "@arethetypeswrong/cli": "^0.17.0", "@biomejs/biome": "1.9.4", - "@emotion/styled": "^11.13.0", - "@mui/material": "^6.1.2", "@tsconfig/bun": "^1.0.7", "@types/bun": "latest", - "react": "^18.3.1", "tsdown": "^0.3.0", "typescript": "^5.6.2" - }, - "keywords": [ - "react", - "typescript", - "styled-components", - "reactjs", - "material-ui", - "styling", - "css-in-js", - "jss", - "strict", - "mui", - "merge", - "combine", - "merging", - "muiv5" - ] + } } diff --git a/integration-test/.gitignore b/packages/integration-test/.gitignore similarity index 100% rename from integration-test/.gitignore rename to packages/integration-test/.gitignore diff --git a/integration-test/integration.spec.ts b/packages/integration-test/integration.spec.ts similarity index 100% rename from integration-test/integration.spec.ts rename to packages/integration-test/integration.spec.ts diff --git a/integration-test/tsconfig.json b/packages/integration-test/tsconfig.json similarity index 66% rename from integration-test/tsconfig.json rename to packages/integration-test/tsconfig.json index a71ff2be..cbb904ee 100644 --- a/integration-test/tsconfig.json +++ b/packages/integration-test/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../tsconfig.json", + "extends": "../../tsconfig.json", "include": ["*.ts"], "compilerOptions": { "noEmit": true diff --git a/packages/merge-sx/package.json b/packages/merge-sx/package.json new file mode 100644 index 00000000..50b47de3 --- /dev/null +++ b/packages/merge-sx/package.json @@ -0,0 +1,62 @@ +{ + "name": "merge-sx", + "version": "3.2.4", + "description": "Combines multiple SxProps for Material UI components.", + "main": "dist/index.cjs", + "module": "dist/index.js", + "types": "dist/index.d.ts", + "type": "module", + "exports": { + ".": { + "import": { + "types": "./dist/index.d.ts", + "default": "./dist/index.js" + }, + "require": { + "types": "./dist/index.d.cts", + "default": "./dist/index.cjs" + } + } + }, + "files": [ + "dist", + "*.md" + ], + "sideEffects": false, + "repository": { + "type": "git", + "url": "git+https://github.com/RobinTail/merge-sx.git" + }, + "homepage": "https://github.com/RobinTail/merge-sx", + "author": { + "name": "Anna Bocharova", + "url": "https://robintail.cz" + }, + "scripts": { + "build": "tsdown && attw --pack" + }, + "peerDependencies": { + "@mui/material": "^5.1.0 || ^6.0.0" + }, + "devDependencies": { + "@emotion/styled": "^11.13.0", + "@mui/material": "^6.1.2", + "react": "^18.3.1" + }, + "keywords": [ + "react", + "typescript", + "styled-components", + "reactjs", + "material-ui", + "styling", + "css-in-js", + "jss", + "strict", + "mui", + "merge", + "combine", + "merging", + "muiv5" + ] +} diff --git a/src/index.spec.ts b/packages/merge-sx/src/index.spec.ts similarity index 100% rename from src/index.spec.ts rename to packages/merge-sx/src/index.spec.ts diff --git a/src/index.ts b/packages/merge-sx/src/index.ts similarity index 100% rename from src/index.ts rename to packages/merge-sx/src/index.ts diff --git a/packages/merge-sx/tsconfig.json b/packages/merge-sx/tsconfig.json new file mode 100644 index 00000000..596e2cf7 --- /dev/null +++ b/packages/merge-sx/tsconfig.json @@ -0,0 +1,4 @@ +{ + "extends": "../../tsconfig.json", + "include": ["src"] +} diff --git a/tsdown.config.ts b/packages/merge-sx/tsdown.config.ts similarity index 100% rename from tsdown.config.ts rename to packages/merge-sx/tsdown.config.ts diff --git a/tools/benchmark.bench.ts b/tools/benchmark.bench.ts index ed45f263..befd5c56 100644 --- a/tools/benchmark.bench.ts +++ b/tools/benchmark.bench.ts @@ -1,6 +1,6 @@ import type { SxProps, Theme } from "@mui/system"; import { bench, describe } from "vitest"; -import { mergeSx } from "../src"; +import { mergeSx } from "../packages/merge-sx/src"; describe("Performance", () => { for (const count of [10, 100, 1000, 10000]) { diff --git a/tsconfig.json b/tsconfig.json index 1910f7a6..7440fdff 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,4 @@ { "extends": "@tsconfig/bun/tsconfig.json", "compilerOptions": {}, - "include": ["src"] } From afbee589d9cdf61df8fde86e5e4d9e1f1284df6c Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Wed, 27 Nov 2024 17:57:30 +0100 Subject: [PATCH 02/31] Fix tsconfig. --- tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index 7440fdff..eba46e70 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,4 +1,4 @@ { "extends": "@tsconfig/bun/tsconfig.json", - "compilerOptions": {}, + "compilerOptions": {} } From 5f95fa4b4c8fa5020afa920862fced33adef2c9b Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Wed, 27 Nov 2024 18:02:56 +0100 Subject: [PATCH 03/31] Deduplicating. --- bun.lockb | Bin 100008 -> 93392 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/bun.lockb b/bun.lockb index 3885df201bc594c4598710031912eba38437ea00..5218c67e7d15cfec7dc51d910c81544c54cae955 100755 GIT binary patch delta 13405 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 From 3e98626bb802da5af6b77c1ac7670d3ff3e454c3 Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Wed, 27 Nov 2024 18:05:03 +0100 Subject: [PATCH 04/31] Upgrading dependencies in sources. --- bun.lockb | Bin 93392 -> 98200 bytes packages/merge-sx/package.json | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bun.lockb b/bun.lockb index 5218c67e7d15cfec7dc51d910c81544c54cae955..51d57c9894b198c761759ba932493cf4c471d6f7 100755 GIT binary patch delta 7688 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 diff --git a/packages/merge-sx/package.json b/packages/merge-sx/package.json index 50b47de3..9406668e 100644 --- a/packages/merge-sx/package.json +++ b/packages/merge-sx/package.json @@ -39,8 +39,8 @@ "@mui/material": "^5.1.0 || ^6.0.0" }, "devDependencies": { - "@emotion/styled": "^11.13.0", - "@mui/material": "^6.1.2", + "@emotion/styled": "^11.13.5", + "@mui/material": "^6.1.9", "react": "^18.3.1" }, "keywords": [ From 0498b555649e80dd1eab1c28477374b5146e244a Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Wed, 27 Nov 2024 18:07:01 +0100 Subject: [PATCH 05/31] Upgrading global dependencies. --- bun.lockb | Bin 98200 -> 99016 bytes package.json | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bun.lockb b/bun.lockb index 51d57c9894b198c761759ba932493cf4c471d6f7..05122716676519ea32989bd46f57553e9dc79ee0 100755 GIT binary patch delta 21108 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 Date: Wed, 27 Nov 2024 18:08:47 +0100 Subject: [PATCH 06/31] Updating bun types. --- bun.lockb | Bin 99016 -> 94320 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/bun.lockb b/bun.lockb index 05122716676519ea32989bd46f57553e9dc79ee0..cd5eba0dac5422606796d1de40c4376070448665 100755 GIT binary patch delta 891 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 From f990ff171f60a3f71953be516b331c6d44ce7c89 Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Wed, 27 Nov 2024 19:09:09 +0100 Subject: [PATCH 07/31] Simpler test command on top level. --- package.json | 2 +- packages/merge-sx/package.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e5f7533e..597a34a6 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "scripts": { "build": "bun run --filter merge-sx build", "lint": "bun run biome check", - "test": "tsc --noEmit -p packages/merge-sx && bun test --filter merge-sx", + "test": "bun run --filter merge-sx test", "intTest": "tsc -p packages/integration-test && bun test --filter integration-test", "mdfix": "bunx --bun prettier *.md --write", "postversion": "git push && git push --tags", diff --git a/packages/merge-sx/package.json b/packages/merge-sx/package.json index 9406668e..9742b0f0 100644 --- a/packages/merge-sx/package.json +++ b/packages/merge-sx/package.json @@ -33,7 +33,8 @@ "url": "https://robintail.cz" }, "scripts": { - "build": "tsdown && attw --pack" + "build": "tsdown && attw --pack", + "test": "tsc --noEmit && bun test" }, "peerDependencies": { "@mui/material": "^5.1.0 || ^6.0.0" From 05d490c1957dc91f015cf0ee9c15af680beab663 Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Wed, 27 Nov 2024 19:35:27 +0100 Subject: [PATCH 08/31] Moving postversion and prepublish commands into the scope of sources. --- package.json | 4 +--- packages/merge-sx/package.json | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 597a34a6..44aa4b7c 100644 --- a/package.json +++ b/package.json @@ -11,9 +11,7 @@ "lint": "bun run biome check", "test": "bun run --filter merge-sx test", "intTest": "tsc -p packages/integration-test && bun test --filter integration-test", - "mdfix": "bunx --bun prettier *.md --write", - "postversion": "git push && git push --tags", - "prepublishOnly": "bun run lint && bun run test && bun run build" + "mdfix": "bunx --bun prettier *.md --write" }, "devDependencies": { "@arethetypeswrong/cli": "^0.17.0", diff --git a/packages/merge-sx/package.json b/packages/merge-sx/package.json index 9742b0f0..4183be71 100644 --- a/packages/merge-sx/package.json +++ b/packages/merge-sx/package.json @@ -34,7 +34,9 @@ }, "scripts": { "build": "tsdown && attw --pack", - "test": "tsc --noEmit && bun test" + "test": "tsc --noEmit && bun test", + "postversion": "git push && git push --tags", + "prepublishOnly": "biome check && bun run test && bun run build" }, "peerDependencies": { "@mui/material": "^5.1.0 || ^6.0.0" From 27495550a75b067584398d4ae41234dca1a1b2f3 Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 20:07:17 +0100 Subject: [PATCH 09/31] Version tool. --- .github/workflows/minor.yml | 2 +- .github/workflows/patch.yml | 2 +- bun.lockb | Bin 94320 -> 94712 bytes package.json | 5 ++- packages/merge-sx/package.json | 1 - tools/version.ts | 58 +++++++++++++++++++++++++++++++++ 6 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 tools/version.ts diff --git a/.github/workflows/minor.yml b/.github/workflows/minor.yml index 57eecb85..d0bb5819 100644 --- a/.github/workflows/minor.yml +++ b/.github/workflows/minor.yml @@ -14,4 +14,4 @@ jobs: with: node-version: 18 - uses: fregante/setup-git-user@v2 - - run: npm version minor + - run: bun version minor diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml index 0cda70a8..3ab1e76f 100644 --- a/.github/workflows/patch.yml +++ b/.github/workflows/patch.yml @@ -14,4 +14,4 @@ jobs: with: node-version: 18 - uses: fregante/setup-git-user@v2 - - run: npm version patch + - run: bun version patch diff --git a/bun.lockb b/bun.lockb index cd5eba0dac5422606796d1de40c4376070448665..4065885fe63a3460a44c79a547df64cd8645d0b5 100755 GIT binary patch delta 15322 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 delta 15468 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 M@^qoxtcV@|AL{NPWdHyG diff --git a/package.json b/package.json index 44aa4b7c..863a9ee4 100644 --- a/package.json +++ b/package.json @@ -11,13 +11,16 @@ "lint": "bun run biome check", "test": "bun run --filter merge-sx test", "intTest": "tsc -p packages/integration-test && bun test --filter integration-test", - "mdfix": "bunx --bun prettier *.md --write" + "mdfix": "bunx --bun prettier *.md --write", + "version": "bun run tools/version.ts" }, "devDependencies": { "@arethetypeswrong/cli": "^0.17.0", "@biomejs/biome": "1.9.4", "@tsconfig/bun": "^1.0.7", "@types/bun": "latest", + "@types/semver": "^7.5.8", + "semver": "^7.6.3", "tsdown": "^0.3.1", "typescript": "^5.7.2" } diff --git a/packages/merge-sx/package.json b/packages/merge-sx/package.json index 4183be71..4ca3edbe 100644 --- a/packages/merge-sx/package.json +++ b/packages/merge-sx/package.json @@ -35,7 +35,6 @@ "scripts": { "build": "tsdown && attw --pack", "test": "tsc --noEmit && bun test", - "postversion": "git push && git push --tags", "prepublishOnly": "biome check && bun run test && bun run build" }, "peerDependencies": { diff --git a/tools/version.ts b/tools/version.ts new file mode 100644 index 00000000..14aedf54 --- /dev/null +++ b/tools/version.ts @@ -0,0 +1,58 @@ +import { fail } from "node:assert"; +import { $ } from "bun"; +import { type ReleaseType, inc, valid as isValidVersion } from "semver"; + +const path = "./packages/merge-sx/package.json"; + +const isValidTarget = (subject: string): subject is ReleaseType => + ( + [ + "major", + "premajor", + "minor", + "preminor", + "patch", + "prepatch", + "prerelease", + ] satisfies ReleaseType[] as string[] + ).includes(subject); + +const isDirty = async () => (await $`git status --porcelain`.quiet()).text(); + +// Bump version +const target = Bun.argv.pop(); + +const json = await Bun.file(path).json(); + +const { version: current } = json; + +if (!isValidVersion(current)) + throw new Error(`Invalid current version ${current}`); + +const desired = isValidVersion(target) + ? target + : target && isValidTarget(target) + ? inc(current, target, "beta", "1") + : fail("invalid target version"); + +if (!desired) throw new Error("Failed to bump"); + +// Check for uncommitted changes +if (await isDirty()) + throw new Error( + "There are uncommitted changes. Commit them before releasing or run with FORCE=true.", + ); + +console.debug(current, "—>", desired); + +await Bun.write( + path, + JSON.stringify(Object.assign(json, { version: desired }), null, 2), +); + +// Commit, tag and push +await $`git add ${path}`; +await $`git commit -m v${desired}`; +await $`git tag v${desired}`; +await $`git push`; +await $`git push --tags`; From fbb03b6315d7f0ed1e7a897f6674c276ce349f3d Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 20:11:04 +0100 Subject: [PATCH 10/31] minor: extraction. --- tools/version.ts | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/tools/version.ts b/tools/version.ts index 14aedf54..5db8575f 100644 --- a/tools/version.ts +++ b/tools/version.ts @@ -4,18 +4,17 @@ import { type ReleaseType, inc, valid as isValidVersion } from "semver"; const path = "./packages/merge-sx/package.json"; +const variants: ReleaseType[] = [ + "major", + "premajor", + "minor", + "preminor", + "patch", + "prepatch", + "prerelease", +]; const isValidTarget = (subject: string): subject is ReleaseType => - ( - [ - "major", - "premajor", - "minor", - "preminor", - "patch", - "prepatch", - "prerelease", - ] satisfies ReleaseType[] as string[] - ).includes(subject); + (variants as string[]).includes(subject); const isDirty = async () => (await $`git status --porcelain`.quiet()).text(); From b09935ad9a25535d06b98d078e6b81b2b213f161 Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 20:11:27 +0100 Subject: [PATCH 11/31] v3.3.0-beta.1 --- packages/merge-sx/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/merge-sx/package.json b/packages/merge-sx/package.json index 4ca3edbe..b7704818 100644 --- a/packages/merge-sx/package.json +++ b/packages/merge-sx/package.json @@ -1,6 +1,6 @@ { "name": "merge-sx", - "version": "3.2.4", + "version": "3.3.0-beta.1", "description": "Combines multiple SxProps for Material UI components.", "main": "dist/index.cjs", "module": "dist/index.js", @@ -61,4 +61,4 @@ "merging", "muiv5" ] -} +} \ No newline at end of file From d77f6b496c80ad3e661e171d9554667eb96674b7 Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 20:14:39 +0100 Subject: [PATCH 12/31] Using star for workspace reference. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22004f50..a3292669 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,7 +126,7 @@ jobs: "version": "1.0.0", "license": "MIT", "dependencies": { - "merge-sx": "workspace:merge-sx", + "merge-sx": "workspace:*", "@mui/material": "${MUI_VERSION}", "react": "^17.0.2", "react-dom": "^17.0.2" From af66512dc5f3b01557ed172986046535088fc698 Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 20:15:44 +0100 Subject: [PATCH 13/31] v3.3.0-beta.2 --- packages/merge-sx/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/merge-sx/package.json b/packages/merge-sx/package.json index b7704818..2febf7d1 100644 --- a/packages/merge-sx/package.json +++ b/packages/merge-sx/package.json @@ -1,6 +1,6 @@ { "name": "merge-sx", - "version": "3.3.0-beta.1", + "version": "3.3.0-beta.2", "description": "Combines multiple SxProps for Material UI components.", "main": "dist/index.cjs", "module": "dist/index.js", From 9f49b5dc13d0ae10a394220e718262dfc3496b22 Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 20:27:20 +0100 Subject: [PATCH 14/31] Adjusting publishing command and workflow. --- .github/workflows/npm-publish.yml | 5 +++-- bunfig.toml | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml index 66f82bd8..ccc96ab6 100644 --- a/.github/workflows/npm-publish.yml +++ b/.github/workflows/npm-publish.yml @@ -30,6 +30,7 @@ jobs: bun-version: latest - name: Install dependencies run: bun install - - run: npm publish --tag ${{ inputs.tag }} + - run: bun publish --tag ${{ inputs.tag }} + working-directory: ./packages/merge-sx env: - NODE_AUTH_TOKEN: ${{secrets.NPM_KEY}} + NPM_KEY: ${{secrets.NPM_KEY}} diff --git a/bunfig.toml b/bunfig.toml index a16a2973..fe89be02 100644 --- a/bunfig.toml +++ b/bunfig.toml @@ -1,5 +1,6 @@ [install] peer = false +registry = { url = "https://registry.npmjs.org", token = "$NPM_KEY" } [test] coverage = true # always enable coverage coverageReporter = ["text", "lcov"] From b215210fda790209a98d34a420926ee9a3b6f90f Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 20:28:29 +0100 Subject: [PATCH 15/31] lock changed. --- bun.lockb | Bin 94712 -> 94712 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/bun.lockb b/bun.lockb index 4065885fe63a3460a44c79a547df64cd8645d0b5..6502b45f163dee0714a63df46e68a67257b777ad 100755 GIT binary patch delta 75 zcmezInDxhF)(yeG6&d5q^-T3F7#NCEbIVeT7#Ku7pN8>HQhCe)k}=aW-dytAp>*;O e2_Au@)RII!BL;@fxr!fOeD!qLexZO-gAo8HH51=;cz$n28 E057o-?f?J) From e27eebb07123d4b975af0de7d69b8d96aed8ee05 Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 20:28:59 +0100 Subject: [PATCH 16/31] v3.3.0-beta.3 --- packages/merge-sx/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/merge-sx/package.json b/packages/merge-sx/package.json index 2febf7d1..95a616b2 100644 --- a/packages/merge-sx/package.json +++ b/packages/merge-sx/package.json @@ -1,6 +1,6 @@ { "name": "merge-sx", - "version": "3.3.0-beta.2", + "version": "3.3.0-beta.3", "description": "Combines multiple SxProps for Material UI components.", "main": "dist/index.cjs", "module": "dist/index.js", From eb602493aa91f89fc8ba1cbe298c47d20f9cf842 Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 20:31:55 +0100 Subject: [PATCH 17/31] Add bun before biome in prepublish. --- packages/merge-sx/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/merge-sx/package.json b/packages/merge-sx/package.json index 95a616b2..7706fafb 100644 --- a/packages/merge-sx/package.json +++ b/packages/merge-sx/package.json @@ -35,7 +35,7 @@ "scripts": { "build": "tsdown && attw --pack", "test": "tsc --noEmit && bun test", - "prepublishOnly": "biome check && bun run test && bun run build" + "prepublishOnly": "bun biome check && bun run test && bun run build" }, "peerDependencies": { "@mui/material": "^5.1.0 || ^6.0.0" @@ -61,4 +61,4 @@ "merging", "muiv5" ] -} \ No newline at end of file +} From f0b80a43687d880d65816ab1bc3d86f7bca73c46 Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 20:42:13 +0100 Subject: [PATCH 18/31] moving readme with symlink. --- README.md | 92 +------------------------------------ packages/merge-sx/README.md | 91 ++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 91 deletions(-) mode change 100644 => 120000 README.md create mode 100644 packages/merge-sx/README.md diff --git a/README.md b/README.md deleted file mode 100644 index 357b33db..00000000 --- a/README.md +++ /dev/null @@ -1,91 +0,0 @@ -# merge-sx - -[![Coverage Status](https://coveralls.io/repos/github/RobinTail/merge-sx/badge.svg?branch=master)](https://coveralls.io/github/RobinTail/merge-sx?branch=master) -![NPM Downloads](https://img.shields.io/npm/dw/merge-sx) -![NPM License](https://img.shields.io/npm/l/merge-sx) - -Combines multiple [`SxProps`](https://mui.com/system/getting-started/the-sx-prop) -for [Material UI](https://mui.com/) components. - -## Installation - -```shell -npm install merge-sx -# or -yarn add merge-sx -``` - -## Usage - -The utility provides a very simple and semantically clean interface, that supports conditional and optional inclusions. - -```ts -import { mergeSx } from "merge-sx"; - -// Merge your SxProps -mergeSx(sx1, sx2 /*, ... */); -// Merge optionally -mergeSx(internalSx, props?.sx); // supports undefined -// Merge conditionally -mergeSx(commonSx, isMobile && mobileSx); // supports false -``` - -## Why might you need it - -MUI 5 has introduced a new way of styling React components using a Theme-aware -`sx` property. It can be necessary to create your own styled components while still allowing for additional styling -by the consumer. In this case your component will have its own `sx` property, most likely optional. This makes it -necessary somehow to combine your own styles with the styles coming from the consumer of your component. One approach -might be using a styling wrapper, an alternative way to style your component with the -[`styled()` utility](https://mui.com/system/styled/). Thus, you could apply the consumer's `sx` to the pre-styled -component. However, this approach can be inconvenient for several reasons. - -I came to conclusion that merging several `sx` properties is better. However, the `SxProps` has rather complex data -type. It can be an object with styling properties, can be function, can be `null`. It can be a challenge to perform -a merge under strict typing of Typescript. - -## How it works - -Luckily, starting version [5.1.0](https://github.com/mui/material-ui/releases/tag/v5.1.0) of MUI `SxProps` -[can](https://github.com/mui/material-ui/blob/v5.1.0/packages/mui-system/src/styleFunctionSx/styleFunctionSx.d.ts#L60) -also be `array`. However, nested arrays are not allowed, so this utility does exactly the flat merge, also bringing -support for conditional and optional inclusions, providing a very simple and semantically clean interface. - -## Performance - -The utility has been tested to support up to 65535 arguments. - -![Performance chart](https://raw.githubusercontent.com/RobinTail/merge-sx/refs/heads/master/performance.svg) - -## Examples - -### Conditional merging - -The utility supports `false`: - -```tsx - -``` - -### Optional merging - -The utility supports `undefined`: - -```tsx -interface MyButtonProps { - sx?: SxProps; // optional prop for consumer -} - -const MyButton = ({ sx: consumerSx }: MyButtonProps) => ( - -); -``` - -### Inline Theme supplying - -The utility is generic and accepts the type argument. - -```ts -// theme is Theme -mergeSx(sx1, (theme) => ({ mb: theme.spacing(1) })); -``` diff --git a/README.md b/README.md new file mode 120000 index 00000000..8b0ec445 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +packages/merge-sx/README.md \ No newline at end of file diff --git a/packages/merge-sx/README.md b/packages/merge-sx/README.md new file mode 100644 index 00000000..357b33db --- /dev/null +++ b/packages/merge-sx/README.md @@ -0,0 +1,91 @@ +# merge-sx + +[![Coverage Status](https://coveralls.io/repos/github/RobinTail/merge-sx/badge.svg?branch=master)](https://coveralls.io/github/RobinTail/merge-sx?branch=master) +![NPM Downloads](https://img.shields.io/npm/dw/merge-sx) +![NPM License](https://img.shields.io/npm/l/merge-sx) + +Combines multiple [`SxProps`](https://mui.com/system/getting-started/the-sx-prop) +for [Material UI](https://mui.com/) components. + +## Installation + +```shell +npm install merge-sx +# or +yarn add merge-sx +``` + +## Usage + +The utility provides a very simple and semantically clean interface, that supports conditional and optional inclusions. + +```ts +import { mergeSx } from "merge-sx"; + +// Merge your SxProps +mergeSx(sx1, sx2 /*, ... */); +// Merge optionally +mergeSx(internalSx, props?.sx); // supports undefined +// Merge conditionally +mergeSx(commonSx, isMobile && mobileSx); // supports false +``` + +## Why might you need it + +MUI 5 has introduced a new way of styling React components using a Theme-aware +`sx` property. It can be necessary to create your own styled components while still allowing for additional styling +by the consumer. In this case your component will have its own `sx` property, most likely optional. This makes it +necessary somehow to combine your own styles with the styles coming from the consumer of your component. One approach +might be using a styling wrapper, an alternative way to style your component with the +[`styled()` utility](https://mui.com/system/styled/). Thus, you could apply the consumer's `sx` to the pre-styled +component. However, this approach can be inconvenient for several reasons. + +I came to conclusion that merging several `sx` properties is better. However, the `SxProps` has rather complex data +type. It can be an object with styling properties, can be function, can be `null`. It can be a challenge to perform +a merge under strict typing of Typescript. + +## How it works + +Luckily, starting version [5.1.0](https://github.com/mui/material-ui/releases/tag/v5.1.0) of MUI `SxProps` +[can](https://github.com/mui/material-ui/blob/v5.1.0/packages/mui-system/src/styleFunctionSx/styleFunctionSx.d.ts#L60) +also be `array`. However, nested arrays are not allowed, so this utility does exactly the flat merge, also bringing +support for conditional and optional inclusions, providing a very simple and semantically clean interface. + +## Performance + +The utility has been tested to support up to 65535 arguments. + +![Performance chart](https://raw.githubusercontent.com/RobinTail/merge-sx/refs/heads/master/performance.svg) + +## Examples + +### Conditional merging + +The utility supports `false`: + +```tsx + +``` + +### Optional merging + +The utility supports `undefined`: + +```tsx +interface MyButtonProps { + sx?: SxProps; // optional prop for consumer +} + +const MyButton = ({ sx: consumerSx }: MyButtonProps) => ( + +); +``` + +### Inline Theme supplying + +The utility is generic and accepts the type argument. + +```ts +// theme is Theme +mergeSx(sx1, (theme) => ({ mb: theme.spacing(1) })); +``` From 7f1eb8fbafbe0b2c8ef72b1927a1397f9ca74a71 Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 20:43:52 +0100 Subject: [PATCH 19/31] v3.3.0-beta.4 --- packages/merge-sx/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/merge-sx/package.json b/packages/merge-sx/package.json index 7706fafb..e8350083 100644 --- a/packages/merge-sx/package.json +++ b/packages/merge-sx/package.json @@ -1,6 +1,6 @@ { "name": "merge-sx", - "version": "3.3.0-beta.3", + "version": "3.3.0-beta.4", "description": "Combines multiple SxProps for Material UI components.", "main": "dist/index.cjs", "module": "dist/index.js", @@ -61,4 +61,4 @@ "merging", "muiv5" ] -} +} \ No newline at end of file From 1bc01bce5f9b1433729c976631e335443831b8b1 Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 21:04:30 +0100 Subject: [PATCH 20/31] Moving license and changelog with symlink. --- CHANGELOG.md | 166 +-------------------------------- LICENSE | 22 +---- packages/merge-sx/CHANGELOG.md | 165 ++++++++++++++++++++++++++++++++ packages/merge-sx/LICENSE | 21 +++++ 4 files changed, 188 insertions(+), 186 deletions(-) mode change 100644 => 120000 CHANGELOG.md mode change 100644 => 120000 LICENSE create mode 100644 packages/merge-sx/CHANGELOG.md create mode 100644 packages/merge-sx/LICENSE diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 307b823d..00000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,165 +0,0 @@ -# Changelog - -## Version 3 - -### v3.2.3 - -- Dependencies update: - - Tested with MUI 6.1; -- Documentation adjustment; -- There is now an opportunity to support the project with sponsorship: https://github.com/sponsors/RobinTail - -### v3.2.2 - -- JSDoc restored on the distributed declaration files (since 3.0.0). - -### v3.2.1 - -- Technical update: - - Faster CI with bun lock-file diff control; - - Reduced dev dependencies; - - Upgraded dependencies. - -### v3.2.0 - -- Builder changed to `tsdown` thanks to [@ryoppippi](https://github.com/ryoppippi). - -### v3.1.0 - -- Supporting Material UI v6. - -### v3.0.1 - -- Fixed peer dependency: the minimal `@mui/material` version set back to `5.1.0`. - -### v3.0.0 - -- There are no breaking changes (\*), but the distribution build process has changed: - - ESM is built using [bun](https://bun.sh/); - - DTS is built using [bun plugin Isolated Declarations](https://github.com/ryoppippi/bun-plugin-isolated-decl) - that runs [oxc transformer](https://www.npmjs.com/package/oxc-transform) under the hood; - - CJS is built using [tsc](https://www.typescriptlang.org/docs/handbook/compiler-options.html) - and minified using [uglify-js](https://www.npmjs.com/package/uglify-js). -- (\*) — a peer dependency increase was found later and fixed in 3.0.1. - -## Version 2 - -### v2.0.3 - -- Technical release before v3: several chores, no changes. - -### v2.0.2 - -- Replaced `any` with `unknown` for internally used type. - -### v2.0.1 - -- Optimization for consumption in browser. - -### v2.0.0 - -- Breaking changes: - - Targeting ES6, - - Default export removed, - - IIFE build removed. -- The distribution becomes ESM first, while remaining dual (CJS support remains). - - The right files should be chosen automatically from the `dist` folder: - - for ESM: `index.js` and `index.d.ts`, - - for CJS: `index.cjs` and `index.d.cts`. -- Features: - - Performance improvement: 1.6 times faster. -- How to migrate: - - Replace default import with a named one. - -```typescript -// before: -import mergeSx from "merge-sx"; -// after: -import { mergeSx } from "merge-sx"; -``` - -## Version 1 - -### v1.4.0 - -- Upgraded dependencies. -- Tested on MUI versions up to 5.15.0. - -### v1.3.1 - -- Fixed issue #205 reported by [@mwskwong](https://github.com/mwskwong). - - The issue was introduced in v1.3.0. - - Next.js and Webpack used to complain on importing the module with the following error message: - -> Module not found: Error: Default condition should be last one - -### v1.3.0 - -- Both CJS and ESM bundles have their own declaration files: - - `/dist/index.d.ts` for CJS, - - `/dist/index.d.mts` for ESM. - - The `exports` entry of `package.json` is adjusted accordingly. - -### v1.2.0 - -- Just a technical update, no new features or fixes. -- Tested on MUI versions from `5.1.0` to `5.12.0`. - -### v1.1.0 - -- Just a technical update, no new features or fixes. -- Tested on MUI versions from `5.1.0` to `5.11.0`. - -### v1.0.0 - -- First stable release according to [SemVer](https://semver.org/). -- No breaking changes. -- Tested on MUI versions from `5.1.0` to `5.10.13`. - -## Version 0 - -### v0.1.5 - -- Fixing the installation warning introduced in v0.1.1. -- The required peer dependency changed back from `@mui/system@^5.1.0` to `@mui/material@^5.1.0`. - -```text -warning " > merge-sx@0.1.4" has unmet peer dependency "@mui/system@^5.1.0". -``` - -### v0.1.4 - -- Another performance improvement. This time by `878%` for 10 arguments. -- I switched from using reducer to `for..of` syntax. - -```text -┌─────────────┬─────────┬────────┬───────┬───────┐ -│ N arguments │ 10 │ 100 │ 1000 │ 10000 │ -├─────────────┼─────────┼────────┼───────┼───────┤ -│ ops/s │ 6475799 │ 718229 │ 74589 │ 7636 │ -└─────────────┴─────────┴────────┴───────┴───────┘ -``` - -### v0.1.3 - -- The performance has been improved by `24%` for 10 arguments. - -```text -┌─────────────┬────────┬───────┬──────┬───────┐ -│ N arguments │ 10 │ 100 │ 1000 │ 10000 │ -├─────────────┼────────┼───────┼──────┼───────┤ -│ ops/s │ 601463 │ 48255 │ 2068 │ 25 │ -└─────────────┴────────┴───────┴──────┴───────┘ -``` - -### v0.1.2 - -- No changes to the code. Descriptive works only. - -### v0.1.1 - -- The required peer dependency changed from `@mui/material@^5.1.0` to `@mui/system@^5.1.0`. - -### v0.1.0 - -- The first release of the utility. diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 120000 index 00000000..d89772ef --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1 @@ +packages/merge-sx/CHANGELOG.md \ No newline at end of file diff --git a/LICENSE b/LICENSE deleted file mode 100644 index c9112185..00000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2022 Anna Bocharova - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/LICENSE b/LICENSE new file mode 120000 index 00000000..4adc9245 --- /dev/null +++ b/LICENSE @@ -0,0 +1 @@ +packages/merge-sx/LICENSE \ No newline at end of file diff --git a/packages/merge-sx/CHANGELOG.md b/packages/merge-sx/CHANGELOG.md new file mode 100644 index 00000000..307b823d --- /dev/null +++ b/packages/merge-sx/CHANGELOG.md @@ -0,0 +1,165 @@ +# Changelog + +## Version 3 + +### v3.2.3 + +- Dependencies update: + - Tested with MUI 6.1; +- Documentation adjustment; +- There is now an opportunity to support the project with sponsorship: https://github.com/sponsors/RobinTail + +### v3.2.2 + +- JSDoc restored on the distributed declaration files (since 3.0.0). + +### v3.2.1 + +- Technical update: + - Faster CI with bun lock-file diff control; + - Reduced dev dependencies; + - Upgraded dependencies. + +### v3.2.0 + +- Builder changed to `tsdown` thanks to [@ryoppippi](https://github.com/ryoppippi). + +### v3.1.0 + +- Supporting Material UI v6. + +### v3.0.1 + +- Fixed peer dependency: the minimal `@mui/material` version set back to `5.1.0`. + +### v3.0.0 + +- There are no breaking changes (\*), but the distribution build process has changed: + - ESM is built using [bun](https://bun.sh/); + - DTS is built using [bun plugin Isolated Declarations](https://github.com/ryoppippi/bun-plugin-isolated-decl) + that runs [oxc transformer](https://www.npmjs.com/package/oxc-transform) under the hood; + - CJS is built using [tsc](https://www.typescriptlang.org/docs/handbook/compiler-options.html) + and minified using [uglify-js](https://www.npmjs.com/package/uglify-js). +- (\*) — a peer dependency increase was found later and fixed in 3.0.1. + +## Version 2 + +### v2.0.3 + +- Technical release before v3: several chores, no changes. + +### v2.0.2 + +- Replaced `any` with `unknown` for internally used type. + +### v2.0.1 + +- Optimization for consumption in browser. + +### v2.0.0 + +- Breaking changes: + - Targeting ES6, + - Default export removed, + - IIFE build removed. +- The distribution becomes ESM first, while remaining dual (CJS support remains). + - The right files should be chosen automatically from the `dist` folder: + - for ESM: `index.js` and `index.d.ts`, + - for CJS: `index.cjs` and `index.d.cts`. +- Features: + - Performance improvement: 1.6 times faster. +- How to migrate: + - Replace default import with a named one. + +```typescript +// before: +import mergeSx from "merge-sx"; +// after: +import { mergeSx } from "merge-sx"; +``` + +## Version 1 + +### v1.4.0 + +- Upgraded dependencies. +- Tested on MUI versions up to 5.15.0. + +### v1.3.1 + +- Fixed issue #205 reported by [@mwskwong](https://github.com/mwskwong). + - The issue was introduced in v1.3.0. + - Next.js and Webpack used to complain on importing the module with the following error message: + +> Module not found: Error: Default condition should be last one + +### v1.3.0 + +- Both CJS and ESM bundles have their own declaration files: + - `/dist/index.d.ts` for CJS, + - `/dist/index.d.mts` for ESM. + - The `exports` entry of `package.json` is adjusted accordingly. + +### v1.2.0 + +- Just a technical update, no new features or fixes. +- Tested on MUI versions from `5.1.0` to `5.12.0`. + +### v1.1.0 + +- Just a technical update, no new features or fixes. +- Tested on MUI versions from `5.1.0` to `5.11.0`. + +### v1.0.0 + +- First stable release according to [SemVer](https://semver.org/). +- No breaking changes. +- Tested on MUI versions from `5.1.0` to `5.10.13`. + +## Version 0 + +### v0.1.5 + +- Fixing the installation warning introduced in v0.1.1. +- The required peer dependency changed back from `@mui/system@^5.1.0` to `@mui/material@^5.1.0`. + +```text +warning " > merge-sx@0.1.4" has unmet peer dependency "@mui/system@^5.1.0". +``` + +### v0.1.4 + +- Another performance improvement. This time by `878%` for 10 arguments. +- I switched from using reducer to `for..of` syntax. + +```text +┌─────────────┬─────────┬────────┬───────┬───────┐ +│ N arguments │ 10 │ 100 │ 1000 │ 10000 │ +├─────────────┼─────────┼────────┼───────┼───────┤ +│ ops/s │ 6475799 │ 718229 │ 74589 │ 7636 │ +└─────────────┴─────────┴────────┴───────┴───────┘ +``` + +### v0.1.3 + +- The performance has been improved by `24%` for 10 arguments. + +```text +┌─────────────┬────────┬───────┬──────┬───────┐ +│ N arguments │ 10 │ 100 │ 1000 │ 10000 │ +├─────────────┼────────┼───────┼──────┼───────┤ +│ ops/s │ 601463 │ 48255 │ 2068 │ 25 │ +└─────────────┴────────┴───────┴──────┴───────┘ +``` + +### v0.1.2 + +- No changes to the code. Descriptive works only. + +### v0.1.1 + +- The required peer dependency changed from `@mui/material@^5.1.0` to `@mui/system@^5.1.0`. + +### v0.1.0 + +- The first release of the utility. diff --git a/packages/merge-sx/LICENSE b/packages/merge-sx/LICENSE new file mode 100644 index 00000000..c9112185 --- /dev/null +++ b/packages/merge-sx/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2022 Anna Bocharova + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 750a406e6f54a38fdba0f35b86cb8d0e24c85282 Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 21:05:24 +0100 Subject: [PATCH 21/31] Making a copy of LICENSE. --- LICENSE | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) mode change 120000 => 100644 LICENSE diff --git a/LICENSE b/LICENSE deleted file mode 120000 index 4adc9245..00000000 --- a/LICENSE +++ /dev/null @@ -1 +0,0 @@ -packages/merge-sx/LICENSE \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..c9112185 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2022 Anna Bocharova + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 3235b216c6cce8af82a89a0c47b3d53a2c650adc Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 21:07:06 +0100 Subject: [PATCH 22/31] rm changelog in root. --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) delete mode 120000 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 120000 index d89772ef..00000000 --- a/CHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -packages/merge-sx/CHANGELOG.md \ No newline at end of file From 2344aaa622158e47019d4035911c88e6ef35254d Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 21:07:57 +0100 Subject: [PATCH 23/31] v3.3.0-beta.5 --- packages/merge-sx/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/merge-sx/package.json b/packages/merge-sx/package.json index e8350083..99e63d75 100644 --- a/packages/merge-sx/package.json +++ b/packages/merge-sx/package.json @@ -1,6 +1,6 @@ { "name": "merge-sx", - "version": "3.3.0-beta.4", + "version": "3.3.0-beta.5", "description": "Combines multiple SxProps for Material UI components.", "main": "dist/index.cjs", "module": "dist/index.js", From e02b0cab60217e70f694d74e55fe8340a5ef6649 Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 21:11:12 +0100 Subject: [PATCH 24/31] Minor: readable version tool. --- tools/version.ts | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/tools/version.ts b/tools/version.ts index 5db8575f..2312a910 100644 --- a/tools/version.ts +++ b/tools/version.ts @@ -3,7 +3,6 @@ import { $ } from "bun"; import { type ReleaseType, inc, valid as isValidVersion } from "semver"; const path = "./packages/merge-sx/package.json"; - const variants: ReleaseType[] = [ "major", "premajor", @@ -13,21 +12,24 @@ const variants: ReleaseType[] = [ "prepatch", "prerelease", ]; + const isValidTarget = (subject: string): subject is ReleaseType => (variants as string[]).includes(subject); const isDirty = async () => (await $`git status --porcelain`.quiet()).text(); -// Bump version const target = Bun.argv.pop(); - const json = await Bun.file(path).json(); - const { version: current } = json; if (!isValidVersion(current)) throw new Error(`Invalid current version ${current}`); +if (await isDirty()) + throw new Error( + "There are uncommitted changes. Commit them before releasing or run with FORCE=true.", + ); + const desired = isValidVersion(target) ? target : target && isValidTarget(target) @@ -35,13 +37,6 @@ const desired = isValidVersion(target) : fail("invalid target version"); if (!desired) throw new Error("Failed to bump"); - -// Check for uncommitted changes -if (await isDirty()) - throw new Error( - "There are uncommitted changes. Commit them before releasing or run with FORCE=true.", - ); - console.debug(current, "—>", desired); await Bun.write( @@ -49,7 +44,6 @@ await Bun.write( JSON.stringify(Object.assign(json, { version: desired }), null, 2), ); -// Commit, tag and push await $`git add ${path}`; await $`git commit -m v${desired}`; await $`git tag v${desired}`; From 9986ec0c1ec9b8b08f291d360519d6779c2b2e5b Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 21:11:19 +0100 Subject: [PATCH 25/31] v3.3.0-beta.6 --- packages/merge-sx/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/merge-sx/package.json b/packages/merge-sx/package.json index 99e63d75..f5a1df49 100644 --- a/packages/merge-sx/package.json +++ b/packages/merge-sx/package.json @@ -1,6 +1,6 @@ { "name": "merge-sx", - "version": "3.3.0-beta.5", + "version": "3.3.0-beta.6", "description": "Combines multiple SxProps for Material UI components.", "main": "dist/index.cjs", "module": "dist/index.js", From 1394e1dbdfd130f2e22a8fa0c5594e84dd087eea Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 21:33:51 +0100 Subject: [PATCH 26/31] No force, add newline. --- tools/version.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/version.ts b/tools/version.ts index 2312a910..3a0f6476 100644 --- a/tools/version.ts +++ b/tools/version.ts @@ -27,7 +27,7 @@ if (!isValidVersion(current)) if (await isDirty()) throw new Error( - "There are uncommitted changes. Commit them before releasing or run with FORCE=true.", + "There are uncommitted changes. Commit them before releasing.", ); const desired = isValidVersion(target) @@ -39,10 +39,12 @@ const desired = isValidVersion(target) if (!desired) throw new Error("Failed to bump"); console.debug(current, "—>", desired); -await Bun.write( - path, - JSON.stringify(Object.assign(json, { version: desired }), null, 2), +const output = JSON.stringify( + Object.assign(json, { version: desired }), + null, + 2, ); +await Bun.write(path, `${output}\n`); await $`git add ${path}`; await $`git commit -m v${desired}`; From 21f1e25589f97ae106ea40f7587eeb0f3a0a7731 Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 21:33:56 +0100 Subject: [PATCH 27/31] v3.3.0-beta.7 --- packages/merge-sx/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/merge-sx/package.json b/packages/merge-sx/package.json index f5a1df49..485820d9 100644 --- a/packages/merge-sx/package.json +++ b/packages/merge-sx/package.json @@ -1,6 +1,6 @@ { "name": "merge-sx", - "version": "3.3.0-beta.6", + "version": "3.3.0-beta.7", "description": "Combines multiple SxProps for Material UI components.", "main": "dist/index.cjs", "module": "dist/index.js", @@ -61,4 +61,4 @@ "merging", "muiv5" ] -} \ No newline at end of file +} From 1dd21aca381fd2d0c9e55acd052f95e203ff376e Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 21:39:32 +0100 Subject: [PATCH 28/31] Changelog: 3.3.0. --- package.json | 2 +- packages/merge-sx/CHANGELOG.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 863a9ee4..7398cccf 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "lint": "bun run biome check", "test": "bun run --filter merge-sx test", "intTest": "tsc -p packages/integration-test && bun test --filter integration-test", - "mdfix": "bunx --bun prettier *.md --write", + "mdfix": "bunx --bun prettier packages/merge-sx/*.md --write", "version": "bun run tools/version.ts" }, "devDependencies": { diff --git a/packages/merge-sx/CHANGELOG.md b/packages/merge-sx/CHANGELOG.md index 307b823d..900f4e2a 100644 --- a/packages/merge-sx/CHANGELOG.md +++ b/packages/merge-sx/CHANGELOG.md @@ -2,6 +2,13 @@ ## Version 3 +### v3.3.0 + +- Technical update: + - Upgraded all dependencies and tested on latest MUI 6; + - Implemented workspaces to avoid duplicated dependencies for the integration test; + - Releasing using `bun publish`. + ### v3.2.3 - Dependencies update: From 54e0e7165d90b8aa41171d14ee2ef1cca8432898 Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 22:34:47 +0100 Subject: [PATCH 29/31] Fix coverage producing in root test command. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7398cccf..0b4ebb74 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "scripts": { "build": "bun run --filter merge-sx build", "lint": "bun run biome check", - "test": "bun run --filter merge-sx test", + "test": "bun test --filter merge-sx", "intTest": "tsc -p packages/integration-test && bun test --filter integration-test", "mdfix": "bunx --bun prettier packages/merge-sx/*.md --write", "version": "bun run tools/version.ts" From fa3ef98d168a4df81b16f2a66a3d052c60c9d10b Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 22:35:44 +0100 Subject: [PATCH 30/31] Also using cwd instead of filter for build command. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0b4ebb74..9a77cb90 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ }, "license": "MIT", "scripts": { - "build": "bun run --filter merge-sx build", + "build": "bun run --cwd packages/merge-sx build", "lint": "bun run biome check", "test": "bun test --filter merge-sx", "intTest": "tsc -p packages/integration-test && bun test --filter integration-test", From 4af51bd73d79b078a3e3673dddffe3e0e7eb23bb Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Thu, 28 Nov 2024 22:38:41 +0100 Subject: [PATCH 31/31] v3.3.0-beta.8 --- packages/merge-sx/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/merge-sx/package.json b/packages/merge-sx/package.json index 485820d9..b05e13c2 100644 --- a/packages/merge-sx/package.json +++ b/packages/merge-sx/package.json @@ -1,6 +1,6 @@ { "name": "merge-sx", - "version": "3.3.0-beta.7", + "version": "3.3.0-beta.8", "description": "Combines multiple SxProps for Material UI components.", "main": "dist/index.cjs", "module": "dist/index.js",