Skip to content

Commit

Permalink
Merge pull request #718 from kulshekhar/beta
Browse files Browse the repository at this point in the history
23.10.0
  • Loading branch information
huafu authored Sep 19, 2018
2 parents bac4c82 + e9f602f commit 2852078
Show file tree
Hide file tree
Showing 553 changed files with 65,176 additions and 10,665 deletions.
12 changes: 8 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
[*.ts]
[*]
root = true
indent_style = space
indent_size = 2
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.tsx]
indent_style = space
indent_size = 2
[*.md,*.snap]
trim_trailing_whitespace = false
5 changes: 5 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
dist/
node_modules/
e2e/__cases__/
coverage/
docs/
28 changes: 28 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
module.exports = {
env: {
node: true,
},
extends: 'eslint:recommended',
parserOptions: {
ecmaVersion: 5,
sourceType: 'module',
impliedStrict: true,
},
rules: {
'no-console': ['error', { allow: ['warn', 'error', 'log'] }],
indent: ['error', 2],
'linebreak-style': ['error', 'unix'],
quotes: ['error', 'single'],
semi: ['error', 'never'],
'comma-dangle': [
'error',
{
arrays: 'always-multiline',
objects: 'always-multiline',
imports: 'always-multiline',
exports: 'always-multiline',
functions: 'never',
},
],
},
}
8 changes: 6 additions & 2 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@ https://github.com/kulshekhar/ts-jest/wiki/Troubleshooting -->
## Expected behavior <!-- describe the expected behavior below -->:


## Output from debug log <!-- You can activate the debug logger by setting the environment variable TS_JEST_DEBUG="true" before running yarn test. The output of the logger will be in **<your_project_dir>/node_modules/ts-jest/debug.txt**, paste it below -->:
## Debug log:
<details/>
<summary>log file content<!-- You can activate the debug logger by setting the environment variable TS_JEST_LOG="ts-jest.log" before running tests. The output of the logger will be in **ts-jest.log** in CWD, paste it in the below section: --></summary>

```bash
# content of debug.txt :
# content of ts-jest.log :

```
</details>


## Minimal repo <!-- If you haven't already, create the smallest possible repo that reproduces this issue by running `npm install` and `npm test`. This will speed up any fixes that this issue might need. Paste the minimal repo URL below -->:
Expand Down
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,13 @@ jspm_packages
.idea


# Long paths
# tests specific
tests/simple-long-path/long-src-path
# is linked to the temp dir of the os
e2e/__workdir_synlink__
**/.ts-jest-e2e.json
# while refactoring...
old/

# binaries
*.tgz
6 changes: 6 additions & 0 deletions .markdownlint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
default: true
no-hard-tabs: true
MD002: false
MD013: false
MD033: false
MD041: false
39 changes: 33 additions & 6 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# TypeScript source code
src

# Tests
tests
e2e

# sources are inlined
src

# Developement scripts
scripts
scripts

# Logs
logs
Expand Down Expand Up @@ -46,4 +46,31 @@ jspm_packages
.npm

# Optional REPL history
.node_repl_history
.node_repl_history
# while refactoring...
old

*.tgz

# others
.npmignore
.eslintrc.js
.eslintignore
jest.config.js
.vscode
.github
appveyor.yml
.editorconfig
.prettierignore
tsconfig.json
.prettierrc
.travis.yml
tsconfig.build.json
tslint.json
.npmrc
.markdownlint.yaml

# Github Pages
docs

commitlint.config.js
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
tag-version-prefix="v"
message="chore(release): %s"
7 changes: 7 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
dist/
e2e/
!e2e/__helpers__
!e2e/__serializers__
!e2e/__tests__
node_modules/
src/**/__snapshots__/
10 changes: 10 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
semi: false
printWidth: 120
singleQuote: true
tabWidth: 2
useTabs: false
trailingComma: all
overrides:
- files: "**/*.js"
options:
trailingComma: es5
56 changes: 40 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,46 @@
dist: trusty
sudo: required
language: node_js
cache: yarn
git:
depth: 5

env:
- TS_JEST_E2E_WORKDIR=/tmp/ts-jest-e2e-workdir

cache:
npm: true
directories:
- /tmp/ts-jest-e2e-workdir/__templates__

node_js:
- "10"
- "8"
- "6"

sudo: false

before_install:
- sudo sysctl fs.inotify.max_user_watches=524288
- yarn global add greenkeeper-lockfile@1 rimraf
before_script:
# - greenkeeper-lockfile-update
# Disabled, randomly works :-/
# https://github.com/scikit-learn/scikit-learn/issues/10927
# - |
# set -e
# # fail loudly when force-pushed, that is why there is the `|| 'dummy.js'` part
# MODIFIED_FILES=$(git diff --name-only $TRAVIS_COMMIT_RANGE || echo 'dummy.js')
# # waiting for native solution https://github.com/travis-ci/travis-ci/issues/6301
# if ! echo ${MODIFIED_FILES} | grep -qvE '^docs/|^\.gitignore|^\.gitattributes|\.md$|^appveyor\.yml$|^icon\.png$|^commitlint\.config\.js$'; then
# echo "Only docs were updated, stopping build process."
# exit
# fi
# ensure we have npm >= 5.8 so that we can use `npm ci` instead of `npm install` (much faster)
- dpkg --compare-versions `npm -v` ge 5.8 || npm i -g npm@latest
# we report coverages only within node 10, ensure we have the coveralls bin installed
- 'if [[ "$(node --version)" == v10.* ]]; then npm install --global coveralls; fi'

script:
- yarn test
after_script:
# - greenkeeper-lockfile-upload
notifications:
slack:
secure: "Rj32dEDWEbNrwn0b+dFpUPPMg20IRScOA1eXUXaNY1TyluSd2rIRN1uwH0tOTglDieExeNOhfsc5iqxqSRomwelB3JzVwAJqv+IzFU3U0JlmntIZoxijiPr9Xxwu+ZB7nO1NSjHChyG/pVuKEYYYhmtHoIuI6D4hR2y4PRSPsKc5qOx4B7mfAzYio8JRNBVDe7B3CSWbXBnQ31pqjNhpNEiCkZyUzE9CdJnsr0GFUkZ6LlzlXMhXVXCihzlirSKKCEDj/A3O2jbfULqglKKHCwa/WVtObBCPOjp8Kk0sw0DSwU8GZPBv76iwPDgLCC5M45zM7vW0QhaLKtV5/tXIApuf2dOcOM3Q5wirfY4KetaNCpMqBIfBzo17h4pzWK/is6WyEYHyZmN9+mkBSYvWSM5s9vGubWKDnWAA2d6mtIgM6xAHNPyTJ8RWLGeyi1TJYOSIyIASaQEcXl25tD2KEjA7A33fJl2FXcsiDVE8+TUuecFl7A4TpFZU9mIS2N5RkIqE40xLCkIjx3m9YotlDSjATNLFQpQIESPhmlqN7Ray00aVd5tOCFg+674oGTPh2lQdSKIt1+Llr0uEEwcrUCKqyQ2lYGiTOuODj54Ix8gWSVsVtfy4/w3ckal/h2OlTeY88tAmFw4Ck+ZV+PrO2JsEmT7iipAQI0gkecJXUlE="
- npm run clean -- --when-ci-commit-message
# only grab coverage data on node 10
- |
if [[ "$(node --version)" == v10.* ]]; then
npm run test -- --coverage;
else
npm run test;
fi
after_success:
# report coverages to coveralls
- 'if [[ "$(node --version)" == v10.* && -s coverage/lcov.info ]]; then cat coverage/lcov.info | coveralls; fi'
58 changes: 0 additions & 58 deletions AUTHORS

This file was deleted.

Loading

0 comments on commit 2852078

Please sign in to comment.