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.

Sign up for GitHub

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 with antd ssg #13611

Merged
merged 4 commits into from
Jun 1, 2020
Merged

Fix with antd ssg #13611

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0fab29
fix
todortotev May 31, 2020
2aed068
remove redundant packages
todortotev May 31, 2020
d86a2e9
Update examples/with-ant-design/package.json
lfades Jun 1, 2020
4c5a8f1
Merge branch 'canary' into fix-with-antd-ssg
kodiakhq[bot] Jun 1, 2020
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
4 changes: 2 additions & 2 deletions examples/with-ant-design/.babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
"import",
{
"libraryName": "antd",
"libraryDirectory": "es",
"libraryDirectory": "lib",
"style": "index.css"
}
],
[
"import",
{
"libraryName": "@ant-design/icons",
"libraryDirectory": "es/icons",
"libraryDirectory": "lib/icons",
"camel2DashComponentName": false
},
"@ant-design/icons"
Expand Down
2 changes: 1 addition & 1 deletion examples/with-ant-design/components/DatePicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* webpack plugin fixes that bug.
*/
import dayjsGenerateConfig from 'rc-picker/lib/generate/dayjs'
import generatePicker from 'antd/es/date-picker/generatePicker'
import generatePicker from 'antd/lib/date-picker/generatePicker'

const DatePicker = generatePicker(dayjsGenerateConfig)

Expand Down
22 changes: 12 additions & 10 deletions examples/with-ant-design/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,25 @@
"name": "with-ant-design",
"version": "1.0.0",
"scripts": {
"dev": "cross-env NODE_OPTIONS=\"-r esm\" next",
"build": "cross-env NODE_OPTIONS=\"-r esm\" next build",
"analyze": "cross-env-shell NODE_OPTIONS=\"-r esm\" ANALYZE=true next build",
"dev": "next",
"build": "next build",
"start": "next start"
},
"dependencies": {
"@ant-design/icons": "^4.0.6",
"@ant-design/icons": "4.2.1",
"@next/bundle-analyzer": "^9.1.4",
"antd": "4.1.2",
"antd": "4.3.0",
"babel-plugin-import": "1.13.0",
"cross-env": "^7.0.2",
"dayjs": "1.8.24",
"dayjs": "1.8.28",
"esm": "^3.2.25",
"next": "9.3.4",
"next": "9.4.4",
lfades marked this conversation as resolved.
Show resolved Hide resolved
"postcss-preset-env": "^6.7.0",
"react": "16.13.1",
"react-dom": "16.13.1"
"react": "^16.13.1",
"react-dom": "^16.13.1"
},
"license": "ISC"
"browser": {
"fs": false,
"path": false
}
Comment on lines +22 to +25
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this for?

Copy link

@webbertakken webbertakken Jun 1, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shameless copy paste from my repo lol. This is not actually needed for the example.

}