Skip to content

Commit

Permalink
Merge branch 'main' into feature-shanchuan-beta.9
Browse files Browse the repository at this point in the history
  • Loading branch information
shanchuan1 committed Feb 18, 2024
2 parents afa6781 + 62262c8 commit 65ddf7a
Show file tree
Hide file tree
Showing 15 changed files with 84 additions and 10 deletions.
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: "" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
10 changes: 7 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@
"release": "pnpm run release:prepare && changeset version && changeset publish",
"release:alpha": "pnpm run release:prepare && changeset version --snapshot alpha && changeset publish --tag alpha",
"release:beta": "pnpm run release:prepare && changeset version --snapshot beta && changeset publish --tag beta",
"ci": "npm run build && npm run lint && npm run test:ci",
"ci": "npm run build && npm run lint && npm run test:dist && npm run test:ci",
"test": "vitest",
"test:dist": "cross-env LIB_DIR=dist vitest",
"test:update": "vitest -u",
"test:coverage": "vitest --coverage",
"test:ci": "vitest --coverage",
"test:ci": "cross-env LIB_DIR=normal vitest --coverage",
"lint": "pnpm run \"/^lint:.+/\"",
"lint:eslint": "eslint --ext .ts,.tsx .",
"eslint": "eslint . --fix",
Expand Down Expand Up @@ -97,5 +98,8 @@
"engines": {
"node": ">=18"
},
"repository": "https://github.com/ant-design/ant-design-web3.git"
"repository": "https://github.com/ant-design/ant-design-web3.git",
"dependencies": {
"cross-env": "^7.0.3"
}
}
7 changes: 7 additions & 0 deletions packages/assets/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @ant-design/web3-assets

## 1.2.3

### Patch Changes

- Updated dependencies [dead69b]
- @ant-design/web3-common@1.4.0

## 1.2.2

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/assets/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ant-design/web3-assets",
"version": "1.2.2",
"version": "1.2.3",
"type": "module",
"main": "dist/esm/index.js",
"module": "dist/esm/index.js",
Expand Down
6 changes: 6 additions & 0 deletions packages/common/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @ant-design/web3-common

## 1.4.0

### Minor Changes

- dead69b: fix:connect-button warning

## 1.3.3

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ant-design/web3-common",
"version": "1.3.3",
"version": "1.4.0",
"type": "module",
"main": "dist/esm/index.js",
"module": "dist/esm/index.js",
Expand Down
1 change: 1 addition & 0 deletions packages/common/src/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ export * from './request';
export * from './format';
export * from './test-utils';
export * from './createGetBrowserLink';
export * from './warning';
8 changes: 8 additions & 0 deletions packages/wagmi/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @ant-design/web3-wagmi

## 2.2.3

### Patch Changes

- Updated dependencies [dead69b]
- @ant-design/web3-common@1.4.0
- @ant-design/web3-assets@1.2.3

## 2.2.2

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/wagmi/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ant-design/web3-wagmi",
"version": "2.2.2",
"version": "2.2.3",
"type": "module",
"main": "dist/esm/index.js",
"module": "dist/esm/index.js",
Expand Down
15 changes: 15 additions & 0 deletions packages/web3/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# @ant-design/web3

## 1.6.0

### Minor Changes

- dc8f442: fix: devUseWarning reference path

## 1.5.1

### Patch Changes

- b379585: fix: connect-button cannot find warning utils
- Updated dependencies [dead69b]
- @ant-design/web3-common@1.4.0
- @ant-design/web3-assets@1.2.3

## 1.5.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/web3/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ant-design/web3",
"version": "1.5.0",
"version": "1.6.0",
"type": "module",
"main": "dist/esm/index.js",
"module": "dist/esm/index.js",
Expand Down
4 changes: 3 additions & 1 deletion packages/web3/src/connect-button/__tests__/tooltip.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ import { mockClipboard } from '../../utils/test-utils';
describe('ConnectButton', () => {
let resetMockClipboard: () => void;
beforeEach(() => {
vi.useFakeTimers();
resetMockClipboard = mockClipboard();
});
afterEach(() => {
vi.useRealTimers();
resetMockClipboard();
});

Expand All @@ -29,7 +31,7 @@ describe('ConnectButton', () => {
rerender(<App />);
// When the tooltip's title is string, baseElement.outerHTML does not contain '.ant-tooltip'.
// mouseEnterDelay defaults is 0.1s and waitFakeTimer is required.
await new Promise((resolve) => setTimeout(resolve, 100));
await vi.runAllTimersAsync();
expect(baseElement.querySelector('.ant-tooltip')).not.toBeNull();
});
it('when mergedTitle does not exist, ant-tooltip toBeNull', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/web3/src/connect-modal/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import { devUseWarning } from '@ant-design/web3-common';
import { ConfigProvider, Modal } from 'antd';
import classNames from 'classnames';

import { devUseWarning } from '../../../common/src/utils/warning';
import ModalPanel from './components/ModalPanel';
import useMode from './hooks/useMode';
import type { ConnectModalProps } from './interface';
Expand Down
12 changes: 12 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion vitest.config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ const resolve = (src: string) => {
return path.resolve(__dirname, src);
};

const isDist = process.env.LIB_DIR === 'dist';

export default defineConfig({
plugins: [
svgr({
Expand All @@ -16,7 +18,13 @@ export default defineConfig({
}),
],
resolve: {
alias: {
alias: isDist? {
'@ant-design/web3': resolve('./packages/web3/dist/esm/index'),
'@ant-design/web3-icons': resolve('./packages/icons/dist/esm/index'),
'@ant-design/web3-assets': resolve('./packages/assets/dist/esm/index'),
'@ant-design/web3-wagmi': resolve('./packages/wagmi/dist/esm/index'),
'@ant-design/web3-common': resolve('./packages/common/dist/esm/index'),
} : {
'@ant-design/web3': resolve('./packages/web3/src/index'),
'@ant-design/web3-icons': resolve('./packages/icons/src/index'),
'@ant-design/web3-assets': resolve('./packages/assets/src/index'),
Expand Down

0 comments on commit 65ddf7a

Please sign in to comment.