Skip to content

Commit

Permalink
Merge branch 'master' into fix/list-different
Browse files Browse the repository at this point in the history
  • Loading branch information
kylemh committed Mar 6, 2021
2 parents b9beb66 + e7ff4a6 commit 3e5ceed
Show file tree
Hide file tree
Showing 9 changed files with 116 additions and 53 deletions.
10 changes: 10 additions & 0 deletions .all-contributorsrc
Expand Up @@ -222,6 +222,16 @@
"doc"
]
},
{
"login": "dpwilhelmsen",
"name": "Daniel Wilhelmsen",
"avatar_url": "https://avatars3.githubusercontent.com/u/1758049?v=4",
"profile": "http://danielwilhelmsen.com",
"contributions": [
"code",
"maintenance"
]
},
{
"login": "dorser",
"name": "dorser",
Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/ci.yml
@@ -0,0 +1,31 @@
name: CI

on: [push]

jobs:
ci:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [10.x, 12.x, 14.x]

steps:
- uses: actions/checkout@v2

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node }}

- name: Install dependencies
run: npm i

- name: Lint, test, and build
run: npm start validate

- name: Check test coverage
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos

29 changes: 29 additions & 0 deletions .github/workflows/release.yml
@@ -0,0 +1,29 @@
name: Release

on:
push:
branches:
- master

jobs:
release:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0

- uses: actions/setup-node@v2
with:
node-version: '12.x'

- run: npm i

- run: npm start build

- name: Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: npx semantic-release@15
19 changes: 19 additions & 0 deletions .github/workflows/stale.yml
@@ -0,0 +1,19 @@
name: Mark stale issues and pull requests

on:
schedule:
- cron: "0 0 * * *"

jobs:
stale:

runs-on: ubuntu-latest

steps:
- uses: actions/stale@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'Stale issue'
stale-pr-message: 'Stale pull request'
stale-issue-label: 'no-issue-activity'
stale-pr-label: 'no-pr-activity'
28 changes: 0 additions & 28 deletions .travis.yml

This file was deleted.

45 changes: 23 additions & 22 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cli-test/tests/index.js
Expand Up @@ -48,7 +48,7 @@ test('formats files and outputs to stdout', async () => {
expect(stdout).toContain(
stripIndent(
`
import baz, { stuff } from "fdjakfdlfw-baz";
import baz, { stuff } from 'fdjakfdlfw-baz';
export { bazzy };
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -52,7 +52,7 @@
"ajv": "^6.10.0",
"all-contributors-cli": "^6.7.0",
"babel-jest": "^24.8.0",
"eslint-config-kentcdodds": "^14.3.3",
"eslint-config-kentcdodds": "14.3.3",
"husky": "^2.4.1",
"indent-string": "^4.0.0",
"jest": "^24.8.0",
Expand Down
3 changes: 2 additions & 1 deletion src/format-files.js
Expand Up @@ -140,7 +140,8 @@ function formatFilesFromGlobs({
.subscribe(onNext, onError, onComplete);

function filePathToFormatted(filePath) {
return formatFile(filePath, prettierESLintOptions, cliOptions);
const absoluteFilePath = path.resolve(filePath);
return formatFile(absoluteFilePath, prettierESLintOptions, cliOptions);
}

function onNext(info) {
Expand Down

0 comments on commit 3e5ceed

Please sign in to comment.