Skip to content

Feature/upgrade testpack to ts4 #1189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Sep 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
20 changes: 8 additions & 12 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: CI
name: Continuous Integration (build and test)

on: [push, pull_request]

jobs:
comparison_test:
name: Comparison Test
name: Ubuntu Comparison Tests
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
Expand All @@ -17,13 +17,13 @@ jobs:
run: yarn build

- name: install typescript
run: yarn add typescript@3.9.3
run: yarn add typescript@4.0.3

- name: test
run: sudo yarn comparison-tests

windows:
name: Windows Test
name: Windows Comparison Tests
runs-on: windows-latest
timeout-minutes: 25
steps:
Expand All @@ -44,24 +44,20 @@ jobs:
working-directory: C:\source\ts-loader

- name: install typescript
run: yarn add typescript@3.9.3
run: yarn add typescript@4.0.3
working-directory: C:\source\ts-loader

- name: test
run: yarn comparison-tests
working-directory: C:\source\ts-loader

execution_test:
name: Execution Test
name: Execution Tests
strategy:
matrix:
os: [ubuntu]
os: [ubuntu, windows]
node: [10, 12, 14]
ts: [3.6.5, 3.7.5, 3.8.3, 3.9.3, next]
include:
- os: windows
node: 14
ts: 3.9.3
ts: [3.6.5, 3.7.5, 3.8.3, 3.9.3, 4.0.3, next]
runs-on: ${{ matrix.os }}-latest
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ on:
release:
types: [published]

name: build, test and publish
name: Release (build, test and publish)

jobs:
build_test_and_publish:
Expand Down
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ install:
- yarn lint
- yarn add $TYPESCRIPT
env:
- TYPESCRIPT=typescript@3.9.3
- TYPESCRIPT=typescript@4.0.3
- TYPESCRIPT=typescript@next
- [email protected]
- [email protected]
- [email protected]
- [email protected]
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# TypeScript loader for webpack

[![npm version](https://img.shields.io/npm/v/ts-loader.svg)](https://www.npmjs.com/package/ts-loader)
[![Linux Build Status](https://travis-ci.org/TypeStrong/ts-loader.svg?branch=master)](https://travis-ci.org/TypeStrong/ts-loader)
[![Windows Build Status](https://ci.appveyor.com/api/projects/status/bjh0r0d4ckspgkh9/branch/master?svg=true)](https://ci.appveyor.com/project/JohnReilly/ts-loader/branch/master)
[![Build Status](https://travis-ci.org/TypeStrong/ts-loader.svg?branch=master)](https://travis-ci.org/TypeStrong/ts-loader)
[![Downloads](http://img.shields.io/npm/dm/ts-loader.svg)](https://npmjs.org/package/ts-loader)
[![node version](https://img.shields.io/node/v/ts-loader.svg)](https://www.npmjs.com/package/ts-loader)
[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
[![Join the chat at https://gitter.im/TypeStrong/ts-loader](https://img.shields.io/badge/gitter-join%20chat-brightgreen.svg)](https://gitter.im/TypeStrong/ts-loader)

<br />
<p align="center">
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
"@types/node": "*",
"@types/semver": "^6.0.0",
"@types/webpack": "^4.4.30",
"@typescript-eslint/eslint-plugin": "^3.0.0",
"@typescript-eslint/parser": "^3.0.0",
"@typescript-eslint/eslint-plugin": "^4.0.0",
"@typescript-eslint/parser": "^4.0.0",
"babel": "^6.0.0",
"babel-core": "^6.0.0",
"babel-loader": "^7.0.0",
Expand Down Expand Up @@ -96,7 +96,7 @@
"mocha": "^6.0.0",
"prettier": "^2.0.5",
"rimraf": "^2.6.2",
"typescript": "^3.6.2",
"typescript": "^4.0.0",
"webpack": "^4.5.0",
"webpack-cli": "^3.1.1"
},
Expand Down
59 changes: 0 additions & 59 deletions test/comparison-tests/aliasResolution/expectedOutput-1.6/bundle.js

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

59 changes: 0 additions & 59 deletions test/comparison-tests/aliasResolution/expectedOutput-1.7/bundle.js

This file was deleted.

This file was deleted.

This file was deleted.

Loading