Skip to content

Commit

Permalink
chore: bump all package versions except typescript (#6696)
Browse files Browse the repository at this point in the history 
also updates some tests to support typing changes
  • Loading branch information
@imnotjames
imnotjames committed Sep 12, 2020
1 parent 8b68f40 commit 330262d
Show file tree
Hide file tree
Showing 9 changed files with 4,618 additions and 3,060 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
View file
Expand Up @@ -30,6 +30,7 @@ module.exports = {
"error"
],
"@typescript-eslint/type-annotation-spacing": "error",
"@typescript-eslint/no-redeclare": "error",
"eqeqeq": [
"error",
"smart"
Expand All @@ -48,7 +49,6 @@ module.exports = {
],
"id-match": "error",
"no-eval": "error",
"no-redeclare": "error",
"no-var": "error"
}
};
7,565 changes: 4,564 additions & 3,001 deletions package-lock.json
View file

Large diffs are not rendered by default.

90 changes: 45 additions & 45 deletions package.json
View file
Expand Up @@ -48,77 +48,77 @@
],
"devDependencies": {
"@types/app-root-path": "^1.2.4",
"@types/chai": "^4.1.2",
"@types/chai-as-promised": "7.1.0",
"@types/debug": "^4.1.2",
"@types/chai": "^4.2.0",
"@types/chai-as-promised": "^7.1.3",
"@types/debug": "^4.1.5",
"@types/dotenv": "^8.2.0",
"@types/js-yaml": "^3.12.5",
"@types/mkdirp": "^1.0.1",
"@types/mocha": "^5.2.6",
"@types/node": "^9.6.0",
"@types/rimraf": "^2.0.2",
"@types/mocha": "^8.0.3",
"@types/node": "^14.6.4",
"@types/rimraf": "^3.0.0",
"@types/sha.js": "^2.4.0",
"@types/sinon": "^7.0.8",
"@types/source-map-support": "^0.4.2",
"@types/sinon": "^9.0.5",
"@types/source-map-support": "^0.5.1",
"@types/xml2js": "^0.4.5",
"@types/yargs": "^12.0.9",
"@typescript-eslint/eslint-plugin": "^3.7.0",
"@typescript-eslint/parser": "^3.7.0",
"better-sqlite3": "^7.0.1",
"@types/yargs": "^15.0.4",
"@typescript-eslint/eslint-plugin": "^4.1.0",
"@typescript-eslint/parser": "^4.1.0",
"better-sqlite3": "^7.1.0",
"chai": "^4.2.0",
"chai-as-promised": "^7.1.1",
"class-transformer": "^0.3.1",
"conventional-changelog-angular": "^5.0.3",
"conventional-changelog-cli": "^2.0.21",
"del": "^3.0.0",
"eslint": "^7.5.0",
"gulp": "^4.0.0",
"conventional-changelog-angular": "^5.0.11",
"conventional-changelog-cli": "^2.1.0",
"del": "^5.1.0",
"eslint": "^7.8.1",
"gulp": "^4.0.2",
"gulp-eslint": "^6.0.0",
"gulp-istanbul": "^1.1.3",
"gulp-mocha": "^6.0.0",
"gulp-rename": "^1.2.2",
"gulp-mocha": "^7.0.2",
"gulp-rename": "^2.0.0",
"gulp-replace": "^1.0.0",
"gulp-shell": "^0.6.5",
"gulp-shell": "^0.8.0",
"gulp-sourcemaps": "^2.6.5",
"gulp-typescript": "^5.0.0",
"gulp-typescript": "^6.0.0-alpha.1",
"gulpclass": "^0.2.0",
"husky": "^1.3.1",
"lint-staged": "^8.1.4",
"mocha": "^6.1.4",
"mongodb": "^3.1.13",
"mssql": "^4.3.2",
"mysql": "^2.15.0",
"mysql2": "^1.6.5",
"husky": "^4.2.3",
"lint-staged": "^10.0.8",
"mocha": "^8.1.3",
"mongodb": "^3.5.4",
"mssql": "^6.1.0",
"mysql": "^2.18.1",
"mysql2": "^2.1.0",
"oracledb": "^5.0.0",
"pg": "^8.3.0",
"redis": "^2.8.0",
"redis": "^3.0.2",
"remap-istanbul": "^0.13.0",
"rimraf": "^2.6.3",
"sinon": "^7.2.5",
"sinon-chai": "^3.3.0",
"source-map-support": "^0.5.10",
"rimraf": "^3.0.2",
"sinon": "^9.0.0",
"sinon-chai": "^3.5.0",
"source-map-support": "^0.5.16",
"sql.js": "^1.3.0",
"sqlite3": "^4.0.9",
"ts-node": "^8.0.2",
"typeorm-aurora-data-api-driver": "^1.3.0",
"sqlite3": "^5.0.0",
"ts-node": "^9.0.0",
"typeorm-aurora-data-api-driver": "^1.4.0",
"typescript": "^3.3.3333"
},
"dependencies": {
"app-root-path": "^3.0.0",
"buffer": "^5.1.0",
"chalk": "^2.4.2",
"cli-highlight": "^2.0.0",
"buffer": "^5.5.0",
"chalk": "^4.1.0",
"cli-highlight": "^2.1.4",
"debug": "^4.1.1",
"dotenv": "^8.2.0",
"glob": "^7.1.2",
"js-yaml": "^3.13.1",
"mkdirp": "^1.0.3",
"glob": "^7.1.6",
"js-yaml": "^3.14.0",
"mkdirp": "^1.0.4",
"reflect-metadata": "^0.1.13",
"sha.js": "^2.4.11",
"tslib": "^1.9.0",
"xml2js": "^0.4.17",
"tslib": "^1.13.0",
"xml2js": "^0.4.23",
"yargonaut": "^1.1.2",
"yargs": "^13.2.1"
"yargs": "^16.0.3"
},
"lint-staged": {
"*.ts": [
Expand Down
5 changes: 0 additions & 5 deletions src/index.ts
View file
Expand Up @@ -139,24 +139,19 @@ export {InsertResult} from "./query-builder/result/InsertResult";
export {UpdateResult} from "./query-builder/result/UpdateResult";
export {DeleteResult} from "./query-builder/result/DeleteResult";
export {QueryRunner} from "./query-runner/QueryRunner";
export {EntityManager} from "./entity-manager/EntityManager";
export {MongoEntityManager} from "./entity-manager/MongoEntityManager";
export {Migration} from "./migration/Migration";
export {MigrationExecutor} from "./migration/MigrationExecutor";
export {MigrationInterface} from "./migration/MigrationInterface";
export {DefaultNamingStrategy} from "./naming-strategy/DefaultNamingStrategy";
export {NamingStrategyInterface} from "./naming-strategy/NamingStrategyInterface";
export {Repository} from "./repository/Repository";
export {TreeRepository} from "./repository/TreeRepository";
export {MongoRepository} from "./repository/MongoRepository";
export {FindOneOptions} from "./find-options/FindOneOptions";
export {FindManyOptions} from "./find-options/FindManyOptions";
export {InsertEvent} from "./subscriber/event/InsertEvent";
export {LoadEvent} from "./subscriber/event/LoadEvent";
export {UpdateEvent} from "./subscriber/event/UpdateEvent";
export {RemoveEvent} from "./subscriber/event/RemoveEvent";
export {EntitySubscriberInterface} from "./subscriber/EntitySubscriberInterface";
export {BaseEntity} from "./repository/BaseEntity";
export {EntitySchema} from "./entity-schema/EntitySchema";
export {EntitySchemaColumnOptions} from "./entity-schema/EntitySchemaColumnOptions";
export {EntitySchemaIndexOptions} from "./entity-schema/EntitySchemaIndexOptions";
Expand Down
2 changes: 1 addition & 1 deletion src/query-builder/ReturningResultsEntityUpdator.ts
View file
Expand Up @@ -66,7 +66,7 @@ export class ReturningResultsEntityUpdator {
.from(metadata.target, metadata.targetName)
.where(entityId)
.setOption("create-pojo") // use POJO because created object can contain default values, e.g. property = null and those properties maight be overridden by merge process
.getOne();
.getOne() as any;

if (loadedReturningColumns) {
this.queryRunner.manager.merge(metadata.target as any, entity, loadedReturningColumns);
Expand Down
4 changes: 2 additions & 2 deletions test/functional/repository/basic-methods/repository-basic-methods.ts
View file
Expand Up @@ -9,7 +9,7 @@ import {Question} from "./model/Question";
import {Blog} from "./entity/Blog";
import {Category} from "./entity/Category";
import {DeepPartial} from "../../../../src/common/DeepPartial";
import {EntitySchema} from "../../../../src";
import {EntitySchema, Repository} from "../../../../src";

describe("repository > basic methods", () => {

Expand Down Expand Up @@ -152,7 +152,7 @@ describe("repository > basic methods", () => {
}));

it("should create a new empty object if entity schema is used", () => connections.forEach(connection => {
const repository = connection.getRepository("User");
const repository = connection.getRepository("User") as Repository<User>;
repository.create().should.be.eql({});
}));

Expand Down
4 changes: 2 additions & 2 deletions test/github-issues/1014/issue-1014.ts
View file
Expand Up @@ -18,13 +18,13 @@ describe("github issues > #1014 Transaction doesn't rollback", () => {

const testEntity = new TestEntity();
testEntity.name = "Hello Test";
await connection.manager.save(testEntity);
await connection.manager.save(testEntity, { reload: true });

let error: any;
try {
await connection.transaction(manager => {
return PromiseUtils.settle([
manager.remove(TestEntity, { id: 1 }),
manager.remove(testEntity),
Promise.reject(new Error()),
new Promise((resolve, reject) => reject(new Error())),
]);
Expand Down
2 changes: 1 addition & 1 deletion test/github-issues/1123/issue-1123.ts
View file
Expand Up @@ -54,7 +54,7 @@ describe("github issues > #1123 load relation eagerly by setting isEager propert
const loadedPost = await connection.manager
.createQueryBuilder("Post", "post")
.where("post.id = :id", { id: 1 })
.getOne();
.getOne() as Post;

loadedPost!.should.be.eql({
id: 1,
Expand Down
4 changes: 2 additions & 2 deletions test/github-issues/4156/issue-4156.ts
View file
Expand Up @@ -41,7 +41,7 @@ describe("github issues > #4156 QueryExpressionMap doesn't clone all values corr
const [loadedPost1, loadedPost2] = await Promise.all([
qb.clone().where({ id: 1 }).getOne(),
qb.clone().where({ id: In([1]) }).getOne(),
]);
]) as Post[];

loadedPost1!.should.be.eql({
id: 1,
Expand All @@ -67,7 +67,7 @@ describe("github issues > #4156 QueryExpressionMap doesn't clone all values corr
const [loadedPost1, loadedPost2] = await Promise.all([
qb.clone().getOne(),
qb.clone().getOne(),
]);
]) as Post[];

loadedPost1!.should.be.eql({
id: 1,
Expand Down

0 comments on commit 330262d

Please sign in to comment.