Merge branch 'v4.0.0' of ssh://github.com/pixiv/charcoal into chore/u…

…pgrade-react18-1

.github/workflows/bundle-size.yml

@@ -2,9 +2,6 @@ name: Bundle Size
 
 on:
   pull_request:
-    branches:
-      - main
-      - v4.0.0
 
 jobs:
   build:
@@ -23,5 +20,5 @@ jobs:
 
           # sourcemap は見ない
           # d.ts はたまに異常な数の union 型が展開されるとかは検知したいが見なくて良いかもしれない
-          pattern: './packages/**/dist/**/*.{ts,js,cjs}'
-          exclude: '{**/node_modules/**,./packages/**/node_modules/**}'
+          pattern: './packages/*/dist/**/*.{ts,js,cjs}'
+          exclude: '{**/node_modules/**}'

.github/workflows/docs-hosting-pr.yml

@@ -2,9 +2,6 @@ name: Deploy to Preview Channel
 
 on:
   pull_request:
-    branches:
-      - main
-      - v4.0.0
 
 env:
   WORKLOAD_IDENTITY_PROVIDER: 'projects/643536859873/locations/global/workloadIdentityPools/charcoal/providers/github-actions'

.github/workflows/icons.yml

@@ -8,13 +8,17 @@ on:
 
 env:
   OUTPUT_ROOT_DIR: packages/icon-files/
+  TARGET_BRANCH: ${{ github.event_name == 'workflow_dispatch' && github.ref_name || 'main' }}
 
 jobs:
   icons:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ env.TARGET_BRANCH }}
+
       - uses: actions/setup-node@v3
         with:
           node-version-file: '.node-version'
@@ -49,5 +53,5 @@ jobs:
           GITHUB_ACCESS_TOKEN: ${{ steps.generate_token.outputs.token }}
           GITHUB_REPO_OWNER: pixiv
           GITHUB_REPO_NAME: charcoal
-          GITHUB_DEFAULT_BRANCH: main
+          GITHUB_DEFAULT_BRANCH: ${{ env.TARGET_BRANCH }}
         run: yarn icons-cli github:pr

.github/workflows/test-storybook.yml

@@ -2,9 +2,6 @@ name: test-storybook
 on:
   pull_request:
     types: [labeled, unlabeled, opened, synchronize, reopened]
-    branches:
-      - main
-      - v4.0.0
 
 concurrency:
   group: ${{ github.ref }}

.github/workflows/test.yml

@@ -5,9 +5,6 @@ on:
       - main
 
   pull_request:
-    branches:
-      - main
-      - v4.0.0
 
 jobs:
   build:

.github/workflows/tokens.yml

@@ -43,8 +43,8 @@ jobs:
 
       - name: Transform applied token
         run: |
-          yarn token-cli transform --source ./out/raw_applieds.json --output ./tokens/pixiv-light.json --variable-collection-names color space radius --mode-name "pixiv/light"
-          yarn token-cli transform --source ./out/raw_applieds.json --output ./tokens/pixiv-dark.json --variable-collection-names color space radius --mode-name "pixiv/dark"
+          yarn token-cli transform --source ./out/raw_applieds.json --output ./tokens/pixiv-light.json --variable-collection-names color space radius text border-width paragraph-width --mode-name "pixiv/light"
+          yarn token-cli transform --source ./out/raw_applieds.json --output ./tokens/pixiv-dark.json --variable-collection-names color space radius text border-width paragraph-width --mode-name "pixiv/dark"
 
       - name: Generate CSS variables
         run: |

eslint.config.mjs

@@ -132,13 +132,13 @@ const config = [
   },
   {
     files: [
-      '**/*.test.ts',
-      '**/*.test.tsx',
+      '**/*.test.{ts,tsx}',
       '**/__tests__/**',
       '**/*.config.*',
       '*.config.*',
       '**/*.story.*',
       '.storybook/**',
+      '**/*.bench.{ts,tsx}',
     ],
     languageOptions: {
       globals: {

lerna.json

@@ -86,5 +86,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "4.0.0-beta.14"
+  "version": "4.0.0-beta.16"
 }

package.json

@@ -70,7 +70,7 @@
     "@types/eslint__js": "^8.42.3",
     "@types/jest-image-snapshot": "^6.4.0",
     "@types/jest-specific-snapshot": "^0.5.9",
-    "@types/node": "^17.0.13",
+    "@types/node": "^18.19.59",
     "@types/prettier": "^2.4.3",
     "@types/webpack": "^5.28.0",
     "@typescript-eslint/eslint-plugin": "^5.55.0",

packages/esbuild-plugin-styled-components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@charcoal-ui/esbuild-plugin-styled-components",
-  "version": "4.0.0-beta.14",
+  "version": "4.0.0-beta.16",
   "private": true,
   "license": "Apache-2.0",
   "main": "src/index.ts",

packages/foundation/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@charcoal-ui/foundation",
-  "version": "4.0.0-beta.14",
+  "version": "4.0.0-beta.16",
   "license": "Apache-2.0",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",

packages/icon-files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@charcoal-ui/icon-files",
-  "version": "4.0.0-beta.14",
+  "version": "4.0.0-beta.16",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./src/index.cjs",

packages/icon-files/src/Inline/Back.js

@@ -0,0 +1,2 @@
+/** This file is auto generated. DO NOT EDIT BY HAND. */
+export default '<svg width="8" height="10" viewBox="0 0 8 10" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M5.957 1.957A1 1 0 004.543.543L.086 5l4.457 4.457a1 1 0 001.414-1.414L2.914 5l3.043-3.043z" fill="currentColor"/></svg>'

packages/icon-files/src/index.cjs

@@ -83,6 +83,7 @@ module.exports = {
   '24/Filter': () => import('./24/Filter.js').then(m => m.default),
   '24/Flare': () => import('./24/Flare.js').then(m => m.default),
   '24/FormatAlignCenter': () => import('./24/FormatAlignCenter.js').then(m => m.default),
+  '24/FormatAlignJustified': () => import('./24/FormatAlignJustified.js').then(m => m.default),
   '24/FormatAlignLeft': () => import('./24/FormatAlignLeft.js').then(m => m.default),
   '24/FormatAlignRight': () => import('./24/FormatAlignRight.js').then(m => m.default),
   '24/FormatColorFill': () => import('./24/FormatColorFill.js').then(m => m.default),
@@ -159,6 +160,7 @@ module.exports = {
   '24/ReadHorizontalLeft': () => import('./24/ReadHorizontalLeft.js').then(m => m.default),
   '24/ReadHorizontalRight': () => import('./24/ReadHorizontalRight.js').then(m => m.default),
   '24/ReadVertical': () => import('./24/ReadVertical.js').then(m => m.default),
+  '24/Redo': () => import('./24/Redo.js').then(m => m.default),
   '24/Reload': () => import('./24/Reload.js').then(m => m.default),
   '24/ReloadLoop': () => import('./24/ReloadLoop.js').then(m => m.default),
   '24/Reorder': () => import('./24/Reorder.js').then(m => m.default),
@@ -186,6 +188,7 @@ module.exports = {
   '24/Text': () => import('./24/Text.js').then(m => m.default),
   '24/Trash': () => import('./24/Trash.js').then(m => m.default),
   '24/TrashAlt': () => import('./24/TrashAlt.js').then(m => m.default),
+  '24/Undo': () => import('./24/Undo.js').then(m => m.default),
   '24/Up': () => import('./24/Up.js').then(m => m.default),
   '24/Upload': () => import('./24/Upload.js').then(m => m.default),
   '24/UploadAlt': () => import('./24/UploadAlt.js').then(m => m.default),
@@ -211,6 +214,7 @@ module.exports = {
   '32/Gift': () => import('./32/Gift.js').then(m => m.default),
   '32/Home': () => import('./32/Home.js').then(m => m.default),
   '32/HorizontalWriting': () => import('./32/HorizontalWriting.js').then(m => m.default),
+  '32/ImageHidden': () => import('./32/ImageHidden.js').then(m => m.default),
   '32/Index': () => import('./32/Index.js').then(m => m.default),
   '32/LikeOff': () => import('./32/LikeOff.js').then(m => m.default),
   '32/LikeOn': () => import('./32/LikeOn.js').then(m => m.default),
@@ -239,6 +243,7 @@ module.exports = {
   '32/VerticalWriting': () => import('./32/VerticalWriting.js').then(m => m.default),
   '32/ZoomIn': () => import('./32/ZoomIn.js').then(m => m.default),
   'Inline/Add': () => import('./Inline/Add.js').then(m => m.default),
+  'Inline/Back': () => import('./Inline/Back.js').then(m => m.default),
   'Inline/BookmarkOff': () => import('./Inline/BookmarkOff.js').then(m => m.default),
   'Inline/BookmarkOn': () => import('./Inline/BookmarkOn.js').then(m => m.default),
   'Inline/Breadcrumbs': () => import('./Inline/Breadcrumbs.js').then(m => m.default),
@@ -250,6 +255,7 @@ module.exports = {
   'Inline/Folder': () => import('./Inline/Folder.js').then(m => m.default),
   'Inline/ImageResponse': () => import('./Inline/ImageResponse.js').then(m => m.default),
   'Inline/Images': () => import('./Inline/Images.js').then(m => m.default),
+  'Inline/Latest': () => import('./Inline/Latest.js').then(m => m.default),
   'Inline/Like': () => import('./Inline/Like.js').then(m => m.default),
   'Inline/LikeOff': () => import('./Inline/LikeOff.js').then(m => m.default),
   'Inline/List': () => import('./Inline/List.js').then(m => m.default),

packages/icon-files/src/index.d.ts

@@ -83,6 +83,7 @@ declare var _default: {
   '24/Filter': () => Promise<string>;
   '24/Flare': () => Promise<string>;
   '24/FormatAlignCenter': () => Promise<string>;
+  '24/FormatAlignJustified': () => Promise<string>;
   '24/FormatAlignLeft': () => Promise<string>;
   '24/FormatAlignRight': () => Promise<string>;
   '24/FormatColorFill': () => Promise<string>;
@@ -159,6 +160,7 @@ declare var _default: {
   '24/ReadHorizontalLeft': () => Promise<string>;
   '24/ReadHorizontalRight': () => Promise<string>;
   '24/ReadVertical': () => Promise<string>;
+  '24/Redo': () => Promise<string>;
   '24/Reload': () => Promise<string>;
   '24/ReloadLoop': () => Promise<string>;
   '24/Reorder': () => Promise<string>;
@@ -186,6 +188,7 @@ declare var _default: {
   '24/Text': () => Promise<string>;
   '24/Trash': () => Promise<string>;
   '24/TrashAlt': () => Promise<string>;
+  '24/Undo': () => Promise<string>;
   '24/Up': () => Promise<string>;
   '24/Upload': () => Promise<string>;
   '24/UploadAlt': () => Promise<string>;
@@ -211,6 +214,7 @@ declare var _default: {
   '32/Gift': () => Promise<string>;
   '32/Home': () => Promise<string>;
   '32/HorizontalWriting': () => Promise<string>;
+  '32/ImageHidden': () => Promise<string>;
   '32/Index': () => Promise<string>;
   '32/LikeOff': () => Promise<string>;
   '32/LikeOn': () => Promise<string>;
@@ -239,6 +243,7 @@ declare var _default: {
   '32/VerticalWriting': () => Promise<string>;
   '32/ZoomIn': () => Promise<string>;
   'Inline/Add': () => Promise<string>;
+  'Inline/Back': () => Promise<string>;
   'Inline/BookmarkOff': () => Promise<string>;
   'Inline/BookmarkOn': () => Promise<string>;
   'Inline/Breadcrumbs': () => Promise<string>;
@@ -250,6 +255,7 @@ declare var _default: {
   'Inline/Folder': () => Promise<string>;
   'Inline/ImageResponse': () => Promise<string>;
   'Inline/Images': () => Promise<string>;
+  'Inline/Latest': () => Promise<string>;
   'Inline/Like': () => Promise<string>;
   'Inline/LikeOff': () => Promise<string>;
   'Inline/List': () => Promise<string>;

packages/icon-files/src/index.js

@@ -83,6 +83,7 @@ export default {
   '24/Filter': () => import('./24/Filter.js').then(m => m.default),
   '24/Flare': () => import('./24/Flare.js').then(m => m.default),
   '24/FormatAlignCenter': () => import('./24/FormatAlignCenter.js').then(m => m.default),
+  '24/FormatAlignJustified': () => import('./24/FormatAlignJustified.js').then(m => m.default),
   '24/FormatAlignLeft': () => import('./24/FormatAlignLeft.js').then(m => m.default),
   '24/FormatAlignRight': () => import('./24/FormatAlignRight.js').then(m => m.default),
   '24/FormatColorFill': () => import('./24/FormatColorFill.js').then(m => m.default),
@@ -159,6 +160,7 @@ export default {
   '24/ReadHorizontalLeft': () => import('./24/ReadHorizontalLeft.js').then(m => m.default),
   '24/ReadHorizontalRight': () => import('./24/ReadHorizontalRight.js').then(m => m.default),
   '24/ReadVertical': () => import('./24/ReadVertical.js').then(m => m.default),
+  '24/Redo': () => import('./24/Redo.js').then(m => m.default),
   '24/Reload': () => import('./24/Reload.js').then(m => m.default),
   '24/ReloadLoop': () => import('./24/ReloadLoop.js').then(m => m.default),
   '24/Reorder': () => import('./24/Reorder.js').then(m => m.default),
@@ -186,6 +188,7 @@ export default {
   '24/Text': () => import('./24/Text.js').then(m => m.default),
   '24/Trash': () => import('./24/Trash.js').then(m => m.default),
   '24/TrashAlt': () => import('./24/TrashAlt.js').then(m => m.default),
+  '24/Undo': () => import('./24/Undo.js').then(m => m.default),
   '24/Up': () => import('./24/Up.js').then(m => m.default),
   '24/Upload': () => import('./24/Upload.js').then(m => m.default),
   '24/UploadAlt': () => import('./24/UploadAlt.js').then(m => m.default),
@@ -211,6 +214,7 @@ export default {
   '32/Gift': () => import('./32/Gift.js').then(m => m.default),
   '32/Home': () => import('./32/Home.js').then(m => m.default),
   '32/HorizontalWriting': () => import('./32/HorizontalWriting.js').then(m => m.default),
+  '32/ImageHidden': () => import('./32/ImageHidden.js').then(m => m.default),
   '32/Index': () => import('./32/Index.js').then(m => m.default),
   '32/LikeOff': () => import('./32/LikeOff.js').then(m => m.default),
   '32/LikeOn': () => import('./32/LikeOn.js').then(m => m.default),
@@ -239,6 +243,7 @@ export default {
   '32/VerticalWriting': () => import('./32/VerticalWriting.js').then(m => m.default),
   '32/ZoomIn': () => import('./32/ZoomIn.js').then(m => m.default),
   'Inline/Add': () => import('./Inline/Add.js').then(m => m.default),
+  'Inline/Back': () => import('./Inline/Back.js').then(m => m.default),
   'Inline/BookmarkOff': () => import('./Inline/BookmarkOff.js').then(m => m.default),
   'Inline/BookmarkOn': () => import('./Inline/BookmarkOn.js').then(m => m.default),
   'Inline/Breadcrumbs': () => import('./Inline/Breadcrumbs.js').then(m => m.default),
@@ -250,6 +255,7 @@ export default {
   'Inline/Folder': () => import('./Inline/Folder.js').then(m => m.default),
   'Inline/ImageResponse': () => import('./Inline/ImageResponse.js').then(m => m.default),
   'Inline/Images': () => import('./Inline/Images.js').then(m => m.default),
+  'Inline/Latest': () => import('./Inline/Latest.js').then(m => m.default),
   'Inline/Like': () => import('./Inline/Like.js').then(m => m.default),
   'Inline/LikeOff': () => import('./Inline/LikeOff.js').then(m => m.default),
   'Inline/List': () => import('./Inline/List.js').then(m => m.default),

packages/icons-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@charcoal-ui/icons-cli",
-  "version": "4.0.0-beta.14",
+  "version": "4.0.0-beta.16",
   "license": "Apache-2.0",
   "bin": "./dist/index.js",
   "scripts": {

packages/icons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@charcoal-ui/icons",
-  "version": "4.0.0-beta.14",
+  "version": "4.0.0-beta.16",
   "license": "Apache-2.0",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",
@@ -36,8 +36,7 @@
     "vitest": "^2.0.1"
   },
   "dependencies": {
-    "@charcoal-ui/icon-files": "^4.0.0-beta.14",
-    "dompurify": "^2.3.6",
+    "@charcoal-ui/icon-files": "^4.0.0-beta.16",
     "warning": "^4.0.3"
   },
   "files": [