Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use esm import as the default import way for fix use in Remix #520

Merged
merged 6 commits into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .changeset/rare-items-roll.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@ant-design/web3-assets': patch
'@ant-design/web3-common': patch
'@ant-design/web3-icons': patch
'@ant-design/web3-wagmi': patch
'@ant-design/web3': patch
---

fix: use esm import as the default import way for fix use in Remix and NextJS
2 changes: 2 additions & 0 deletions .fatherrc.base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,7 @@ export default defineConfig({
},
},
],
// Auto add .js extension for import in node environment when use with NextJS and Remix.
'babel-plugin-add-import-extension',
],
});
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@
"@vitest/coverage-v8": "^1.1.0",
"antd": "^5.13.2",
"antd-style": "^3.6.1",
"babel-plugin-add-import-extension": "^1.6.0",
"babel-plugin-inline-react-svg": "^2.0.2",
"classnames": "^2.3.2",
"dumi": "^2.2.16",
"eslint": "^8.56.0",
Expand Down
3 changes: 2 additions & 1 deletion packages/assets/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"name": "@ant-design/web3-assets",
"version": "1.2.1",
"main": "dist/lib/index.js",
"type": "module",
"main": "dist/esm/index.js",
"module": "dist/esm/index.js",
"typings": "dist/esm/index.d.ts",
"exports": {
Expand Down
6 changes: 4 additions & 2 deletions packages/common/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"name": "@ant-design/web3-common",
"version": "1.3.2",
"main": "dist/lib/index.js",
"type": "module",
"main": "dist/esm/index.js",
"module": "dist/esm/index.js",
"typings": "dist/esm/index.d.ts",
"exports": {
Expand Down Expand Up @@ -39,11 +40,12 @@
"build": "father build"
},
"dependencies": {
"lodash": "^4.17.21"
"lodash-es": "^4.17.21"
},
"devDependencies": {
"@types/react": "^18.2.45",
"@types/react-dom": "^18.2.18",
"@types/lodash-es": "^4.17.12",
"antd": "^5.12.4",
"father": "^4.3.8",
"react": "^18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/web3-config-provider/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useMemo } from 'react';
import { merge } from 'lodash';
import { merge } from 'lodash-es';

import defaultLocale from '../locale/default';
import { ConfigContext, type ConfigConsumerProps, type Web3ConfigProviderProps } from './context';
Expand Down
4 changes: 2 additions & 2 deletions packages/icons/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"name": "@ant-design/web3-icons",
"version": "1.3.1",
"main": "dist/lib/index.js",
"type": "module",
"main": "dist/esm/index.js",
"module": "dist/esm/index.js",
"typings": "dist/esm/index.d.ts",
"exports": {
Expand Down Expand Up @@ -42,7 +43,6 @@
"@types/react": "^18.2.45",
"@types/react-dom": "^18.2.18",
"antd": "^5.12.4",
"babel-plugin-inline-react-svg": "^2.0.2",
"father": "^4.3.8",
"glob": "^10.3.10",
"react": "^18.2.0",
Expand Down
3 changes: 2 additions & 1 deletion packages/wagmi/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"name": "@ant-design/web3-wagmi",
"version": "2.2.1",
"main": "dist/lib/index.js",
"type": "module",
"main": "dist/esm/index.js",
"module": "dist/esm/index.js",
"typings": "dist/esm/index.d.ts",
"exports": {
Expand Down
3 changes: 2 additions & 1 deletion packages/web3/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"name": "@ant-design/web3",
"version": "1.4.0",
"main": "dist/lib/index.js",
"type": "module",
"main": "dist/esm/index.js",
"module": "dist/esm/index.js",
"typings": "dist/esm/index.d.ts",
"exports": {
Expand Down
785 changes: 395 additions & 390 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

Loading