Undo the over-zealous autoformatting from VSCode

This commit is contained in:
zackzachariah 2019-03-01 00:08:24 +00:00
parent 96309620bb
commit 910f0f39d4

View File

@ -2,7 +2,7 @@
///<reference path="node_modules/@types/chai/index.d.ts"/>
///<reference path="node_modules/@types/mocha/index.d.ts"/>
import { Gulpclass, Task, SequenceTask, MergedTask } from "gulpclass";
import {Gulpclass, Task, SequenceTask, MergedTask} from "gulpclass";
const gulp = require("gulp");
const del = require("del");
@ -20,6 +20,7 @@ const args = require("yargs").argv;
@Gulpclass()
export class Gulpfile {
// -------------------------------------------------------------------------
// General tasks
// -------------------------------------------------------------------------
@ -45,8 +46,7 @@ export class Gulpfile {
*/
@Task()
compile() {
return gulp
.src("package.json", { read: false })
return gulp.src("package.json", { read: false })
.pipe(shell(["npm run compile"]));
}
@ -59,16 +59,15 @@ export class Gulpfile {
*/
@Task()
browserCopySources() {
return gulp
.src([
"./src/**/*.ts",
"!./src/commands/*.ts",
"!./src/cli.ts",
"!./src/typeorm.ts",
"!./src/typeorm-model-shim.ts",
"!./src/platform/PlatformTools.ts"
])
.pipe(gulp.dest("./build/browser/src"));
return gulp.src([
"./src/**/*.ts",
"!./src/commands/*.ts",
"!./src/cli.ts",
"!./src/typeorm.ts",
"!./src/typeorm-model-shim.ts",
"!./src/platform/PlatformTools.ts"
])
.pipe(gulp.dest("./build/browser/src"));
}
/**
@ -76,8 +75,7 @@ export class Gulpfile {
*/
@Task()
browserCopyPlatformTools() {
return gulp
.src("./src/platform/BrowserPlatformTools.template")
return gulp.src("./src/platform/BrowserPlatformTools.template")
.pipe(rename("PlatformTools.ts"))
.pipe(gulp.dest("./build/browser/src/platform"));
}
@ -87,8 +85,7 @@ export class Gulpfile {
*/
@Task()
browserCopyDisabledDriversDummy() {
return gulp
.src("./src/platform/BrowserDisabledDriversDummy.template")
return gulp.src("./src/platform/BrowserDisabledDriversDummy.template")
.pipe(rename("BrowserDisabledDriversDummy.ts"))
.pipe(gulp.dest("./build/browser/src/platform"));
}
@ -97,34 +94,26 @@ export class Gulpfile {
browserCompile() {
const tsProject = ts.createProject("tsconfig.json", {
module: "es2015",
lib: ["es5", "es6", "dom"],
"lib": ["es5", "es6", "dom"],
typescript: require("typescript")
});
const tsResult = gulp
.src([
"./build/browser/src/**/*.ts",
"./node_modules/reflect-metadata/**/*.d.ts",
"./node_modules/@types/**/*.ts"
])
const tsResult = gulp.src(["./build/browser/src/**/*.ts", "./node_modules/reflect-metadata/**/*.d.ts", "./node_modules/@types/**/*.ts"])
.pipe(sourcemaps.init())
.pipe(tsProject());
return [
tsResult.dts.pipe(gulp.dest("./build/package/browser")),
tsResult.js
.pipe(
sourcemaps.write(".", {
sourceRoot: "",
includeContent: true
})
)
.pipe(sourcemaps.write(".", { sourceRoot: "", includeContent: true }))
.pipe(gulp.dest("./build/package/browser"))
];
}
@Task()
browserClearPackageDirectory(cb: Function) {
return del(["./build/browser/**"]);
return del([
"./build/browser/**"
]);
}
// -------------------------------------------------------------------------
@ -136,9 +125,10 @@ export class Gulpfile {
*/
@Task()
packagePublish() {
return gulp
.src("package.json", { read: false })
.pipe(shell(["cd ./build/package && npm publish"]));
return gulp.src("package.json", { read: false })
.pipe(shell([
"cd ./build/package && npm publish"
]));
}
/**
@ -146,9 +136,10 @@ export class Gulpfile {
*/
@Task()
packagePublishNext() {
return gulp
.src("package.json", { read: false })
.pipe(shell(["cd ./build/package && npm publish --tag next"]));
return gulp.src("package.json", { read: false })
.pipe(shell([
"cd ./build/package && npm publish --tag next"
]));
}
/**
@ -156,23 +147,15 @@ export class Gulpfile {
*/
@MergedTask()
packageCompile() {
const tsProject = ts.createProject("tsconfig.json", {
typescript: require("typescript")
});
const tsResult = gulp
.src(["./src/**/*.ts", "./node_modules/@types/**/*.ts"])
const tsProject = ts.createProject("tsconfig.json", { typescript: require("typescript") });
const tsResult = gulp.src(["./src/**/*.ts", "./node_modules/@types/**/*.ts"])
.pipe(sourcemaps.init())
.pipe(tsProject());
return [
tsResult.dts.pipe(gulp.dest("./build/package")),
tsResult.js
.pipe(
sourcemaps.write(".", {
sourceRoot: "",
includeContent: true
})
)
.pipe(sourcemaps.write(".", { sourceRoot: "", includeContent: true }))
.pipe(gulp.dest("./build/package"))
];
}
@ -182,8 +165,7 @@ export class Gulpfile {
*/
@Task()
packageMoveCompiledFiles() {
return gulp
.src("./build/package/src/**/*")
return gulp.src("./build/package/src/**/*")
.pipe(gulp.dest("./build/package"));
}
@ -192,8 +174,7 @@ export class Gulpfile {
*/
@Task()
packageReplaceReferences() {
return gulp
.src("./build/package/**/*.d.ts")
return gulp.src("./build/package/**/*.d.ts")
.pipe(replace(`/// <reference types="node" />`, ""))
.pipe(replace(`/// <reference types="chai" />`, ""))
.pipe(gulp.dest("./build/package"));
@ -204,7 +185,9 @@ export class Gulpfile {
*/
@Task()
packageClearPackageDirectory(cb: Function) {
return del(["build/package/src/**"], cb);
return del([
"build/package/src/**"
], cb);
}
/**
@ -212,9 +195,8 @@ export class Gulpfile {
*/
@Task()
packagePreparePackageFile() {
return gulp
.src("./package.json")
.pipe(replace('"private": true,', '"private": false,'))
return gulp.src("./package.json")
.pipe(replace("\"private\": true,", "\"private\": false,"))
.pipe(gulp.dest("./build/package"));
}
@ -223,8 +205,7 @@ export class Gulpfile {
*/
@Task()
packageCopyReadme() {
return gulp
.src("./README.md")
return gulp.src("./README.md")
.pipe(replace(/```typescript([\s\S]*?)```/g, "```javascript$1```"))
.pipe(gulp.dest("./build/package"));
}
@ -234,11 +215,7 @@ export class Gulpfile {
*/
@Task()
packageCopyShims() {
return gulp
.src([
"./extra/typeorm-model-shim.js",
"./extra/typeorm-class-transformer-shim.js"
])
return gulp.src(["./extra/typeorm-model-shim.js", "./extra/typeorm-class-transformer-shim.js"])
.pipe(gulp.dest("./build/package"));
}
@ -249,11 +226,7 @@ export class Gulpfile {
package() {
return [
"clean",
[
"browserCopySources",
"browserCopyPlatformTools",
"browserCopyDisabledDriversDummy"
],
["browserCopySources", "browserCopyPlatformTools", "browserCopyDisabledDriversDummy"],
["packageCompile", "browserCompile"],
"packageMoveCompiledFiles",
[
@ -263,7 +236,7 @@ export class Gulpfile {
"packagePreparePackageFile",
"packageCopyReadme",
"packageCopyShims"
]
],
];
}
@ -292,20 +265,17 @@ export class Gulpfile {
*/
@Task()
tslint() {
return gulp
.src(["./src/**/*.ts", "./test/**/*.ts", "./sample/**/*.ts"])
return gulp.src(["./src/**/*.ts", "./test/**/*.ts", "./sample/**/*.ts"])
.pipe(
tslint({
formatter: "stylish"
})
)
.pipe(
tslint.report({
emitError: true,
sort: true,
bell: true
})
);
.pipe(tslint.report({
emitError: true,
sort: true,
bell: true
}));
}
/**
@ -313,8 +283,7 @@ export class Gulpfile {
*/
@Task()
coveragePre() {
return gulp
.src(["./build/compiled/src/**/*.js"])
return gulp.src(["./build/compiled/src/**/*.js"])
.pipe(istanbul())
.pipe(istanbul.hookRequire());
}
@ -324,8 +293,7 @@ export class Gulpfile {
*/
@Task()
coveragePost() {
return gulp
.src(["./build/compiled/test/**/*.js"])
return gulp.src(["./build/compiled/test/**/*.js"])
.pipe(istanbul.writeReports());
}
@ -338,19 +306,17 @@ export class Gulpfile {
chai.use(require("sinon-chai"));
chai.use(require("chai-as-promised"));
return gulp.src(["./build/compiled/test/**/*.js"]).pipe(
mocha({
return gulp.src(["./build/compiled/test/**/*.js"])
.pipe(mocha({
bail: true,
grep: !!args.grep ? new RegExp(args.grep) : undefined,
timeout: 15000
})
);
}));
}
@Task()
coverageRemap() {
return gulp
.src("./coverage/coverage-final.json")
return gulp.src("./coverage/coverage-final.json")
.pipe(remapIstanbul())
.pipe(gulp.dest("./coverage"));
}
@ -392,9 +358,9 @@ export class Gulpfile {
@Task()
createTravisOrmConfig() {
return gulp
.src("./ormconfig.travis.json")
return gulp.src("./ormconfig.travis.json")
.pipe(rename("ormconfig.json"))
.pipe(gulp.dest("./"));
}
}