Skip to content

Commit fb20a50

Browse files
committed
feat!: bump deps, use object spread, add alauda browserslist
1 parent d374d62 commit fb20a50

File tree

34 files changed

+1115
-1108
lines changed

34 files changed

+1115
-1108
lines changed

.browserslistrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
extends @1stg/browserslist-config/modern
2-
>0%

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"scripts": {
1313
"check": "run-p check:*",
14-
"check:eslint": "eslint --print-config .eslintrc.js | eslint-config-prettier-check",
14+
"check:eslint": "eslint-config-prettier .eslintrc.js",
1515
"check:stylelint": "stylelint-config-prettier-check",
1616
"check:tslint": "tslint-config-prettier-check ./tslint.json",
1717
"lint": "run-p lint:*",
@@ -25,25 +25,25 @@
2525
"type-coverage": "type-coverage --cache --detail --ignore-catch --ignore-files '**/*.d.ts' --strict"
2626
},
2727
"devDependencies": {
28-
"@angular/core": "^11.0.2",
29-
"@types/jest": "^26.0.15",
30-
"@types/node": "^14.14.10",
28+
"@angular/core": "^11.1.0",
29+
"@types/jest": "^26.0.20",
30+
"@types/node": "^14.14.22",
3131
"@types/react": "^17.0.0",
3232
"@types/unist": "^2.0.3",
33-
"core-js": "^3.8.0",
33+
"core-js": "^3.8.3",
3434
"lerna": "^3.22.1",
3535
"npm-run-all": "^4.1.5",
3636
"react": "^17.0.1",
3737
"ts-jest": "^26.4.4",
3838
"tslint": "^6.1.3",
39-
"type-coverage": "^2.14.5",
40-
"typescript": "^4.1.2",
39+
"type-coverage": "^2.14.9",
40+
"typescript": "^4.1.3",
4141
"vue": "^2.6.12",
4242
"yarn-deduplicate": "^3.1.0"
4343
},
4444
"resolutions": {
45-
"@babel/core": "^7.12.9",
46-
"prettier": "^2.2.0"
45+
"@babel/core": "^7.12.10",
46+
"prettier": "^2.2.1"
4747
},
4848
"typeCoverage": {
4949
"atLeast": 100

packages/app-config/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
"@1stg/stylelint-config": "^0.13.0",
1717
"@pkgr/es-modules": "^0.3.3",
1818
"@pkgr/imagemin": "^0.4.5",
19-
"browserslist": "^4.14.7",
20-
"postcss": "^8.1.10",
21-
"stylelint": "^13.8.0"
19+
"browserslist": "^4.16.1",
20+
"postcss": "^8.2.4",
21+
"stylelint": "^13.9.0"
2222
},
2323
"publishConfig": {
2424
"access": "public"

packages/babel-preset/index.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@ module.exports = declare(
3333

3434
const proposalTypeScriptPreset = require('babel-preset-proposal-typescript')
3535

36-
const proposalTsOptions = Object.assign({
37-
classLoose,
38-
decoratorsLegacy,
39-
isTSX,
40-
})
36+
const proposalTsOptions = { classLoose, decoratorsLegacy, isTSX }
4137

4238
const presets = [
4339
[proposalTypeScriptPreset, proposalTsOptions],
@@ -121,7 +117,7 @@ module.exports = declare(
121117
if (importOptions === true) {
122118
plugins.push([importPlugin, DEFAULT_ANTD_OPTIONS])
123119
} else if (Array.isArray(importOptions)) {
124-
plugins.push([importPlugin, DEFAULT_ANTD_OPTIONS].concat(importOptions))
120+
plugins.push([importPlugin, DEFAULT_ANTD_OPTIONS, ...importOptions])
125121
} else {
126122
plugins.push(
127123
[
@@ -174,7 +170,7 @@ module.exports = declare(
174170
presets: [
175171
[
176172
proposalTypeScriptPreset,
177-
Object.assign({}, proposalTsOptions, { isTSX: true }),
173+
{ ...proposalTsOptions, isTSX: true },
178174
],
179175
],
180176
plugins: reactPlugin ? [reactPlugin] : undefined,

packages/babel-preset/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
"dependencies": {
1515
"@babel/helper-plugin-utils": "^7.10.4",
1616
"@babel/plugin-proposal-class-properties": "^7.12.1",
17-
"@babel/plugin-proposal-decorators": "^7.12.1",
18-
"@babel/preset-env": "^7.12.7",
19-
"@babel/preset-react": "^7.12.7",
17+
"@babel/plugin-proposal-decorators": "^7.12.12",
18+
"@babel/preset-env": "^7.12.11",
19+
"@babel/preset-react": "^7.12.10",
2020
"@babel/preset-typescript": "^7.12.7",
2121
"@pkgr/utils": "^0.4.5",
2222
"@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
@@ -26,8 +26,8 @@
2626
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
2727
"babel-plugin-transform-remove-console": "^6.9.4",
2828
"babel-plugin-transform-typescript-metadata": "^0.3.1",
29-
"babel-preset-proposal-typescript": "^1.5.0",
30-
"core-js": "^3.8.0",
29+
"babel-preset-proposal-typescript": "^2.0.0",
30+
"core-js": "^3.8.3",
3131
"fast-async": "^7.0.6"
3232
},
3333
"publishConfig": {
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/**
2+
* @see http://confluence.alauda.cn/pages/viewpage.action?pageId=67557669
3+
*/
4+
module.exports = ['Chrome >= 85', 'Firefox >= 80']

packages/browserslist-config/index.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
1-
module.exports = [
2-
'defaults',
3-
'last 5 versions',
4-
'> 0.5% in CN',
5-
// it seems out of date too long
6-
'not and_qq < 2',
7-
]
1+
module.exports = ['defaults', 'last 5 versions', '> 0.5% in CN']
Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
1-
module.exports = [
2-
'last 1 Android version',
3-
'last 1 Chrome version',
4-
'last 1 ChromeAndroid version',
5-
'last 1 FireFox version',
6-
'last 1 iOS version',
7-
'last 1 Safari version',
8-
]
1+
module.exports = ['defaults and last 1 version']
Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
1-
module.exports = require('.')
2-
.filter(_ => !(_.includes('last') || _.includes('CN')))
3-
.concat(
4-
'> 1%',
5-
'last 3 versions',
6-
'not and_qq < 2',
7-
'not and_uc < 13',
8-
'not baidu < 8',
9-
'not bb < 11',
10-
'not ie <= 11',
11-
'not ie_mob <= 11',
12-
'not kaios < 3',
13-
'not op_mini all',
14-
'not op_mob < 50',
15-
'not safari < 6',
16-
'not samsung < 10',
17-
)
1+
module.exports = [
2+
require('.')
3+
.filter(_ => !_.includes('last') && !_.includes('CN'))
4+
.join(',') + ' and > 1% and last 3 versions and supports es6-module',
5+
]

packages/commitlint-config/index.js

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,14 @@ const lernaScopesConfig = require('@commitlint/config-lerna-scopes')
55
const MERGE_PROPERTIES = ['rules', 'utils']
66

77
module.exports = isPkgAvailable('lerna')
8-
? Object.assign(
9-
{},
10-
conventionalConfig,
11-
MERGE_PROPERTIES.reduce((config, property) => {
12-
config[property] = Object.assign(
13-
{},
14-
conventionalConfig[property],
15-
lernaScopesConfig[property],
16-
)
8+
? {
9+
...conventionalConfig,
10+
...MERGE_PROPERTIES.reduce((config, property) => {
11+
config[property] = {
12+
...conventionalConfig[property],
13+
...lernaScopesConfig[property],
14+
}
1715
return config
1816
}, {}),
19-
)
17+
}
2018
: conventionalConfig

0 commit comments

Comments
 (0)