Merge branch 'main' of ssh://github.com/pixiv/charcoal into chore/upg…

…rade-react18-1
pixiv · Dec 25, 2024 · af1fa33 · af1fa33
2 parents 771093c + 12230e3
commit af1fa33
Show file tree

Hide file tree

Showing 18 changed files with 73 additions and 65 deletions.
diff --git a/lerna.json b/lerna.json
@@ -86,5 +86,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "4.0.0-rc.2"
+  "version": "4.0.0"
 }
diff --git a/packages/esbuild-plugin-styled-components/package.json b/packages/esbuild-plugin-styled-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@charcoal-ui/esbuild-plugin-styled-components",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0",
   "private": true,
   "license": "Apache-2.0",
   "main": "src/index.ts",

diff --git a/packages/foundation/package.json b/packages/foundation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@charcoal-ui/foundation",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0",
   "license": "Apache-2.0",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",

diff --git a/packages/icon-files/package.json b/packages/icon-files/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@charcoal-ui/icon-files",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./src/index.cjs",

diff --git a/packages/icons-cli/package.json b/packages/icons-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@charcoal-ui/icons-cli",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0",
   "license": "Apache-2.0",
   "bin": "./dist/index.js",
   "scripts": {

diff --git a/packages/icons/package.json b/packages/icons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@charcoal-ui/icons",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0",
   "license": "Apache-2.0",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",
@@ -36,7 +36,7 @@
     "vitest": "^2.0.1"
   },
   "dependencies": {
-    "@charcoal-ui/icon-files": "^4.0.0-rc.2",
+    "@charcoal-ui/icon-files": "^4.0.0",
     "warning": "^4.0.3"
   },
   "files": [

diff --git a/packages/pullrequest-cli/package.json b/packages/pullrequest-cli/package.json
@@ -30,5 +30,6 @@
     "type": "git",
     "url": "https://github.com/pixiv/charcoal.git",
     "directory": "packages/icons-cli"
-  }
+  },
+  "version": "4.0.0"
 }
diff --git a/packages/react-sandbox/package.json b/packages/react-sandbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@charcoal-ui/react-sandbox",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0",
   "license": "Apache-2.0",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",
@@ -21,7 +21,7 @@
     "test": "vitest run --passWithNoTests"
   },
   "devDependencies": {
-    "@charcoal-ui/esbuild-plugin-styled-components": "^4.0.0-rc.2",
+    "@charcoal-ui/esbuild-plugin-styled-components": "^4.0.0",
     "@storybook/addon-actions": "^7.4.1",
     "@storybook/addon-knobs": "^7.0.2",
     "@storybook/addons": "^7.4.1",
@@ -49,11 +49,11 @@
     "vitest": "^2.0.2"
   },
   "dependencies": {
-    "@charcoal-ui/foundation": "^4.0.0-rc.2",
-    "@charcoal-ui/react": "^4.0.0-rc.2",
-    "@charcoal-ui/styled": "^4.0.0-rc.2",
-    "@charcoal-ui/theme": "^4.0.0-rc.2",
-    "@charcoal-ui/utils": "^4.0.0-rc.2",
+    "@charcoal-ui/foundation": "^4.0.0",
+    "@charcoal-ui/react": "^4.0.0",
+    "@charcoal-ui/styled": "^4.0.0",
+    "@charcoal-ui/theme": "^4.0.0",
+    "@charcoal-ui/utils": "^4.0.0",
     "polished": "^4.1.4",
     "react-spring": "^9.0.0",
     "warning": "^4.0.3"

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@charcoal-ui/react",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0",
   "license": "Apache-2.0",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",
@@ -33,7 +33,7 @@
     "test": "vitest run --passWithNoTests"
   },
   "devDependencies": {
-    "@charcoal-ui/esbuild-plugin-styled-components": "^4.0.0-rc.2",
+    "@charcoal-ui/esbuild-plugin-styled-components": "^4.0.0",
     "@react-types/switch": "^3.1.2",
     "@storybook/addon-actions": "^8.0.5",
     "@storybook/react": "^8.0.5",
@@ -59,10 +59,10 @@
     "vitest": "^2.0.1"
   },
   "dependencies": {
-    "@charcoal-ui/foundation": "^4.0.0-rc.2",
-    "@charcoal-ui/icons": "^4.0.0-rc.2",
-    "@charcoal-ui/theme": "^4.0.0-rc.2",
-    "@charcoal-ui/utils": "^4.0.0-rc.2",
+    "@charcoal-ui/foundation": "^4.0.0",
+    "@charcoal-ui/icons": "^4.0.0",
+    "@charcoal-ui/theme": "^4.0.0",
+    "@charcoal-ui/utils": "^4.0.0",
     "@react-aria/button": "^3.9.1",
     "@react-aria/checkbox": "^3.13.0",
     "@react-aria/dialog": "^3.5.10",

diff --git a/packages/react/src/components/Clickable/index.tsx b/packages/react/src/components/Clickable/index.tsx
@@ -24,3 +24,9 @@ const Clickable = forwardRef(function Clickable<T extends React.ElementType>(
   p: ClickableProps<T>
 ) => JSX.Element
 export default Clickable
+
+/**
+ * @deprecated
+ * remained for v3 compatibility and will be removed in the future
+ */
+export type ClickableElement = HTMLButtonElement & HTMLAnchorElement
diff --git a/packages/react/src/index.ts b/packages/react/src/index.ts
@@ -8,6 +8,7 @@ export { default as Button, type ButtonProps } from './components/Button'
 export {
   default as Clickable,
   type ClickableProps,
+  type ClickableElement,
 } from './components/Clickable'
 export {
   default as IconButton,

diff --git a/packages/styled/package.json b/packages/styled/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@charcoal-ui/styled",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0",
   "license": "Apache-2.0",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.cjs.js",
@@ -37,9 +37,9 @@
     "vitest": "^2.0.2"
   },
   "dependencies": {
-    "@charcoal-ui/foundation": "^4.0.0-rc.2",
-    "@charcoal-ui/theme": "^4.0.0-rc.2",
-    "@charcoal-ui/utils": "^4.0.0-rc.2",
+    "@charcoal-ui/foundation": "^4.0.0",
+    "@charcoal-ui/theme": "^4.0.0",
+    "@charcoal-ui/utils": "^4.0.0",
     "warning": "^4.0.3"
   },
   "peerDependencies": {

diff --git a/packages/tailwind-config/package.json b/packages/tailwind-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@charcoal-ui/tailwind-config",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0",
   "license": "Apache-2.0",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",
@@ -32,9 +32,9 @@
     "vitest": "^2.0.2"
   },
   "dependencies": {
-    "@charcoal-ui/foundation": "^4.0.0-rc.2",
-    "@charcoal-ui/theme": "^4.0.0-rc.2",
-    "@charcoal-ui/utils": "^4.0.0-rc.2"
+    "@charcoal-ui/foundation": "^4.0.0",
+    "@charcoal-ui/theme": "^4.0.0",
+    "@charcoal-ui/utils": "^4.0.0"
   },
   "peerDependencies": {
     "csstype": ">=3.0.0",

diff --git a/packages/tailwind-diff/package.json b/packages/tailwind-diff/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@charcoal-ui/tailwind-diff",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0",
   "bin": "bin/tailwind-diff.js",
   "scripts": {
     "build": "tsc",

diff --git a/packages/theme/package.json b/packages/theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@charcoal-ui/theme",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0",
   "license": "Apache-2.0",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",
@@ -63,8 +63,8 @@
     "vitest": "^2.0.2"
   },
   "dependencies": {
-    "@charcoal-ui/foundation": "^4.0.0-rc.2",
-    "@charcoal-ui/utils": "^4.0.0-rc.2",
+    "@charcoal-ui/foundation": "^4.0.0",
+    "@charcoal-ui/utils": "^4.0.0",
     "change-case-all": "^2.1.0",
     "deepmerge": "^4.3.1",
     "polished": "^4.1.4"

diff --git a/packages/token-cli/package.json b/packages/token-cli/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "bin": "./dist/index.js",
   "type": "commonjs",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0",
   "license": "Apache-2.0",
   "scripts": {
     "build": "FORCE_COLOR=1 tsup-node",

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@charcoal-ui/utils",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0",
   "license": "Apache-2.0",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",
@@ -26,7 +26,7 @@
     "vitest": "^2.0.2"
   },
   "dependencies": {
-    "@charcoal-ui/foundation": "^4.0.0-rc.2",
+    "@charcoal-ui/foundation": "^4.0.0",
     "polished": "^4.1.4"
   },
   "files": [

diff --git a/yarn.lock b/yarn.lock
@@ -1940,7 +1940,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@charcoal-ui/esbuild-plugin-styled-components@^4.0.0-rc.2, @charcoal-ui/esbuild-plugin-styled-components@workspace:packages/esbuild-plugin-styled-components":
+"@charcoal-ui/esbuild-plugin-styled-components@^4.0.0, @charcoal-ui/esbuild-plugin-styled-components@workspace:packages/esbuild-plugin-styled-components":
   version: 0.0.0-use.local
   resolution: "@charcoal-ui/esbuild-plugin-styled-components@workspace:packages/esbuild-plugin-styled-components"
   dependencies:
@@ -1952,7 +1952,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@charcoal-ui/foundation@^4.0.0-rc.2, @charcoal-ui/foundation@workspace:packages/foundation":
+"@charcoal-ui/foundation@^4.0.0, @charcoal-ui/foundation@workspace:packages/foundation":
   version: 0.0.0-use.local
   resolution: "@charcoal-ui/foundation@workspace:packages/foundation"
   dependencies:
@@ -1964,7 +1964,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@charcoal-ui/icon-files@^4.0.0-rc.2, @charcoal-ui/icon-files@workspace:packages/icon-files":
+"@charcoal-ui/icon-files@^4.0.0, @charcoal-ui/icon-files@workspace:packages/icon-files":
   version: 0.0.0-use.local
   resolution: "@charcoal-ui/icon-files@workspace:packages/icon-files"
   languageName: unknown
@@ -2001,11 +2001,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@charcoal-ui/icons@^4.0.0-rc.2, @charcoal-ui/icons@workspace:packages/icons":
+"@charcoal-ui/icons@^4.0.0, @charcoal-ui/icons@workspace:packages/icons":
   version: 0.0.0-use.local
   resolution: "@charcoal-ui/icons@workspace:packages/icons"
   dependencies:
-    "@charcoal-ui/icon-files": ^4.0.0-rc.2
+    "@charcoal-ui/icon-files": ^4.0.0
     "@storybook/react": ^8.0.5
     "@types/dompurify": ^2.3.3
     "@types/react": ^18.3.3
@@ -2046,12 +2046,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@charcoal-ui/react-sandbox@workspace:packages/react-sandbox"
   dependencies:
-    "@charcoal-ui/esbuild-plugin-styled-components": ^4.0.0-rc.2
-    "@charcoal-ui/foundation": ^4.0.0-rc.2
-    "@charcoal-ui/react": ^4.0.0-rc.2
-    "@charcoal-ui/styled": ^4.0.0-rc.2
-    "@charcoal-ui/theme": ^4.0.0-rc.2
-    "@charcoal-ui/utils": ^4.0.0-rc.2
+    "@charcoal-ui/esbuild-plugin-styled-components": ^4.0.0
+    "@charcoal-ui/foundation": ^4.0.0
+    "@charcoal-ui/react": ^4.0.0
+    "@charcoal-ui/styled": ^4.0.0
+    "@charcoal-ui/theme": ^4.0.0
+    "@charcoal-ui/utils": ^4.0.0
     "@storybook/addon-actions": ^7.4.1
     "@storybook/addon-knobs": ^7.0.2
     "@storybook/addons": ^7.4.1
@@ -2087,15 +2087,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@charcoal-ui/react@^4.0.0-rc.2, @charcoal-ui/react@workspace:packages/react":
+"@charcoal-ui/react@^4.0.0, @charcoal-ui/react@workspace:packages/react":
   version: 0.0.0-use.local
   resolution: "@charcoal-ui/react@workspace:packages/react"
   dependencies:
-    "@charcoal-ui/esbuild-plugin-styled-components": ^4.0.0-rc.2
-    "@charcoal-ui/foundation": ^4.0.0-rc.2
-    "@charcoal-ui/icons": ^4.0.0-rc.2
-    "@charcoal-ui/theme": ^4.0.0-rc.2
-    "@charcoal-ui/utils": ^4.0.0-rc.2
+    "@charcoal-ui/esbuild-plugin-styled-components": ^4.0.0
+    "@charcoal-ui/foundation": ^4.0.0
+    "@charcoal-ui/icons": ^4.0.0
+    "@charcoal-ui/theme": ^4.0.0
+    "@charcoal-ui/utils": ^4.0.0
     "@react-aria/button": ^3.9.1
     "@react-aria/checkbox": ^3.13.0
     "@react-aria/dialog": ^3.5.10
@@ -2139,13 +2139,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@charcoal-ui/styled@^4.0.0-rc.2, @charcoal-ui/styled@workspace:packages/styled":
+"@charcoal-ui/styled@^4.0.0, @charcoal-ui/styled@workspace:packages/styled":
   version: 0.0.0-use.local
   resolution: "@charcoal-ui/styled@workspace:packages/styled"
   dependencies:
-    "@charcoal-ui/foundation": ^4.0.0-rc.2
-    "@charcoal-ui/theme": ^4.0.0-rc.2
-    "@charcoal-ui/utils": ^4.0.0-rc.2
+    "@charcoal-ui/foundation": ^4.0.0
+    "@charcoal-ui/theme": ^4.0.0
+    "@charcoal-ui/utils": ^4.0.0
     "@types/react": ^18.3.3
     "@types/react-test-renderer": ^18.3.0
     "@types/warning": ^3.0.0
@@ -2171,9 +2171,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@charcoal-ui/tailwind-config@workspace:packages/tailwind-config"
   dependencies:
-    "@charcoal-ui/foundation": ^4.0.0-rc.2
-    "@charcoal-ui/theme": ^4.0.0-rc.2
-    "@charcoal-ui/utils": ^4.0.0-rc.2
+    "@charcoal-ui/foundation": ^4.0.0
+    "@charcoal-ui/theme": ^4.0.0
+    "@charcoal-ui/utils": ^4.0.0
     jsdom: ^24.1.0
     postcss: ^8.4.5
     postcss-selector-parser: ^6.0.9
@@ -2206,12 +2206,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@charcoal-ui/theme@^4.0.0-rc.2, @charcoal-ui/theme@workspace:packages/theme":
+"@charcoal-ui/theme@^4.0.0, @charcoal-ui/theme@workspace:packages/theme":
   version: 0.0.0-use.local
   resolution: "@charcoal-ui/theme@workspace:packages/theme"
   dependencies:
-    "@charcoal-ui/foundation": ^4.0.0-rc.2
-    "@charcoal-ui/utils": ^4.0.0-rc.2
+    "@charcoal-ui/foundation": ^4.0.0
+    "@charcoal-ui/utils": ^4.0.0
     "@types/css": ^0.0.38
     change-case-all: ^2.1.0
     cpx: ^1.5.0
@@ -2246,11 +2246,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@charcoal-ui/utils@^4.0.0-rc.2, @charcoal-ui/utils@workspace:packages/utils":
+"@charcoal-ui/utils@^4.0.0, @charcoal-ui/utils@workspace:packages/utils":
   version: 0.0.0-use.local
   resolution: "@charcoal-ui/utils@workspace:packages/utils"
   dependencies:
-    "@charcoal-ui/foundation": ^4.0.0-rc.2
+    "@charcoal-ui/foundation": ^4.0.0
     npm-run-all: ^4.1.5
     polished: ^4.1.4
     rimraf: ^3.0.2