Skip to content

Commit ebcfa12

Browse files
authored
Enhancement: scripts upgrade (#572)
* upgrade scripts * format
1 parent e7fa856 commit ebcfa12

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2500
-2945
lines changed

.babelrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"exclude": "node_modules/**",
33
"presets": [
4-
["babel-preset-trigen", {
4+
["@trigen/babel-preset", {
55
"env": "lib"
66
}]
77
],
88
"env": {
99
"test": {
1010
"presets": [
11-
["babel-preset-trigen", {
11+
["@trigen/babel-preset", {
1212
"env": "jest",
1313
"typescript": true
1414
}]

.browserslistrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
extends browserslist-config-trigen/node
1+
extends @trigen/browserslist-config/node

.eslintrc

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
{
2-
"extends": "trigen/base",
2+
"extends": [
3+
"@trigen/eslint-config",
4+
"@trigen/eslint-config/typescript",
5+
"@trigen/eslint-config/typescript-requiring-type-checking",
6+
"@trigen/eslint-config/jest"
7+
],
38
"env": {
49
"node": true
10+
},
11+
"parserOptions": {
12+
"tsconfigRootDir": "./",
13+
"project": ["./tsconfig.json"]
14+
},
15+
"rules": {
16+
"@typescript-eslint/no-magic-numbers": "off"
517
}
618
}

.huskyrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hooks": {
33
"pre-commit": "lint-staged",
4-
"pre-push": "npm test"
4+
"pre-push": "yarn test"
55
}
66
}

.lintstagedrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"src/**/*.{ts,tsx}": "trigen-scripts lint:ts"
2+
"rollup.config.js": "trigen-scripts lint --fix",
3+
"src/**/*.ts": "trigen-scripts lint --fix"
34
}

.trigenscriptsrc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
"@trigen/scripts-plugin-babel",
44
"@trigen/scripts-plugin-typescript",
55
"@trigen/scripts-plugin-rollup",
6-
"@trigen/scripts-preset-lib",
6+
["@trigen/scripts-preset-lib", {
7+
"lint": [
8+
"rollup.config.js",
9+
"src/**/*.ts"
10+
]
11+
}],
712
"@trigen/scripts-plugin-size-limit"
813
]

package.json

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,29 +35,37 @@
3535
"regexp"
3636
],
3737
"dependencies": {
38-
"@babel/runtime-corejs3": "^7.9.6",
39-
"@types/node": "^14.0.4",
38+
"@babel/runtime": "^7.12.5",
39+
"@types/node": "^14.14.22",
4040
"argue-cli": "^1.2.0",
41-
"browserslist": "^4.5.6",
41+
"browserslist": "^4.16.3",
4242
"chalk": "^4.0.0",
43+
"core-js": "^3.8.3",
4344
"easy-table": "^1.1.1",
45+
"regenerator-runtime": "^0.13.7",
4446
"useragent": "^2.3.0"
4547
},
4648
"devDependencies": {
47-
"@size-limit/preset-small-lib": "^4.6.0",
48-
"@trigen/scripts": "^6.0.0",
49-
"@trigen/scripts-plugin-babel": "^6.1.1",
50-
"@trigen/scripts-plugin-eslint": "^6.0.0",
51-
"@trigen/scripts-plugin-jest": "^6.1.1",
52-
"@trigen/scripts-plugin-rollup": "^6.0.0",
53-
"@trigen/scripts-plugin-size-limit": "^6.0.0",
54-
"@trigen/scripts-plugin-typescript": "^6.0.0",
55-
"@trigen/scripts-preset-lib": "^6.0.0",
49+
"@babel/core": "^7.12.10",
50+
"@rollup/plugin-eslint": "^8.0.1",
51+
"@size-limit/preset-small-lib": "^4.9.2",
52+
"@trigen/eslint-config": "^7.3.4",
53+
"@trigen/scripts": "^7.3.1",
54+
"@trigen/scripts-plugin-babel": "^7.3.1",
55+
"@trigen/scripts-plugin-eslint": "^7.3.4",
56+
"@trigen/scripts-plugin-jest": "^7.3.1",
57+
"@trigen/scripts-plugin-rollup": "^7.1.0",
58+
"@trigen/scripts-plugin-size-limit": "^7.3.1",
59+
"@trigen/scripts-plugin-typescript": "^7.3.2",
60+
"@trigen/scripts-preset-lib": "^7.3.4",
5661
"browserslist-useragent": "^3.0.0",
5762
"del-cli": "^3.0.0",
63+
"eslint": "7.18.0",
64+
"rollup": "^2.38.4",
5865
"rollup-plugin-add-shebang": "^0.3.0",
59-
"rollup-plugin-tslint": "^0.2.2",
60-
"rollup-plugin-typescript2": "^0.27.0",
66+
"rollup-plugin-typescript2": "^0.29.0",
67+
"size-limit": "^4.9.2",
68+
"typescript": "^4.1.3",
6169
"user-agents": "^1.0.213"
6270
},
6371
"files": [

rollup.config.js

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
import {
22
external
33
} from '@trigen/scripts-plugin-rollup/helpers';
4-
import tslint from 'rollup-plugin-tslint';
4+
import eslint from '@rollup/plugin-eslint';
55
import commonjs from '@rollup/plugin-commonjs';
66
import typescript from 'rollup-plugin-typescript2';
77
import babel from '@rollup/plugin-babel';
88
import shebang from 'rollup-plugin-add-shebang';
9-
import { DEFAULT_EXTENSIONS } from '@babel/core';
9+
import {
10+
DEFAULT_EXTENSIONS
11+
} from '@babel/core';
1012
import pkg from './package.json';
1113

1214
const plugins = [
13-
tslint({
14-
exclude: ['**/*.json', 'node_modules/**'],
15-
throwError: true
15+
eslint({
16+
exclude: ['**/*.json', 'node_modules/**'],
17+
throwOnError: true
1618
}),
1719
commonjs(),
1820
typescript(),
@@ -22,32 +24,32 @@ const plugins = [
2224
'ts',
2325
'tsx'
2426
],
25-
babelHelpers: 'runtime',
27+
babelHelpers: 'runtime',
2628
skipPreflightCheck: true
2729
})
2830
];
2931

3032
export default [{
31-
input: 'src/index.ts',
33+
input: 'src/index.ts',
3234
plugins,
3335
external: external(pkg, true),
34-
output: {
35-
file: pkg.main,
36-
format: 'cjs',
37-
exports: 'named',
36+
output: {
37+
file: pkg.main,
38+
format: 'cjs',
39+
exports: 'named',
3840
sourcemap: 'inline'
3941
}
4042
}, {
41-
input: 'src/cli.ts',
42-
plugins: [
43+
input: 'src/cli.ts',
44+
plugins: [
4345
...plugins,
4446
shebang()
4547
],
4648
external: _ => !_.endsWith('src/cli.ts'),
47-
output: {
48-
file: 'lib/cli.js',
49-
format: 'cjs',
50-
exports: 'named',
49+
output: {
50+
file: 'lib/cli.js',
51+
format: 'cjs',
52+
exports: 'named',
5153
sourcemap: 'inline'
5254
}
5355
}];

src/browsers/browserslist.spec.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,9 @@ import {
66
} from './browserslist';
77

88
describe('Browsers', () => {
9-
109
describe('browserslist', () => {
11-
1210
describe('parseBrowsersList', () => {
13-
1411
it('should correct parse browsers list', () => {
15-
1612
const shirtname = Object.keys(BROWSERS_SHIRTNAMES)[0];
1713
const fullname = BROWSERS_SHIRTNAMES[shirtname];
1814
const browsersList = [
@@ -22,15 +18,15 @@ describe('Browsers', () => {
2218
];
2319
const browsers = [
2420
{
25-
family: fullname.toLowerCase(),
21+
family: fullname.toLowerCase(),
2622
version: [10, 0, 0]
2723
},
2824
{
29-
family: 'chrome',
25+
family: 'chrome',
3026
version: [11, 12, 0]
3127
},
3228
{
33-
family: 'opera',
29+
family: 'opera',
3430
version: [13, 14, 15]
3531
}
3632
];

src/browsers/browserslist.ts

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@ import {
1515

1616
/**
1717
* Browsers strings to info objects.
18-
* @param browsersList - Browsers strings with family and version.
19-
* @return Browser info objects.
18+
* @param browsersList - Browsers strings with family and version.
19+
* @returns Browser info objects.
2020
*/
21-
export function parseBrowsersList(browsersList: string[]): IBrowser[] {
22-
return [].concat(
21+
export function parseBrowsersList(browsersList: string[]) {
22+
return ([] as IBrowser[]).concat(
2323
...browsersList.map((browser) => {
24-
2524
const [
2625
name,
2726
...versions
@@ -38,15 +37,15 @@ export function parseBrowsersList(browsersList: string[]): IBrowser[] {
3837

3938
/**
4039
* Request browsers list.
41-
* @param options - Options to get browsers list.
42-
* @return Browser info objects.
40+
* @param options - Options to get browsers list.
41+
* @returns Browser info objects.
4342
*/
44-
export function getBrowsersList({
45-
browsers,
46-
env,
47-
path
48-
}: IBrowsersListRequest = {}) {
49-
43+
export function getBrowsersList(options: IBrowsersListRequest = {}) {
44+
const {
45+
browsers,
46+
env,
47+
path
48+
} = options;
5049
const normalizedBrowsers = Array.isArray(browsers)
5150
? browsers.map(normalizeBrowserFamily)
5251
: browsers;

0 commit comments

Comments
 (0)