Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into soft-remove
Browse files Browse the repository at this point in the history
  • Loading branch information
klalex committed Jan 27, 2021
2 parents 1643757 + 42f6a24 commit ef76832
Show file tree
Hide file tree
Showing 13 changed files with 1,270 additions and 901 deletions.
62 changes: 62 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# This is a basic workflow to help you get started with Actions

name: Tests

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [master]
pull_request:
branches: [master]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
test:
# The type of runner that the job will run on
runs-on: ubuntu-latest
env:
COMPOSE_FILE: ./docker-compose.yml

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

# Runs a single command using the runners shell
- name: build docker db
run: docker-compose up -d

- name: install
run: yarn bootstrap

- name: build
run: yarn build

- name: check docker
run: docker-compose up -d

# Runs a set of commands using the runners shell
- name: tests
run: yarn test:coverage

- name: Coveralls Parallel
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.github_token }}
flag-name: run-${{ matrix.test_number }}
parallel: true

coverage:
needs: test
runs-on: ubuntu-latest
steps:
- name: Coveralls coverage
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.github_token }}
parallel-finished: true
23 changes: 0 additions & 23 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<div align="center">
<a href="https://travis-ci.org/nestjsx/crud">
<img src="https://travis-ci.org/nestjsx/crud.svg?branch=master" alt="Build" />
<img src="https://github.com/nestjsx/crud/workflows/Tests/badge.svg" alt="Build" />
</a>
<a href="https://coveralls.io/github/nestjsx/crud?branch=master">
<img src="https://coveralls.io/repos/github/nestjsx/crud/badge.svg" alt="Coverage" />
Expand Down
2 changes: 1 addition & 1 deletion integration/crud-typeorm/seeds.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ClassType } from '@nestjsx/util';
import { plainToClass } from 'class-transformer';
import { MigrationInterface, Repository, QueryRunner } from 'typeorm';
import { ClassType } from 'class-transformer/ClassTransformer';
import { Company } from './companies';
import { Project, UserProject } from './projects';
import { Name, User } from './users';
Expand Down
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,33 +58,33 @@
"peerDependencies": {},
"optionalDependencies": {},
"dependencies": {
"@nestjs/common": "^7.5.1",
"@nestjs/core": "^7.5.1",
"@nestjs/platform-express": "7.0.3",
"@nestjs/swagger": "4.4.0",
"@nestjs/testing": "7.0.3",
"@nestjs/typeorm": "^7.1.5",
"@nestjs/common": "7.6.6",
"@nestjs/core": "7.6.6",
"@nestjs/platform-express": "7.6.6",
"@nestjs/swagger": "4.7.12",
"@nestjs/testing": "7.6.6",
"@nestjs/typeorm": "7.1.5",
"@nuxtjs/opencollective": "0.2.2",
"@types/jest": "24.0.18",
"@types/node": "12.7.5",
"@types/qs": "6.5.3",
"@types/supertest": "2.0.8",
"class-transformer": "0.2.3",
"class-validator": "0.10.0",
"class-transformer": "0.3.2",
"class-validator": "0.13.1",
"commitizen": "4.0.3",
"coveralls": "3.0.6",
"cz-conventional-changelog": "3.0.2",
"husky": "3.0.5",
"jest": "24.9.0",
"jest-extended": "0.11.2",
"lerna": "3.16.4",
"mysql": "^2.18.1",
"mysql": "2.18.1",
"nodemon": "1.19.2",
"npm-check": "5.9.0",
"nps": "5.9.8",
"nps-utils": "1.7.0",
"pg": "^8.4.2",
"pluralize": "^8.0.0",
"pg": "8.5.1",
"pluralize": "8.0.0",
"prettier": "1.18.2",
"pretty-quick": "1.11.1",
"qs": "6.8.0",
Expand All @@ -93,14 +93,14 @@
"rimraf": "3.0.0",
"rxjs": "6.5.3",
"supertest": "4.0.2",
"swagger-ui-express": "4.1.0",
"swagger-ui-express": "4.1.6",
"ts-jest": "24.1.0",
"ts-node": "8.3.0",
"tsconfig-extends": "1.0.1",
"tsconfig-paths": "3.9.0",
"tslint": "5.20.0",
"tslint-config-prettier": "1.18.0",
"typeorm": "0.2.29",
"typeorm": "0.2.30",
"typescript": "3.6.3",
"validate-commit-msg": "2.14.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/crud-request/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<div align="center">
<a href="https://travis-ci.org/nestjsx/crud">
<img src="https://travis-ci.org/nestjsx/crud.svg?branch=master" alt="Build" />
<img src="https://github.com/nestjsx/crud/workflows/Tests/badge.svg" alt="Build" />
</a>
<a href="https://coveralls.io/github/nestjsx/crud?branch=master">
<img src="https://coveralls.io/repos/github/nestjsx/crud/badge.svg" alt="Coverage" />
Expand Down
2 changes: 1 addition & 1 deletion packages/crud-typeorm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<div align="center">
<a href="https://travis-ci.org/nestjsx/crud">
<img src="https://travis-ci.org/nestjsx/crud.svg?branch=master" alt="Build" />
<img src="https://github.com/nestjsx/crud/workflows/Tests/badge.svg" alt="Build" />
</a>
<a href="https://coveralls.io/github/nestjsx/crud?branch=master">
<img src="https://coveralls.io/repos/github/nestjsx/crud/badge.svg" alt="Coverage" />
Expand Down
2 changes: 1 addition & 1 deletion packages/crud-typeorm/src/typeorm-crud.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
ComparisonOperator,
} from '@nestjsx/crud-request';
import {
ClassType,
hasLength,
isArrayFull,
isObject,
Expand All @@ -28,7 +29,6 @@ import {
} from '@nestjsx/util';
import { oO } from '@zmotivat0r/o0';
import { plainToClass } from 'class-transformer';
import { ClassType } from 'class-transformer/ClassTransformer';
import {
Brackets,
ObjectLiteral,
Expand Down
2 changes: 1 addition & 1 deletion packages/crud/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<div align="center">
<a href="https://travis-ci.org/nestjsx/crud">
<img src="https://travis-ci.org/nestjsx/crud.svg?branch=master" alt="Build" />
<img src="https://github.com/nestjsx/crud/workflows/Tests/badge.svg" alt="Build" />
</a>
<a href="https://coveralls.io/github/nestjsx/crud?branch=master">
<img src="https://coveralls.io/repos/github/nestjsx/crud/badge.svg" alt="Coverage" />
Expand Down
2 changes: 1 addition & 1 deletion packages/util/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<div align="center">
<a href="https://travis-ci.org/nestjsx/crud">
<img src="https://travis-ci.org/nestjsx/crud.svg?branch=master" alt="Build" />
<img src="https://github.com/nestjsx/crud/workflows/Tests/badge.svg" alt="Build" />
</a>
<a href="https://coveralls.io/github/nestjsx/crud?branch=master">
<img src="https://coveralls.io/repos/github/nestjsx/crud/badge.svg" alt="Coverage" />
Expand Down
3 changes: 3 additions & 0 deletions packages/util/src/types/class.type.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export type ClassType<T> = {
new (...args: any[]): T;
};
1 change: 1 addition & 0 deletions packages/util/src/types/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export * from './class.type';
export * from './object-literal.type';
Loading

0 comments on commit ef76832

Please sign in to comment.