diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d66610ca0..eb7678a84 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,5 +20,5 @@ jobs: working-directory: lib env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - YARN_NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }} + NPM_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }} SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} diff --git a/.yarn/patches/@stitches-react-npm-1.3.1-1-531ba0a0c0.patch b/.yarn/patches/@stitches-react-npm-1.3.1-1-531ba0a0c0.patch deleted file mode 100644 index 504460d26..000000000 --- a/.yarn/patches/@stitches-react-npm-1.3.1-1-531ba0a0c0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/types/css-util.d.ts b/types/css-util.d.ts -index 5452ca4ada9c93e0e93d50f780d01a6590d7a095..8de19cb78cd7506b096ff24601cf412738c65d21 100644 ---- a/types/css-util.d.ts -+++ b/types/css-util.d.ts -@@ -98,6 +98,7 @@ export type CSS< - | CSS - | {} - | undefined -+ | any - ) - } - ) diff --git a/documentation/content/components.overview.versioning.md b/documentation/content/components.overview.versioning.md index 3f99afe74..34c545929 100644 --- a/documentation/content/components.overview.versioning.md +++ b/documentation/content/components.overview.versioning.md @@ -54,7 +54,7 @@ tabs: * `@semantic-release/commit-analyzer` - checks commits messages for the required tags * `@semantic-release/release-notes-generator` - creates/updates the release notes - * `semantic-release-yarn` - publishes version to `npm` + * `@semantic-release/npm` - publishes version to `npm` * `@semantic-release/github` - publishes version to `GitHub Releases` * `husky` - precommit hook to prevent incomplete commit messages nestedSlug: diff --git a/lib/package.json b/lib/package.json index 846b60bf1..fe22c45e1 100644 --- a/lib/package.json +++ b/lib/package.json @@ -68,6 +68,7 @@ "@rollup/plugin-commonjs": "^17.1.0", "@rollup/plugin-node-resolve": "^11.2.0", "@semantic-release/changelog": "^6.0.3", + "@semantic-release/npm": "^12.0.1", "@semantic-release/release-notes-generator": "^14.0.1", "@size-limit/preset-small-lib": "^7.0.5", "@testing-library/dom": "^7.28.1", @@ -119,7 +120,6 @@ "rollup-plugin-visualizer": "^4.2.2", "semantic-release": "^24.1.0", "semantic-release-slack-bot": "^4.0.2", - "semantic-release-yarn": "^3.0.2", "size-limit": "^7.0.5", "stitches-reset": "^1.0.0", "tsc-alias": "^1.3.5", @@ -134,6 +134,7 @@ "react-dom": "^17 || ^18 || ^19" }, "dependencies": { + "@atom-learning/stitches-react": "^1.4.1", "@dnd-kit/core": "^6.0.5", "@dnd-kit/modifiers": "^6.0.0", "@dnd-kit/sortable": "^7.0.1", @@ -157,7 +158,6 @@ "@radix-ui/react-tooltip": "^1.0.7", "@radix-ui/react-visually-hidden": "^1.0.3", "@reach/combobox": "^0.16.1", - "@stitches/react": "patch:@stitches/react@npm%3A1.3.1-1#~/.yarn/patches/@stitches-react-npm-1.3.1-1-531ba0a0c0.patch", "@tanstack/react-table": "^8.5.11", "color2k": "^2.0.0", "dayjs": "^1.10.7", @@ -208,7 +208,7 @@ "@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator", "@semantic-release/changelog", - "semantic-release-yarn", + "@semantic-release/npm", [ "semantic-release-slack-bot", { @@ -223,9 +223,5 @@ } ] ] - }, - "publishConfig": { - "registry": "https://registry.npmjs.org/", - "access": "public" } } diff --git a/lib/src/components/action-icon/ActionIcon.tsx b/lib/src/components/action-icon/ActionIcon.tsx index 7cdc9c5d0..fc7a26fa5 100644 --- a/lib/src/components/action-icon/ActionIcon.tsx +++ b/lib/src/components/action-icon/ActionIcon.tsx @@ -1,4 +1,4 @@ -import type { VariantProps } from '@stitches/react' +import type { VariantProps } from '@atom-learning/stitches-react' import invariant from 'invariant' import * as React from 'react' diff --git a/lib/src/components/button/Button.tsx b/lib/src/components/button/Button.tsx index 68c0713b4..c43ffe0fd 100644 --- a/lib/src/components/button/Button.tsx +++ b/lib/src/components/button/Button.tsx @@ -1,4 +1,4 @@ -import type { VariantProps } from '@stitches/react' +import type { VariantProps } from '@atom-learning/stitches-react' import { opacify } from 'color2k' import * as React from 'react' diff --git a/lib/src/components/data-table/DataTableMetaData.tsx b/lib/src/components/data-table/DataTableMetaData.tsx index f89b25866..8ae7f1064 100644 --- a/lib/src/components/data-table/DataTableMetaData.tsx +++ b/lib/src/components/data-table/DataTableMetaData.tsx @@ -1,4 +1,4 @@ -import { CSS } from '@stitches/react' +import { CSS } from '@atom-learning/stitches-react' import * as React from 'react' import { Text } from '../text' diff --git a/lib/src/components/radio-card/RadioCardGroup.tsx b/lib/src/components/radio-card/RadioCardGroup.tsx index d8250a775..859754800 100644 --- a/lib/src/components/radio-card/RadioCardGroup.tsx +++ b/lib/src/components/radio-card/RadioCardGroup.tsx @@ -1,5 +1,5 @@ import * as RadioGroup from '@radix-ui/react-radio-group' -import type { VariantProps } from '@stitches/react' +import type { VariantProps } from '@atom-learning/stitches-react' import * as React from 'react' import type { Override } from '~/utilities' diff --git a/lib/src/components/sortable/SortableItem.tsx b/lib/src/components/sortable/SortableItem.tsx index aaeb56cb6..d60644a65 100644 --- a/lib/src/components/sortable/SortableItem.tsx +++ b/lib/src/components/sortable/SortableItem.tsx @@ -1,7 +1,7 @@ import type { UniqueIdentifier } from '@dnd-kit/core' import { useSortable } from '@dnd-kit/sortable' import { Slot } from '@radix-ui/react-slot' -import { CSS, styled } from '@stitches/react' +import { CSS, styled } from '@atom-learning/stitches-react' import * as React from 'react' import { Box } from '../box' diff --git a/lib/src/components/spacer/Spacer.tsx b/lib/src/components/spacer/Spacer.tsx index dedf3c417..5fb9f4ca0 100644 --- a/lib/src/components/spacer/Spacer.tsx +++ b/lib/src/components/spacer/Spacer.tsx @@ -1,4 +1,4 @@ -import { styled } from '@stitches/react' +import { styled } from '@atom-learning/stitches-react' /** * A flexible flex spacer that expands along the major axis of its containing flex layout. diff --git a/lib/src/stitches.ts b/lib/src/stitches.ts index a0c6bc9fb..52f2d95a7 100644 --- a/lib/src/stitches.ts +++ b/lib/src/stitches.ts @@ -5,8 +5,8 @@ import type { CSS as StitchesCSS, PropertyValue, ScaleValue -} from '@stitches/react' -import { createStitches, defaultThemeMap } from '@stitches/react' +} from '@atom-learning/stitches-react' +import { createStitches, defaultThemeMap } from '@atom-learning/stitches-react' export const utils = { bg: (value: PropertyValue<'background'>) => ({ diff --git a/yarn.lock b/yarn.lock index 9d9bd20d1..599ca1ce6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -28,6 +28,7 @@ __metadata: dependencies: "@atom-learning/icons": "npm:1.20.0" "@atom-learning/jest-stitches": "npm:1.0.10" + "@atom-learning/stitches-react": "npm:^1.4.1" "@atom-learning/theme": "npm:3.1.0" "@commitlint/cli": "npm:^11.0.0" "@commitlint/config-conventional": "npm:^11.0.0" @@ -59,9 +60,9 @@ __metadata: "@rollup/plugin-commonjs": "npm:^17.1.0" "@rollup/plugin-node-resolve": "npm:^11.2.0" "@semantic-release/changelog": "npm:^6.0.3" + "@semantic-release/npm": "npm:^12.0.1" "@semantic-release/release-notes-generator": "npm:^14.0.1" "@size-limit/preset-small-lib": "npm:^7.0.5" - "@stitches/react": "patch:@stitches/react@npm%3A1.3.1-1#~/.yarn/patches/@stitches-react-npm-1.3.1-1-531ba0a0c0.patch" "@tanstack/react-table": "npm:^8.5.11" "@testing-library/dom": "npm:^7.28.1" "@testing-library/jest-dom": "npm:^5.11.9" @@ -127,7 +128,6 @@ __metadata: rollup-plugin-visualizer: "npm:^4.2.2" semantic-release: "npm:^24.1.0" semantic-release-slack-bot: "npm:^4.0.2" - semantic-release-yarn: "npm:^3.0.2" size-limit: "npm:^7.0.5" stitches-reset: "npm:^1.0.0" throttle-debounce: "npm:^3.0.1" @@ -210,6 +210,15 @@ __metadata: languageName: node linkType: hard +"@atom-learning/stitches-react@npm:^1.4.1": + version: 1.4.1 + resolution: "@atom-learning/stitches-react@npm:1.4.1" + peerDependencies: + react: ">= 16.3.0" + checksum: 10c0/96b98527b1173b59d61c808570f4accd267de209578a9fa0c6ff957c7882b052e367e6703b021cb3ce9e14be195e1e3976214044c7c7243ad0d2753d69bb96d9 + languageName: node + linkType: hard + "@atom-learning/theme@npm:3.1.0": version: 3.1.0 resolution: "@atom-learning/theme@npm:3.1.0" @@ -235,7 +244,7 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:^7.21.4, @babel/code-frame@npm:^7.22.13": +"@babel/code-frame@npm:^7.22.13": version: 7.24.7 resolution: "@babel/code-frame@npm:7.24.7" dependencies: @@ -5273,7 +5282,7 @@ __metadata: languageName: node linkType: hard -"@semantic-release/npm@npm:^12.0.0": +"@semantic-release/npm@npm:^12.0.0, @semantic-release/npm@npm:^12.0.1": version: 12.0.1 resolution: "@semantic-release/npm@npm:12.0.1" dependencies: @@ -5478,24 +5487,6 @@ __metadata: languageName: node linkType: hard -"@stitches/react@npm:1.3.1-1": - version: 1.3.1-1 - resolution: "@stitches/react@npm:1.3.1-1" - peerDependencies: - react: ">= 16.3.0" - checksum: 10c0/cb6e94c7fad05dac700a1ff32d0027998671bd8302094d6bdd449d008c9512bde1e3c39fd5ef8eed30a78c844d01e19a94d1e051502089b69f01333a6339ae1b - languageName: node - linkType: hard - -"@stitches/react@patch:@stitches/react@npm%3A1.3.1-1#~/.yarn/patches/@stitches-react-npm-1.3.1-1-531ba0a0c0.patch": - version: 1.3.1-1 - resolution: "@stitches/react@patch:@stitches/react@npm%3A1.3.1-1#~/.yarn/patches/@stitches-react-npm-1.3.1-1-531ba0a0c0.patch::version=1.3.1-1&hash=da3c4c" - peerDependencies: - react: ">= 16.3.0" - checksum: 10c0/efc7818c44e0741b86b6f266eb95d6386d95dea621d38790a834287d7a89f6da642f219ba5fecbc52e2060a9f4b7279d401d6ca88d059ff4e73ea8ae77419d8a - languageName: node - linkType: hard - "@swc/helpers@npm:0.4.36": version: 0.4.36 resolution: "@swc/helpers@npm:0.4.36" @@ -5923,7 +5914,7 @@ __metadata: languageName: node linkType: hard -"@types/normalize-package-data@npm:^2.4.1, @types/normalize-package-data@npm:^2.4.3": +"@types/normalize-package-data@npm:^2.4.3": version: 2.4.4 resolution: "@types/normalize-package-data@npm:2.4.4" checksum: 10c0/aef7bb9b015883d6f4119c423dd28c4bdc17b0e8a0ccf112c78b4fe0e91fbc4af7c6204b04bba0e199a57d2f3fbbd5b4a14bf8739bf9d2a39b2a0aad545e0f86 @@ -8221,23 +8212,6 @@ __metadata: languageName: node linkType: hard -"cosmiconfig@npm:^8.1.0": - version: 8.3.6 - resolution: "cosmiconfig@npm:8.3.6" - dependencies: - import-fresh: "npm:^3.3.0" - js-yaml: "npm:^4.1.0" - parse-json: "npm:^5.2.0" - path-type: "npm:^4.0.0" - peerDependencies: - typescript: ">=4.9.5" - peerDependenciesMeta: - typescript: - optional: true - checksum: 10c0/0382a9ed13208f8bfc22ca2f62b364855207dffdb73dc26e150ade78c3093f1cf56172df2dd460c8caf2afa91c0ed4ec8a88c62f8f9cd1cf423d26506aa8797a - languageName: node - linkType: hard - "cosmiconfig@npm:^9.0.0": version: 9.0.0 resolution: "cosmiconfig@npm:9.0.0" @@ -8965,7 +8939,7 @@ __metadata: languageName: node linkType: hard -"error-ex@npm:^1.3.1, error-ex@npm:^1.3.2": +"error-ex@npm:^1.3.1": version: 1.3.2 resolution: "error-ex@npm:1.3.2" dependencies: @@ -9839,7 +9813,7 @@ __metadata: languageName: node linkType: hard -"execa@npm:^8.0.0, execa@npm:^8.0.1": +"execa@npm:^8.0.0": version: 8.0.1 resolution: "execa@npm:8.0.1" dependencies: @@ -10286,7 +10260,7 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^11.0.0, fs-extra@npm:^11.1.0": +"fs-extra@npm:^11.0.0": version: 11.2.0 resolution: "fs-extra@npm:11.2.0" dependencies: @@ -13418,13 +13392,6 @@ __metadata: languageName: node linkType: hard -"lines-and-columns@npm:^2.0.3": - version: 2.0.4 - resolution: "lines-and-columns@npm:2.0.4" - checksum: 10c0/4db28bf065cd7ad897c0700f22d3d0d7c5ed6777e138861c601c496d545340df3fc19e18bd04ff8d95a246a245eb55685b82ca2f8c2ca53a008e9c5316250379 - languageName: node - linkType: hard - "lint-staged@npm:^10.5.3": version: 10.5.4 resolution: "lint-staged@npm:10.5.4" @@ -13625,7 +13592,7 @@ __metadata: languageName: node linkType: hard -"lodash@npm:^4.0.1, lodash@npm:^4.1.1, lodash@npm:^4.17.11, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.7.0": +"lodash@npm:^4.0.1, lodash@npm:^4.1.1, lodash@npm:^4.17.11, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.4, lodash@npm:^4.7.0": version: 4.17.21 resolution: "lodash@npm:4.17.21" checksum: 10c0/d8cbea072bb08655bb4c989da418994b073a608dffa608b09ac04b43a791b12aeae7cd7ad919aa4c925f33b48490b5cfe6c1f71d827956071dae2e7bb3a6b74c @@ -17115,19 +17082,6 @@ __metadata: languageName: node linkType: hard -"parse-json@npm:^7.0.0": - version: 7.1.1 - resolution: "parse-json@npm:7.1.1" - dependencies: - "@babel/code-frame": "npm:^7.21.4" - error-ex: "npm:^1.3.2" - json-parse-even-better-errors: "npm:^3.0.0" - lines-and-columns: "npm:^2.0.3" - type-fest: "npm:^3.8.0" - checksum: 10c0/a85ebc7430af7763fa52eb456d7efd35c35be5b06f04d8d80c37d0d33312ac6cdff12647acb9c95448dcc8b907dfafa81fb126e094aa132b0abc2a71b9df51d5 - languageName: node - linkType: hard - "parse-json@npm:^8.0.0": version: 8.1.0 resolution: "parse-json@npm:8.1.0" @@ -18569,18 +18523,6 @@ __metadata: languageName: node linkType: hard -"read-pkg@npm:^8.0.0": - version: 8.1.0 - resolution: "read-pkg@npm:8.1.0" - dependencies: - "@types/normalize-package-data": "npm:^2.4.1" - normalize-package-data: "npm:^6.0.0" - parse-json: "npm:^7.0.0" - type-fest: "npm:^4.2.0" - checksum: 10c0/e50846bbfbe73f4b8fd8c23c523b2e9f1d78467297a870ff94a9e6db7eb65445a4a392bf2896b7566c1715d36492d92d368f1c4b38996dd3942fd1865eb22936 - languageName: node - linkType: hard - "read-pkg@npm:^9.0.0": version: 9.0.1 resolution: "read-pkg@npm:9.0.1" @@ -19439,26 +19381,6 @@ __metadata: languageName: node linkType: hard -"semantic-release-yarn@npm:^3.0.2": - version: 3.0.2 - resolution: "semantic-release-yarn@npm:3.0.2" - dependencies: - "@semantic-release/error": "npm:^4.0.0" - aggregate-error: "npm:^5.0.0" - cosmiconfig: "npm:^8.1.0" - execa: "npm:^8.0.1" - fs-extra: "npm:^11.1.0" - js-yaml: "npm:^4.1.0" - lodash: "npm:^4.17.21" - nerf-dart: "npm:^1.0.0" - read-pkg: "npm:^8.0.0" - semver: "npm:^7.3.8" - peerDependencies: - semantic-release: ">=19.0.0" - checksum: 10c0/9843686fba26a8823f88d8c97c90ee81c8d045628802a63896acdbda70616c3bbd71683d8b487c3a7da19b57494c260ff7c9d8acee005173f4d7f3b1bee782a9 - languageName: node - linkType: hard - "semantic-release@npm:^24.1.0": version: 24.1.0 resolution: "semantic-release@npm:24.1.0" @@ -19584,7 +19506,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.3.8, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.6.2": +"semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.6.2": version: 7.6.3 resolution: "semver@npm:7.6.3" bin: @@ -21238,14 +21160,7 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^3.8.0": - version: 3.13.1 - resolution: "type-fest@npm:3.13.1" - checksum: 10c0/547d22186f73a8c04590b70dcf63baff390078c75ea8acd366bbd510fd0646e348bd1970e47ecf795b7cff0b41d26e9c475c1fedd6ef5c45c82075fbf916b629 - languageName: node - linkType: hard - -"type-fest@npm:^4.2.0, type-fest@npm:^4.6.0, type-fest@npm:^4.7.1": +"type-fest@npm:^4.6.0, type-fest@npm:^4.7.1": version: 4.25.0 resolution: "type-fest@npm:4.25.0" checksum: 10c0/1187b30d74e72f4b0b44a3493d2c1c2a9dc46423961c8250bd1535e976c4b8afc3916f6b4b90d7f56ed5b2f36d1645b05c318b4915fe4909a8a66890bda1d68d