From 6570ab3a7003a13309e56b15965877ccb7e0ccf6 Mon Sep 17 00:00:00 2001 From: yoyo837 Date: Mon, 29 Sep 2025 10:30:25 +0800 Subject: [PATCH 1/6] chore: package namespace --- .dumirc.ts | 6 +++--- README.md | 18 +++++++++--------- docs/index.md | 2 +- examples/fill-width.tsx | 2 +- now.json | 11 ----------- package.json | 19 +++++++++---------- src/Item.tsx | 2 +- src/Overflow.tsx | 4 ++-- src/hooks/channelUpdate.ts | 2 +- src/hooks/useEffectState.tsx | 2 +- tests/github.spec.tsx | 4 ++-- tsconfig.json | 2 +- 12 files changed, 31 insertions(+), 43 deletions(-) delete mode 100644 now.json diff --git a/.dumirc.ts b/.dumirc.ts index b7bb3f8..c95d79d 100644 --- a/.dumirc.ts +++ b/.dumirc.ts @@ -4,13 +4,13 @@ const isGitPagesSite = process.env.GITHUB_ACTIONS; export default defineConfig({ favicons: ['https://avatars0.githubusercontent.com/u/9441414?s=200&v=4'], themeConfig: { - name: 'rc-overflow', + name: '@rc-component/overflow', logo: 'https://avatars0.githubusercontent.com/u/9441414?s=200&v=4', }, exportStatic: {}, outputPath: 'docs-dist', - base: isGitPagesSite ? `/rc-overflow/` : `/`, - publicPath: isGitPagesSite ? `/rc-overflow/` : `/`, + base: isGitPagesSite ? `/@rc-component/overflow/` : `/`, + publicPath: isGitPagesSite ? `/@rc-component/overflow/` : `/`, styles: [ ` .markdown table { diff --git a/README.md b/README.md index f4e1ebc..1354af2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# rc-overflow 🐾 +# @rc-component/overflow 🐾 [![NPM version][npm-image]][npm-url] [![npm download][download-image]][download-url] @@ -7,8 +7,8 @@ [![bundle size][bundlephobia-image]][bundlephobia-url] [![dumi][dumi-image]][dumi-url] -[npm-image]: http://img.shields.io/npm/v/rc-overflow.svg?style=flat-square -[npm-url]: http://npmjs.org/package/rc-overflow +[npm-image]: http://img.shields.io/npm/v/@rc-component/overflow.svg?style=flat-square +[npm-url]: http://npmjs.org/package/@rc-component/overflow [github-actions-image]: https://github.com/react-component/overflow/workflows/CI/badge.svg [github-actions-url]: https://github.com/react-component/overflow/actions [codecov-image]: https://img.shields.io/codecov/c/github/react-component/overflow/master.svg?style=flat-square @@ -17,10 +17,10 @@ [david-image]: https://david-dm.org/react-component/overflow/status.svg?style=flat-square [david-dev-url]: https://david-dm.org/react-component/overflow?type=dev [david-dev-image]: https://david-dm.org/react-component/overflow/dev-status.svg?style=flat-square -[download-image]: https://img.shields.io/npm/dm/rc-overflow.svg?style=flat-square -[download-url]: https://npmjs.org/package/rc-overflow -[bundlephobia-url]: https://bundlephobia.com/result?p=rc-overflow -[bundlephobia-image]: https://badgen.net/bundlephobia/minzip/rc-overflow +[download-image]: https://img.shields.io/npm/dm/@rc-component/overflow.svg?style=flat-square +[download-url]: https://npmjs.org/package/@rc-component/overflow +[bundlephobia-url]: https://bundlephobia.com/result?p=@rc-component/overflow +[bundlephobia-image]: https://badgen.net/bundlephobia/minzip/@rc-component/overflow [dumi-url]: https://github.com/umijs/dumi [dumi-image]: https://img.shields.io/badge/docs%20by-dumi-blue?style=flat-square @@ -32,7 +32,7 @@ https://overflow-react-component.vercel.app/ ## Install -[![rc-overflow](https://nodei.co/npm/rc-overflow.png)](https://npmjs.org/package/rc-overflow) +[![@rc-component/overflow](https://nodei.co/npm/@rc-component/overflow.png)](https://npmjs.org/package/@rc-component/overflow) ## Usage @@ -54,4 +54,4 @@ npm start ## License -rc-overflow is released under the MIT license. +@rc-component/overflow is released under the MIT license. diff --git a/docs/index.md b/docs/index.md index 9bb192a..60fe8f2 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,6 +1,6 @@ --- hero: - title: rc-overflow + title: @rc-component/overflow description: React Overflow Component --- diff --git a/examples/fill-width.tsx b/examples/fill-width.tsx index 5dd6407..e433bf1 100644 --- a/examples/fill-width.tsx +++ b/examples/fill-width.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import useLayoutEffect from "rc-util/lib/hooks/useLayoutEffect"; +import useLayoutEffect from "@rc-component/util/lib/hooks/useLayoutEffect"; import Overflow from '../src'; import '../assets/index.less'; import './common.less'; diff --git a/now.json b/now.json deleted file mode 100644 index 7b2f649..0000000 --- a/now.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "version": 2, - "name": "rc-overflow", - "builds": [ - { - "src": "package.json", - "use": "@vercel/static-build", - "config": { "distDir": "docs-dist" } - } - ] -} \ No newline at end of file diff --git a/package.json b/package.json index 8e5706c..7e746d6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "rc-overflow", - "version": "1.4.1", + "name": "@rc-component/overflow", + "version": "1.0.0", "description": "Auto collapse box when overflow", "keywords": [ "react", @@ -38,19 +38,19 @@ "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"", "test": "rc-test", "test:coverage": "rc-test --coverage", - "prepublishOnly": "npm run compile && np --no-cleanup --yolo --no-publish", + "prepublishOnly": "npm run compile && rc-np", "lint": "eslint src/ --ext .tsx,.ts", "lint:tsc": "tsc -p tsconfig.json --noEmit", "now-build": "npm run docs:build" }, "dependencies": { - "@babel/runtime": "^7.11.1", "classnames": "^2.2.1", - "rc-resize-observer": "^1.0.0", - "rc-util": "^5.37.0" + "@rc-component/resize-observer": "^1.0.0", + "@rc-component/util": "^1.3.0" }, "devDependencies": { - "@rc-component/father-plugin": "^1.0.0", + "@rc-component/father-plugin": "^2.0.2", + "@rc-component/np": "^1.0.4", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^12.0.0", "@types/classnames": "^2.2.9", @@ -68,7 +68,6 @@ "eslint": "^7.0.0", "father": "^4.0.0", "less": "^3.10.3", - "np": "^7.0.0", "prettier": "^2.0.5", "rc-test": "^7.0", "react": "^16.0.0", @@ -77,8 +76,8 @@ "typescript": "^5.0.0" }, "peerDependencies": { - "react": ">=16.9.0", - "react-dom": ">=16.9.0" + "react": ">=18.0.0", + "react-dom": ">=18.0.0" }, "overrides": { "cheerio": "1.0.0-rc.12" diff --git a/src/Item.tsx b/src/Item.tsx index fe3ca1f..8309c21 100644 --- a/src/Item.tsx +++ b/src/Item.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import classNames from 'classnames'; -import ResizeObserver from 'rc-resize-observer'; +import ResizeObserver from '@rc-component/resize-observer'; import type { ComponentType } from './RawItem'; // Use shared variable to save bundle size diff --git a/src/Overflow.tsx b/src/Overflow.tsx index e173111..9407eb3 100644 --- a/src/Overflow.tsx +++ b/src/Overflow.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { useState, useMemo, useCallback } from 'react'; import classNames from 'classnames'; -import ResizeObserver from 'rc-resize-observer'; -import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect'; +import ResizeObserver from '@rc-component/resize-observer'; +import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect'; import Item from './Item'; import useEffectState, { useBatcher } from './hooks/useEffectState'; import type { ComponentType } from './RawItem'; diff --git a/src/hooks/channelUpdate.ts b/src/hooks/channelUpdate.ts index fabb27a..4422798 100644 --- a/src/hooks/channelUpdate.ts +++ b/src/hooks/channelUpdate.ts @@ -1,4 +1,4 @@ -import raf from 'rc-util/lib/raf'; +import raf from '@rc-component/util/lib/raf'; export default function channelUpdate(callback: VoidFunction) { if (typeof MessageChannel === 'undefined') { diff --git a/src/hooks/useEffectState.tsx b/src/hooks/useEffectState.tsx index 02833f2..1d4dd97 100644 --- a/src/hooks/useEffectState.tsx +++ b/src/hooks/useEffectState.tsx @@ -1,4 +1,4 @@ -import useEvent from 'rc-util/lib/hooks/useEvent'; +import useEvent from '@rc-component/util/lib/hooks/useEvent'; import * as React from 'react'; import { unstable_batchedUpdates } from 'react-dom'; import channelUpdate from './channelUpdate'; diff --git a/tests/github.spec.tsx b/tests/github.spec.tsx index 05b21f4..c709b2b 100644 --- a/tests/github.spec.tsx +++ b/tests/github.spec.tsx @@ -1,9 +1,9 @@ import React from 'react'; import { render, act } from '@testing-library/react'; -import { spyElementPrototypes } from 'rc-util/lib/test/domHook'; +import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook'; import Overflow from '../src'; -import { _rs as onResize } from 'rc-resize-observer/lib/utils/observerUtil'; +import { _rs as onResize } from '@rc-component/resize-observer/lib/utils/observerUtil'; interface ItemType { label: React.ReactNode; diff --git a/tsconfig.json b/tsconfig.json index 168ea06..4949a5c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,7 +10,7 @@ "paths": { "@/*": ["src/*"], "@@/*": [".dumi/tmp/*"], - "rc-overflow": ["src/index.tsx"] + "@rc-component/overflow": ["src/index.tsx"] } } } \ No newline at end of file From f9c979de484bdb05856e0e50ec9281ae6b2729f2 Mon Sep 17 00:00:00 2001 From: yoyo837 Date: Mon, 29 Sep 2025 10:33:17 +0800 Subject: [PATCH 2/6] actions/cache@v4 --- .github/workflows/main.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b0a4263..193705e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ jobs: node-version: '18' - name: cache package-lock.json - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: package-temp-dir key: lock-${{ github.sha }} @@ -35,7 +35,7 @@ jobs: - name: cache node_modules id: node_modules_cache_id - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: node_modules key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} @@ -51,13 +51,13 @@ jobs: uses: actions/checkout@master - name: restore cache from package-lock.json - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: package-temp-dir key: lock-${{ github.sha }} - name: restore cache from node_modules - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: node_modules key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} @@ -74,13 +74,13 @@ jobs: uses: actions/checkout@master - name: restore cache from package-lock.json - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: package-temp-dir key: lock-${{ github.sha }} - name: restore cache from node_modules - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: node_modules key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} @@ -97,13 +97,13 @@ jobs: uses: actions/checkout@master - name: restore cache from package-lock.json - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: package-temp-dir key: lock-${{ github.sha }} - name: restore cache from node_modules - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: node_modules key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} From 56e055ab9b46d42ccd7cd675cccfca6639a9d1e8 Mon Sep 17 00:00:00 2001 From: yoyo837 Date: Mon, 29 Sep 2025 10:35:00 +0800 Subject: [PATCH 3/6] update --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7e746d6..1b3f45a 100644 --- a/package.json +++ b/package.json @@ -70,8 +70,8 @@ "less": "^3.10.3", "prettier": "^2.0.5", "rc-test": "^7.0", - "react": "^16.0.0", - "react-dom": "^16.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0", "regenerator-runtime": "^0.13.7", "typescript": "^5.0.0" }, From 459ed9c4a0f345c5b3d0daf72492130a4a48b142 Mon Sep 17 00:00:00 2001 From: yoyo837 Date: Mon, 29 Sep 2025 10:35:47 +0800 Subject: [PATCH 4/6] type --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1b3f45a..6887b72 100644 --- a/package.json +++ b/package.json @@ -56,8 +56,8 @@ "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.8", "@types/jest": "^26.0.23", - "@types/react": "^16.14.2", - "@types/react-dom": "^16.9.10", + "@types/react": "^18.0.0", + "@types/react-dom": "^18.0.0", "@umijs/fabric": "^3.0.0", "glob": "^10.0.0", "cross-env": "^7.0.2", From 9e6e7828be6a6c68567e1b8ddaf6d6d74da00e87 Mon Sep 17 00:00:00 2001 From: yoyo837 Date: Mon, 29 Sep 2025 10:37:07 +0800 Subject: [PATCH 5/6] clean --- package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/package.json b/package.json index 6887b72..32f9a52 100644 --- a/package.json +++ b/package.json @@ -51,8 +51,6 @@ "devDependencies": { "@rc-component/father-plugin": "^2.0.2", "@rc-component/np": "^1.0.4", - "@testing-library/jest-dom": "^5.16.4", - "@testing-library/react": "^12.0.0", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.8", "@types/jest": "^26.0.23", From 7fd718db8a021fb24d89e28dbbc6eb5741148a2f Mon Sep 17 00:00:00 2001 From: yoyo837 Date: Mon, 29 Sep 2025 10:39:33 +0800 Subject: [PATCH 6/6] clean --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 32f9a52..8672b09 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,6 @@ "cross-env": "^7.0.2", "dumi": "^2.0.0", "enzyme": "^3.0.0", - "enzyme-adapter-react-16": "^1.0.1", "enzyme-to-json": "^3.4.0", "eslint": "^7.0.0", "father": "^4.0.0",