Skip to content

Commit 21cca9e

Browse files
authored
Merge branch 'master' into transform
2 parents db78ec9 + 4841822 commit 21cca9e

File tree

9 files changed

+395
-130
lines changed

9 files changed

+395
-130
lines changed

.editorconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@ insert_final_newline = true
1010
[{*.json,*.md,.*rc,*.yml,*.txt}]
1111
indent_style = space
1212
indent_size = 2
13-
insert_final_newline = false

.github/workflows/compressed-size.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ on: [pull_request]
44

55
jobs:
66
build:
7-
87
runs-on: ubuntu-latest
98

109
steps:
11-
- uses: actions/checkout@v2
12-
- uses: preactjs/compressed-size-action@v1
13-
with:
14-
repo-token: "${{ secrets.GITHUB_TOKEN }}"
10+
- uses: actions/checkout@v2
11+
- uses: preactjs/compressed-size-action@v1
12+
with:
13+
repo-token: '${{ secrets.GITHUB_TOKEN }}'

.github/workflows/main.yml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
11
name: CI
22

3-
on: [push]
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches:
9+
- master
410

511
jobs:
612
build:
7-
813
runs-on: ubuntu-latest
914

1015
steps:
11-
- uses: actions/checkout@v1
12-
- uses: actions/setup-node@v1
13-
with:
14-
node-version: 12
15-
- name: npm install, build, and test
16-
run: |
17-
npm install
18-
npm run prepare --if-present
19-
npm test
20-
env:
21-
CI: true
16+
- uses: actions/checkout@v1
17+
- uses: actions/setup-node@v1
18+
with:
19+
node-version: 12
20+
- name: npm install, build, and test
21+
run: |
22+
npm install
23+
npm run prepare --if-present
24+
npm test
25+
env:
26+
CI: true

.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
node_modules
2+
package-lock.json
3+
dist
4+
coverage

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ information on using pull requests.
2525
## Community Guidelines
2626

2727
This project follows [Google's Open Source Community
28-
Guidelines](https://opensource.google.com/conduct/).
28+
Guidelines](https://opensource.google.com/conduct/).

package.json

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,44 @@
66
"main": "dist/redaxios.js",
77
"umd:main": "dist/redaxios.umd.js",
88
"module": "dist/redaxios.module.js",
9+
"types": "dist/index.d.ts",
910
"scripts": {
10-
"build": "microbundle",
11-
"test": "eslint src test && karmatic",
12-
"release": "npm t && git commit -am \"$npm_package_version\" && git tag $npm_package_version && git push && git push --tags && npm publish"
11+
"build": "microbundle && tsc",
12+
"test": "npm run format:check && eslint src test && karmatic",
13+
"release": "npm t && git commit -am \"$npm_package_version\" && git tag $npm_package_version && git push && git push --tags && npm publish",
14+
"format": "prettier --write './**/*.{js,json,yml,md}'",
15+
"format:check": "prettier --check './**/*.{js,json,yml,md}'"
1316
},
1417
"files": [
1518
"dist",
1619
"src"
1720
],
1821
"eslintConfig": {
19-
"extends": "developit"
22+
"extends": [
23+
"developit",
24+
"prettier"
25+
],
26+
"rules": {
27+
"jest/no-jasmine-globals": "off"
28+
}
29+
},
30+
"prettier": {
31+
"arrowParens": "always",
32+
"trailingComma": "none",
33+
"singleQuote": true,
34+
"endOfLine": "lf",
35+
"useTabs": true,
36+
"printWidth": 120,
37+
"overrides": [
38+
{
39+
"files": "**/*.json",
40+
"options": {
41+
"parser": "json-stringify",
42+
"useTabs": false,
43+
"tabWidth": 2
44+
}
45+
}
46+
]
2047
},
2148
"repository": "developit/redaxios",
2249
"keywords": [
@@ -27,14 +54,18 @@
2754
"license": "Apache-2.0",
2855
"homepage": "https://github.com/developit/redaxios",
2956
"devDependencies": {
57+
"@types/jest": "^26.0.4",
58+
"core-js": "2.6.11",
3059
"eslint": "^6.8.0",
3160
"eslint-config-developit": "^1.1.1",
61+
"eslint-config-prettier": "6.11.0",
3262
"file-loader": "^5.0.2",
3363
"isomorphic-fetch": "^2.2.1",
34-
"jest": "^24.9.0",
35-
"karmatic": "^1.4.0",
64+
"karmatic": "^2.1.0",
3665
"microbundle": "^0.11.0",
66+
"prettier": "2.0.5",
3767
"sinon": "^8.0.4",
68+
"typescript": "3.9.3",
3869
"webpack": "^4.41.5"
3970
}
4071
}

0 commit comments

Comments
 (0)