Skip to content

Commit 7227ff6

Browse files
rvsiarvsia
authored
Merge pull request #1127 from rvsia/bigDepCleanup
Big deps cleanup
2 parents b0427f2 + b68e8f3 commit 7227ff6

File tree

35 files changed

+7811
-9035
lines changed

35 files changed

+7811
-9035
lines changed

‎babel.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ module.exports = {
1111
plugins: [
1212
"@babel/plugin-transform-runtime",
1313
"@babel/plugin-syntax-dynamic-import",
14-
"lodash",
1514
"@babel/plugin-proposal-class-properties",
1615
[
1716
'transform-imports',

‎package.json

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"private": true,
1111
"scripts": {
1212
"bootstrap": "lerna bootstrap",
13-
"build": "yarn clean-build && lerna run build --concurrency 1 --ignore @data-driven-forms/react-renderer-demo",
13+
"build": "yarn clean-build && lerna run build --concurrency 1 --ignore @data-driven-forms/react-renderer-demo --ignore @data-driven-forms/parsers",
1414
"vendor": "lerna run vendor",
1515
"test": "jest --coverage",
1616
"test:ci": "jest --coverage --runInBand",
@@ -28,6 +28,7 @@
2828
"packages/**"
2929
],
3030
"jest": {
31+
"testEnvironment": "jsdom",
3132
"verbose": true,
3233
"testPathIgnorePatterns": [
3334
"/node_modules/"
@@ -55,13 +56,35 @@
5556
"globalSetup": "<rootDir>/config/globalSetup.js"
5657
},
5758
"devDependencies": {
58-
"@babel/eslint-parser": "^7.13.8",
59-
"@babel/plugin-transform-runtime": "^7.13.9",
60-
"@babel/preset-typescript": "^7.13.0",
59+
"@babel/core": "^7.15.5",
60+
"@babel/plugin-proposal-class-properties": "^7.14.5",
61+
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
62+
"@babel/preset-env": "^7.15.6",
63+
"@babel/preset-react": "^7.13.5",
64+
"babel-eslint": "^10.1.0",
65+
"babel-jest": "^27.2.0",
66+
"babel-loader": "^8.2.2",
67+
"css-loader": "^6.2.0",
68+
"html-webpack-plugin": "^5.3.2",
69+
"regenerator-runtime": "^0.13.9",
70+
"sass-loader": "^12.1.0",
71+
"style-loader": "^3.2.1",
72+
"webpack": "^5.52.1",
73+
"webpack-cli": "^4.8.0",
74+
"webpack-dev-server": "^4.2.1",
75+
"prop-types": "^15.6.2",
76+
"react": "^17.0.2",
77+
"react-dom": "^17.0.2",
78+
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.3",
79+
"enzyme": "^3.11.0",
80+
"enzyme-to-json": "^3.6.2",
81+
"@babel/eslint-parser": "^7.14.4",
82+
"@babel/plugin-transform-runtime": "^7.15.0",
83+
"@babel/preset-typescript": "^7.15.0",
84+
"node-sass": "^6.0.1",
6185
"@khala/commit-analyzer-wildcard": "^2.5.2",
6286
"@khala/npm-release-monorepo": "^2.5.2",
6387
"@khala/wildcard-release-notes": "^2.5.2",
64-
"@rollup/plugin-typescript": "^4.1.2",
6588
"@semantic-release/git": "^8.0.0",
6689
"@semantic-release/github": "^5.5.5",
6790
"@semantic-release/npm": "^5.1.4",
@@ -86,13 +109,12 @@
86109
"glob": "^7.1.6",
87110
"identity-obj-proxy": "^3.0.0",
88111
"inquirer": "^7.1.0",
89-
"jest": "^24.8.0",
112+
"jest": "^27.2.0",
90113
"lerna": "^3.13.1",
91114
"ncp": "^2.0.0",
92115
"prettier": "^1.19.1",
93116
"replace-in-file": "^6.0.0",
94117
"semantic-release": "^17.2.3",
95-
"source-map-loader": "^0.2.4",
96118
"strip-ansi": "^6.0.0",
97119
"terser-webpack-plugin": "^1.3.0",
98120
"ts-loader": "^7.0.5",

‎packages/ant-component-mapper/config/webpack.config.js

Lines changed: 24 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,43 @@
1-
const TerserPlugin = require('terser-webpack-plugin');
21
const HtmlWebPackPlugin = require('html-webpack-plugin');
3-
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
42
const resolve = require('path').resolve;
5-
const merge = require('webpack-merge');
6-
7-
const commonConfig = {
8-
module: {
9-
rules: [{
10-
test: /\.(js|jsx)$/,
11-
exclude: /node_modules/,
12-
use: {
13-
loader: 'babel-loader',
14-
},
15-
}, {
16-
test: /\.(sa|sc|c)ss$/,
17-
use: [ 'style-loader', 'css-loader', 'sass-loader', 'resolve-url-loader' ],
18-
}, {
19-
test: /\.(png|jpg|gif|svg|woff|ttf|eot)/,
20-
loader: 'url-loader',
21-
},
22-
],
23-
},
24-
};
3+
const webpack = require('webpack');
254

265
const htmlPlugin = new HtmlWebPackPlugin({
276
template: './demo/index.html',
28-
filename: './index.html',
7+
filename: './index.html'
298
});
309

3110
const devConfig = {
3211
mode: 'development',
33-
entry: './demo/index.js',
12+
entry: { app: resolve('./demo/index.js') },
3413
output: {
3514
path: resolve('../dist'),
36-
filename: '[name].[hash].js',
37-
},
38-
devtool: 'source-map',
39-
plugins: [ htmlPlugin ],
40-
};
41-
42-
const externals = [{
43-
react: {
44-
root: 'React',
45-
commonjs2: 'react',
46-
commonjs: [ 'react' ],
47-
amd: 'react',
48-
},
49-
},
50-
/@material-ui\/core\/.*/,
51-
];
52-
53-
const prodConfig = {
54-
mode: 'production',
55-
entry: './src/index.js',
56-
output: {
57-
path: resolve('./dist'),
58-
library: '[name]',
59-
libraryTarget: 'umd',
60-
filename: 'index.js',
61-
},
62-
optimization: {
63-
minimizer: [
64-
new TerserPlugin({
65-
cache: true,
66-
parallel: true,
67-
terserOptions: {
68-
keep_classnames: true,
69-
keep_fnames: true,
70-
},
71-
}),
72-
],
73-
},
74-
externals,
75-
};
76-
77-
const vendorConfig = {
78-
mode: 'production',
79-
entry: './src/vendor.js',
80-
output: {
81-
path: resolve('./vendor'),
82-
filename: 'vendor.js',
15+
filename: '[name].[hash].js'
8316
},
17+
devtool: 'eval-source-map',
18+
plugins: [
19+
htmlPlugin,
20+
new webpack.ProvidePlugin({
21+
process: 'process/browser'
22+
})
23+
],
8424
module: {
8525
rules: [
26+
{
27+
test: /\.js$/,
28+
exclude: /(node_modules)/i,
29+
use: ['babel-loader']
30+
},
8631
{
8732
test: /\.(sa|sc|c)ss$/,
88-
use: [ MiniCssExtractPlugin.loader, 'css-loader', 'sass-loader', 'resolve-url-loader' ],
89-
}, {
90-
test: /\.(png|jpg|gif|svg|woff|ttf|eot)/,
91-
loader: 'url-loader',
33+
use: ['style-loader', 'css-loader', 'sass-loader']
9234
},
93-
],
94-
},
95-
plugins: [ new MiniCssExtractPlugin({ filename: 'vendor.css' }) ],
35+
{
36+
test: /\.(png|jpg|gif|svg|woff|ttf|eot)/,
37+
type: 'asset/resource'
38+
}
39+
]
40+
}
9641
};
9742

98-
module.exports = prodConfig;
99-
100-
module.exports = env => ({
101-
dev: merge(commonConfig, devConfig),
102-
prod: merge(commonConfig, prodConfig),
103-
vendor: vendorConfig,
104-
})[env];
105-
43+
module.exports = devConfig;

‎packages/ant-component-mapper/package.json

Lines changed: 3 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"typings": "index.d.ts",
88
"license": "Apache-2.0",
99
"scripts": {
10-
"start": "webpack-dev-server --env dev --config ./config/webpack.config.js --open --hot",
10+
"start": "webpack-dev-server --config ./config/webpack.config.js --open --hot",
1111
"build": "yarn build:cjs && yarn build:esm && yarn build:typings && yarn build:packages && yarn build:css",
1212
"build:cjs": "BABEL_ENV=cjs babel src --out-dir ./ --ignore \"src/tests/*\"",
1313
"build:esm": "BABEL_ENV=esm babel src --out-dir ./esm --ignore \"src/tests/*\"",
@@ -26,48 +26,7 @@
2626
"directory": "packages/ant-component-mapper"
2727
},
2828
"devDependencies": {
29-
"@babel/core": "^7.1.6",
30-
"@babel/plugin-proposal-class-properties": "^7.2.3",
31-
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
32-
"@babel/preset-env": "^7.1.6",
33-
"@babel/preset-react": "^7.0.0",
34-
"@data-driven-forms/react-form-renderer": "*",
35-
"@semantic-release/git": "^7.0.5",
36-
"@semantic-release/npm": "^5.1.1",
37-
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.3",
38-
"antd": "^4.2.0",
39-
"babel-core": "^7.0.0-bridge.0",
40-
"babel-eslint": "9.x",
41-
"babel-jest": "^23.6.0",
42-
"babel-loader": "^8.0.4",
43-
"babel-plugin-lodash": "^3.3.4",
44-
"css-loader": "^1.0.1",
45-
"enzyme": "^3.7.0",
46-
"enzyme-to-json": "^3.3.4",
47-
"glob": "^7.1.6",
48-
"html-webpack-plugin": "^3.2.0",
49-
"mini-css-extract-plugin": "^0.4.4",
50-
"node-sass": "^4.10.0",
51-
"prop-types": "^15.6.2",
52-
"react": "^17.0.2",
53-
"react-dom": "^17.0.2",
54-
"regenerator-runtime": "^0.12.1",
55-
"resolve-url-loader": "^3.0.0",
56-
"sass-loader": "^7.1.0",
57-
"semantic-release": "17.2.3",
58-
"style-loader": "^0.23.1",
59-
"url-loader": "^1.1.2",
60-
"webpack": "^4.25.1",
61-
"webpack-cli": "^3.1.2",
62-
"webpack-dev-server": "^3.1.10",
63-
"webpack-merge": "^4.1.4",
64-
"@date-io/date-fns": "^1.0.1",
65-
"@date-io/moment": "^1.0.1",
66-
"classnames": "^2.2.6",
67-
"clsx": "^1.0.4",
68-
"date-fns": "^1.30.1",
69-
"moment": "^2.23.0",
70-
"react-select": "^2.2.0"
29+
"antd": "^4.2.0"
7130
},
7231
"peerDependencies": {
7332
"@data-driven-forms/react-form-renderer": ">=3.2.1",
@@ -78,6 +37,5 @@
7837
"dependencies": {
7938
"@data-driven-forms/common": "*",
8039
"lodash": "^4.17.21"
81-
},
82-
"postpublish": "export RELEASE_DEMO=true"
40+
}
8341
}

‎packages/blueprint-component-mapper/config/webpack.config.js

Lines changed: 29 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,43 @@
1-
const TerserPlugin = require('terser-webpack-plugin');
21
const HtmlWebPackPlugin = require('html-webpack-plugin');
32
const resolve = require('path').resolve;
4-
const merge = require('webpack-merge');
5-
6-
const commonConfig = {
7-
devtool: "source-map",
8-
module: {
9-
rules: [{
10-
test: /\.(js|jsx)$/,
11-
exclude: /node_modules/,
12-
use: {
13-
loader: 'babel-loader',
14-
},
15-
}, {
16-
test: /\.(ts|tsx)$/,
17-
exclude: /node_modules/,
18-
use: {
19-
loader: 'ts-loader',
20-
},
21-
}, {
22-
test: /\.(sa|sc|c)ss$/,
23-
use: [ 'style-loader', 'css-loader', 'sass-loader', 'resolve-url-loader' ],
24-
}, {
25-
test: /\.(png|jpg|gif|svg|woff|ttf|eot)/,
26-
loader: 'url-loader',
27-
},
28-
],
29-
},
30-
};
3+
const webpack = require('webpack');
314

325
const htmlPlugin = new HtmlWebPackPlugin({
336
template: './demo/index.html',
34-
filename: './index.html',
7+
filename: './index.html'
358
});
369

3710
const devConfig = {
3811
mode: 'development',
39-
entry: './demo/index.js',
12+
entry: { app: resolve('./demo/index.js') },
4013
output: {
4114
path: resolve('../dist'),
42-
filename: '[name].[hash].js',
43-
},
44-
devtool: 'source-map',
45-
plugins: [ htmlPlugin ],
46-
};
47-
48-
const prodConfig = {
49-
mode: 'development',
50-
entry: './src/index.js',
51-
optimization: {
52-
minimizer: [
53-
new TerserPlugin({
54-
cache: true,
55-
parallel: true,
56-
terserOptions: {
57-
keep_classnames: true,
58-
keep_fnames: true,
59-
},
60-
}),
61-
],
62-
},
63-
output: {
64-
path: resolve('./dist'),
65-
library: '[name]',
66-
libraryTarget: 'umd',
67-
filename: 'index.js',
68-
umdNamedDefine: true,
69-
globalObject: 'this',
15+
filename: '[name].[hash].js'
7016
},
17+
devtool: 'eval-source-map',
18+
plugins: [
19+
htmlPlugin,
20+
new webpack.ProvidePlugin({
21+
process: 'process/browser'
22+
})
23+
],
24+
module: {
25+
rules: [
26+
{
27+
test: /\.js$/,
28+
exclude: /(node_modules)/i,
29+
use: ['babel-loader']
30+
},
31+
{
32+
test: /\.(sa|sc|c)ss$/,
33+
use: ['style-loader', 'css-loader', 'sass-loader']
34+
},
35+
{
36+
test: /\.(png|jpg|gif|svg|woff|ttf|eot)/,
37+
type: 'asset/resource'
38+
}
39+
]
40+
}
7141
};
7242

73-
module.exports = env => ({
74-
dev: merge(commonConfig, devConfig),
75-
prod: merge(commonConfig, prodConfig),
76-
})[env];
77-
43+
module.exports = devConfig;

0 commit comments

Comments
 (0)