Skip to content

Commit

Permalink
Merge pull request #59 from jokester/canary
Browse files Browse the repository at this point in the history
v0.6.0
  • Loading branch information
jokester committed Apr 6, 2024
2 parents c6eec7d + 97560f0 commit 0d3081d
Show file tree
Hide file tree
Showing 20 changed files with 1,197 additions and 1,817 deletions.
1 change: 0 additions & 1 deletion .eslintignore

This file was deleted.

3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/obsolete
node_modules
/lib
14 changes: 8 additions & 6 deletions .github/workflows/check.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
name: Check
name: Check + Publish

on:
push:
branches:
- master
pull_request:
branches:
- master
- main
pull_request: {}

defaults:
run:
Expand All @@ -25,8 +23,12 @@ jobs:
- run: yarn
- run: yarn typecheck
- run: yarn lint
if: ${{ success() || failure() }}
- run: yarn test:coverage
- uses: codecov/codecov-action@v1
if: ${{ success() || failure() }}
- uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}

publish:
needs: [check]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Common TypeScript code I used in multiple app.

![Check](https://github.com/jokester/ts-commonutil/workflows/Check/badge.svg)
[![codecov](https://codecov.io/gh/jokester/ts-commonutil/branch/master/graph/badge.svg)](https://codecov.io/gh/jokester/ts-commonutil)
[![codecov](https://codecov.io/gh/jokester/ts-commonutil/graph/badge.svg?token=95f53H027x)](https://codecov.io/gh/jokester/ts-commonutil)
[![npm version](https://badge.fury.io/js/%40jokester%2Fts-commonutil.svg)](https://badge.fury.io/js/%40jokester%2Fts-commonutil)

## How to Use
Expand Down
5 changes: 5 additions & 0 deletions babel.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"presets": [
["@babel/plugin-syntax-jsx"]
]
}
18 changes: 12 additions & 6 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
module.exports = {
preset: 'ts-jest',
preset: 'ts-jest/presets/js-with-ts',
roots: ['src'],
transformIgnorePatterns: ['<rootDir>/node_modules/.*\\.js', '<rootDir>/build/.*\\.js'],
transform: {
'^.+\\.tsx?$': [
'ts-jest',
{
tsconfig: {
target: 'es2022',
},
},
],
},
testMatch: ['**/__test__/*\\.(ts|js|tsx|jsx)', '**/*\\.(spec|test)\\.(ts|js|tsx|jsx)'],
collectCoverageFrom: ['src/**/*.(ts|tsx)', '!build/', '!**/node_modules', '!/coverage'],
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'],
coverageReporters: ['json', 'lcov', 'text', 'html'],
globals: {
'ts-jest': {
isolatedModules: true,
},
},
setupFiles: ['core-js'],
};
File renamed without changes.
2 changes: 1 addition & 1 deletion src/puppeteer/watch-res.ts → obsolete/watch-res.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type * as puppeteer from 'puppeteer';
import { Deferred } from '../concurrency/deferred';
import { Deferred } from '../src/concurrency/deferred';

export async function waitRes(
p: puppeteer.Page,
Expand Down
Loading

0 comments on commit 0d3081d

Please sign in to comment.