Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/kufu/smarthr-ui into fix-…
Browse files Browse the repository at this point in the history
…textarea-maxlength-to-limitlength
  • Loading branch information
AtsushiM committed May 6, 2024
2 parents ee5a6b9 + 48d50c0 commit f9f5dd2
Show file tree
Hide file tree
Showing 483 changed files with 2,019 additions and 1,360 deletions.
18 changes: 9 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,39 +37,39 @@ commands:
check-source:
steps:
- run: pnpm audit --prod
- run: pnpm lint
- run: pnpm ui lint
run-npm-test:
steps:
- run: pnpm test -- -w 1
- run: pnpm test:build-assets
- run: pnpm ui test -- -w 1
- run: pnpm ui test:build-assets
run-a11y-test:
steps:
- checkout
- restore_cache:
keys:
- pnpm-packages-reg-{{ checksum "pnpm-lock.yaml" }}
- run: pnpm install
- run: pnpm ui install
- save_cache:
paths:
- ~/.cache/pnpm
key: pnpm-packages-reg-{{ checksum "pnpm-lock.yaml" }}
- run:
command: pnpm build-storybook
command: pnpm ui build-storybook
- run:
command: npx http-server storybook-static --port 6006 --silent
command: pnpm dlx http-server ./packages/smarthr-ui/storybook-static --port 6006 --silent
background: true
- run:
command: pnpm test-storybook:ci
command: pnpm ui test-storybook:ci
- store_test_results:
path: junit.xml
run-chromatic:
steps:
- checkout
- run: pnpm run chromatic --project-token=${CHROMATIC_PROJECT_TOKEN} --exit-zero-on-changes --only-changed
- run: pnpm ui run chromatic --project-token=${CHROMATIC_PROJECT_TOKEN} --exit-zero-on-changes --only-changed
run-chromatic-master:
steps:
- checkout
- run: STORYBOOK_NODE_ENV="production" pnpm run chromatic --project-token=${CHROMATIC_PROJECT_TOKEN} --auto-accept-changes --only-changed
- run: STORYBOOK_NODE_ENV="production" pnpm ui run chromatic --project-token=${CHROMATIC_PROJECT_TOKEN} --auto-accept-changes --only-changed
install-noto-sans-cjk-jp:
steps:
- run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ jobs:
- name: run
run: |
pnpm install
pnpm e2e
pnpm ui e2e
env:
TESTCAFE_BROWSER: ${{ matrix.browser }}
10 changes: 5 additions & 5 deletions .github/workflows/publishRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,21 @@ jobs:
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config user.name "github-actions[bot]"
- run: pnpm install
- run: pnpm release
- run: pnpm ui release
if: ${{ env.IS_PRERELEASE == 'false' }}
- run: pnpm release --prerelease
- run: pnpm ui release --prerelease
if: ${{ env.IS_PRERELEASE == 'true' }}
- run: npm publish
- run: pnpm publish --filter smarthr-ui
if: ${{ env.IS_PRERELEASE == 'false' }}
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- run: npm publish --tag prerelease
- run: pnpm publish --filter smarthr-ui --tag prerelease
if: ${{ env.IS_PRERELEASE == 'true' }}
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- run: echo NEW_TAG=$(git describe) >> $GITHUB_ENV
- run: git push origin $NEW_TAG
- run: npx ts-node ./scripts/getLatestChangelog.ts > ${{ env.CHANGELOG_PATH }}
- run: npx ts-node ./packages/smarthr-ui/scripts/getLatestChangelog.ts > ${{ env.CHANGELOG_PATH }}
- name: create release on GitHub
uses: actions/create-release@v1
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/startRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ jobs:
- name: prepare release
if: ${{ env.NO_BRANCH_PREPARATION == 'false' }}
run: |
BASE_TAG=v$(npx -c 'echo "$npm_package_version"')
BASE_TAG=v$(cat ./packages/smarthr-ui/package.json | grep "\"version\"" | cut -d "\"" -f 4)
git checkout $BASE_TAG
git merge --no-edit ${{ github.ref }}
- run: pnpm install
- name: release dry run
if: ${{ env.IS_PRERELEASE == 'false' }}
run: pnpm release:dryrun > ${{ env.RESULT_PATH }}
run: pnpm ui release:dryrun > ${{ env.RESULT_PATH }}
- name: prerelease dry run
if: ${{ env.IS_PRERELEASE == 'true' }}
run: pnpm release:dryrun --prerelease > ${{ env.RESULT_PATH }}
run: pnpm ui release:dryrun --prerelease > ${{ env.RESULT_PATH }}
- name: wrap dry run log
run: |
echo "Dry Run Log:
Expand Down
176 changes: 7 additions & 169 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,201 +1,39 @@
{
"private": true,
"name": "smarthr-ui",
"description": "SmartHR ui components built with React.",
"version": "48.0.0",
"author": "SmartHR-UI Team",
"dependencies": {
"@smarthr/wareki": "^1.2.0",
"css-loader": "^7.1.1",
"dayjs": "^1.11.10",
"lodash.merge": "^4.6.2",
"lodash.range": "^3.2.0",
"polished": "^4.3.0",
"postcss-loader": "^8.1.1",
"react-draggable": "^4.4.6",
"react-icons": "^5.1.0",
"react-innertext": "^1.1.5",
"react-transition-group": "^4.4.5",
"style-loader": "^4.0.0",
"tailwind-variants": "^0.2.1",
"tailwindcss": "^3.4.3"
},
"devDependencies": {
"@babel/core": "^7.24.4",
"@babel/preset-env": "^7.24.4",
"@babel/preset-react": "^7.24.1",
"@babel/preset-typescript": "^7.24.1",
"@storybook/addon-a11y": "^8.0.8",
"@storybook/addon-actions": "^8.0.8",
"@storybook/addon-essentials": "^8.0.8",
"@storybook/addon-interactions": "^8.0.8",
"@storybook/addon-storysource": "^8.0.8",
"@commitlint/cli": "^19.2.2",
"@commitlint/config-conventional": "^19.2.2",
"@storybook/addon-styling": "^1.3.7",
"@storybook/addon-viewport": "^8.0.8",
"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
"@storybook/blocks": "^8.0.8",
"@storybook/cli": "^8.0.8",
"@storybook/manager-api": "^8.0.8",
"@storybook/react": "^8.0.8",
"@storybook/react-webpack5": "^8.0.8",
"@storybook/source-loader": "^8.0.8",
"@storybook/test": "^8.0.8",
"@storybook/addon-styling-webpack": "^1.0.0",
"@storybook/test-runner": "^0.17.0",
"@storybook/theming": "^8.0.8",
"@swc/core": "^1.4.16",
"@swc/jest": "^0.2.36",
"@testing-library/react": "^15.0.2",
"@types/jest": "^29.5.12",
"@types/lodash.merge": "^4.6.9",
"@types/lodash.range": "^3.2.9",
"@types/node": "^20.12.7",
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"@types/react-test-renderer": "^17.0.9",
"@types/react-transition-group": "^4.4.10",
"@types/styled-components": "^5.1.34",
"autoprefixer": "^10.4.19",
"axe-playwright": "^2.0.1",
"babel-loader": "^9.1.3",
"babel-plugin-polyfill-corejs2": "^0.4.11",
"babel-plugin-polyfill-regenerator": "^0.6.2",
"chromatic": "^11.3.0",
"ecma-version-validator-webpack-plugin": "^1.2.1",
"eslint": "^8.57.0",
"eslint-config-smarthr": "^6.28.0",
"eslint-plugin-storybook": "^0.8.0",
"fs-extra": "^11.2.0",
"glob": "10.3.12",
"http-server": "^14.1.1",
"husky": "^9.0.11",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-styled-components": "^7.2.0",
"lint-staged": "^15.2.2",
"memory-fs": "^0.5.0",
"npm-run-all": "^4.1.5",
"postcss": "^8.4.38",
"postcss-styled-syntax": "^0.6.4",
"postcss-syntax": "^0.36.2",
"prettier": "^3.2.5",
"prettier-config-smarthr": "^1.0.0",
"prettier-plugin-tailwindcss": "^0.5.14",
"puppeteer": "^22.6.5",
"react": "^18.2.0",
"react-docgen-typescript": "^2.2.2",
"react-dom": "^18.2.0",
"react-ga4": "^2.1.0",
"react-test-renderer": "^18.2.0",
"rimraf": "^5.0.5",
"standard-version": "^9.3.2",
"storybook": "^8.0.8",
"storybook-addon-pseudo-states": "^3.0.1",
"styled-components": "^5.3.11",
"stylelint": "^16.3.1",
"stylelint-config-prettier": "^9.0.5",
"stylelint-config-smarthr": "^3.0.0",
"stylelint-config-standard": "^36.0.0",
"stylelint-config-styled-components": "^0.1.1",
"testcafe": "3.5.0",
"ts-loader": "^9.5.1",
"ts-node": "^10.9.2",
"ttypescript": "^1.5.15",
"typescript": "^5.4.5",
"typescript-plugin-styled-components": "^3.0.0",
"wait-on": "^7.2.0",
"webpack": "^5.91.0"
},
"peerDependencies": {
"react": "16.13.0 || ^17.0.1 || ^18.0.0",
"react-dom": "16.13.0 || ^17.0.1 || ^18.0.0",
"styled-components": "^5.0.1"
},
"bugs": {
"url": "https://github.com/kufu/smarthr-ui/issues"
},
"files": [
"esm",
"lib",
"smarthr-ui.css"
],
"homepage": "https://github.com/kufu/smarthr-ui#readme",
"keywords": [
"react",
"react-component",
"smarthr",
"typescript"
],
"license": "MIT",
"lint-staged": {
"*.{ts,tsx}": [
"eslint --fix",
"prettier --write",
"stylelint --fix"
]
},
"main": "lib/index.js",
"module": "esm/index.js",
"publishConfig": {
"access": "public",
"registry": "https://registry.npmjs.org"
},
"repository": {
"type": "git",
"url": "git+https://github.com/kufu/smarthr-ui.git"
"typescript": "^5.4.5"
},
"scripts": {
"build": "run-p build:*",
"build:lib": "tsc -p tsconfig.build.json",
"build:esm": "tsc -p tsconfig.esm.build.json",
"build:css": "tailwindcss -i ./src/styles/index.css -o ./smarthr-ui.css",
"build-storybook": "storybook build --quiet",
"build-stylesheet": "ttsc -p tsconfig.stylesheet.json; node scripts/build-stylesheet.ts",
"clean": "rimraf ./lib ./esm ./smarthr-ui.css",
"format": "run-s -c format:*",
"format:eslint": "eslint --fix './**/*.ts{,x}'",
"format:prettier": "prettier --write './src/**/*.ts{,x}'",
"format:stylelint": "stylelint --fix './src/**/*.ts{,x}'",
"lint": "run-p lint:*",
"lint:eslint": "eslint './**/*.ts{,x}'",
"lint:prettier": "prettier --check './src/**/*.ts{,x}'",
"lint:style": "stylelint './**/*.ts{,x}'",
"lint:tsc": "tsc --noEmit",
"ui": "pnpm -F smarthr-ui",
"commitmsg": "commitlint -e $GIT_PARAMS",
"prepublishOnly": "run-s clean lint build",
"release": "standard-version -a",
"release:dryrun": "standard-version --dry-run",
"storybook": "storybook dev -p 6006",
"dev": "run-s storybook",
"test": "jest",
"test:update-snapshot": "jest --updateSnapshot",
"test:build-assets": "node scripts/build-test.ts",
"test-storybook:ci": "wait-on tcp:6006 && pnpm test-storybook --maxWorkers=2 --junit",
"testcafe": "testcafe",
"e2e": "ts-node scripts/e2e.ts",
"e2e:dev": "testcafe chrome --hostname localhost --skip-js-errors --live",
"prepare": "husky",
"chromatic": "chromatic",
"write:ui-props": "ts-node scripts/exportUIProps.ts",
"export:ui-props": "run-s build:lib write:ui-props"
"prepare": "husky"
},
"sideEffects": [
"*.css"
],
"typings": "lib/index.d.ts",
"pnpm": {
"overrides": {
"@babel/helper-compilation-targets": "^7.23.6",
"@types/react": "^18.2.55",
"@types/react": "^18.3.1",
"minimist": "1.2.8",
"react": "^18.2.0",
"react-dom": "^18.2.0"
}
},
"standard-version": {
"scripts": {
"prerelease": "run-s build:lib write:ui-props && git add public/exports/smarthr-ui-props.json"
"react": "^18.3.1",
"react-dom": "^18.3.1"
}
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
17 changes: 17 additions & 0 deletions CHANGELOG.md → packages/smarthr-ui/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,23 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [49.0.0](https://github.com/kufu/smarthr-ui/compare/v48.0.0...v49.0.0) (2024-04-30)


### ⚠ BREAKING CHANGES

* SectioningFragmentを削除する (#4605)

### Features

* FormDialogのonSubmitの第二引数にFormEventを渡すように修正 ([#4610](https://github.com/kufu/smarthr-ui/issues/4610)) ([05598f2](https://github.com/kufu/smarthr-ui/commit/05598f2df26f5676ccfb9d8242527f250059ca2a))
* SectioningFragmentを削除する ([#4605](https://github.com/kufu/smarthr-ui/issues/4605)) ([a3df056](https://github.com/kufu/smarthr-ui/commit/a3df056bbb5858a787869e527ee2081bc72e7305))


### Bug Fixes

* Next.js 環境で hydration error が発生する問題を修正 ([#4594](https://github.com/kufu/smarthr-ui/issues/4594)) ([9cf5329](https://github.com/kufu/smarthr-ui/commit/9cf532947527d27510117c04182362eadce6f148))

## [48.0.0](https://github.com/kufu/smarthr-ui/compare/v47.1.0...v48.0.0) (2024-04-23)


Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit f9f5dd2

Please sign in to comment.