From e0fab2974f9f64f692e1b531ca1770378a56eefb Mon Sep 17 00:00:00 2001 From: TodorTotev <51530311+TodorTotev@users.noreply.github.com> Date: Sun, 31 May 2020 18:25:02 +0300 Subject: [PATCH 1/3] fix --- examples/with-ant-design/.babelrc | 4 +-- .../with-ant-design/components/DatePicker.js | 2 +- examples/with-ant-design/package.json | 25 +++++++++++-------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/examples/with-ant-design/.babelrc b/examples/with-ant-design/.babelrc index 26ea61afec0bc..c52d7ff775442 100644 --- a/examples/with-ant-design/.babelrc +++ b/examples/with-ant-design/.babelrc @@ -5,7 +5,7 @@ "import", { "libraryName": "antd", - "libraryDirectory": "es", + "libraryDirectory": "lib", "style": "index.css" } ], @@ -13,7 +13,7 @@ "import", { "libraryName": "@ant-design/icons", - "libraryDirectory": "es/icons", + "libraryDirectory": "lib/icons", "camel2DashComponentName": false }, "@ant-design/icons" diff --git a/examples/with-ant-design/components/DatePicker.js b/examples/with-ant-design/components/DatePicker.js index ebde969870d96..40353328c64ae 100644 --- a/examples/with-ant-design/components/DatePicker.js +++ b/examples/with-ant-design/components/DatePicker.js @@ -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) diff --git a/examples/with-ant-design/package.json b/examples/with-ant-design/package.json index 33d583c29d3f0..430c6098054d4 100755 --- a/examples/with-ant-design/package.json +++ b/examples/with-ant-design/package.json @@ -2,23 +2,28 @@ "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.2.5", "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", + "gray-matter": "4.0.2", + "next": "9.4.4", "postcss-preset-env": "^6.7.0", - "react": "16.13.1", - "react-dom": "16.13.1" + "raw-loader": "^4.0.1", + "react": "^16.13.1", + "react-dom": "^16.13.1", + "react-markdown": "4.3.1" }, - "license": "ISC" + "browser": { + "fs": false, + "path": false + } } From 2aed06807d3cf0b0983c13d6f69131084a542525 Mon Sep 17 00:00:00 2001 From: TodorTotev <51530311+TodorTotev@users.noreply.github.com> Date: Sun, 31 May 2020 18:27:18 +0300 Subject: [PATCH 2/3] remove redundant packages --- examples/with-ant-design/package.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/examples/with-ant-design/package.json b/examples/with-ant-design/package.json index 430c6098054d4..2c3ed1b53b094 100755 --- a/examples/with-ant-design/package.json +++ b/examples/with-ant-design/package.json @@ -9,18 +9,15 @@ "dependencies": { "@ant-design/icons": "4.2.1", "@next/bundle-analyzer": "^9.1.4", - "antd": "4.2.5", + "antd": "4.3.0", "babel-plugin-import": "1.13.0", "cross-env": "^7.0.2", "dayjs": "1.8.28", "esm": "^3.2.25", - "gray-matter": "4.0.2", "next": "9.4.4", "postcss-preset-env": "^6.7.0", - "raw-loader": "^4.0.1", "react": "^16.13.1", - "react-dom": "^16.13.1", - "react-markdown": "4.3.1" + "react-dom": "^16.13.1" }, "browser": { "fs": false, From d86a2e91373969bc481b00e713007a80980bc47d Mon Sep 17 00:00:00 2001 From: Luis Alvarez D Date: Mon, 1 Jun 2020 13:53:21 -0500 Subject: [PATCH 3/3] Update examples/with-ant-design/package.json --- examples/with-ant-design/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/with-ant-design/package.json b/examples/with-ant-design/package.json index 2c3ed1b53b094..795b2eb4eaf88 100755 --- a/examples/with-ant-design/package.json +++ b/examples/with-ant-design/package.json @@ -14,7 +14,7 @@ "cross-env": "^7.0.2", "dayjs": "1.8.28", "esm": "^3.2.25", - "next": "9.4.4", + "next": "latest", "postcss-preset-env": "^6.7.0", "react": "^16.13.1", "react-dom": "^16.13.1"