Update code from merge

ark120202 · ark120202 · commit ac9e1eec30a8 · 2020-03-20T00:15:59.000Z
diff --git a/src/transpilation/utils.ts b/src/transpilation/utils.ts
@@ -27,7 +27,6 @@ export function resolvePlugin(
         return { error: diagnosticFactories.couldNotResolveFrom(kind, query, basedir) };
     }
 
-    // tslint:disable-next-line: deprecation
     const hasNoRequireHook = require.extensions[".ts"] === undefined;
     if (hasNoRequireHook && (resolved.endsWith(".ts") || resolved.endsWith(".tsx"))) {
         try {
diff --git a/src/utils.ts b/src/utils.ts
@@ -7,8 +7,8 @@ export const createDiagnosticFactoryWithCode = <
 >(
     code: number,
     create: T
-) => {
-    return Object.assign(
+) =>
+    Object.assign(
         (...args: Parameters<T>): ts.Diagnostic => ({
             file: undefined,
             start: undefined,
@@ -20,7 +20,6 @@ export const createDiagnosticFactoryWithCode = <
         }),
         { code }
     );
-};
 
 let serialDiagnosticCodeCounter = 100000;
 export const createSerialDiagnosticFactory = <
diff --git a/test/transpile/plugins/printer.ts b/test/transpile/plugins/printer.ts
@@ -8,5 +8,5 @@ const plugin: tstl.Plugin = {
     },
 };
 
-// tslint:disable-next-line: no-default-export
+// eslint-disable-next-line import/no-default-export
 export default plugin;
diff --git a/test/transpile/plugins/visitor-super.ts b/test/transpile/plugins/visitor-super.ts
@@ -15,5 +15,5 @@ const plugin: tstl.Plugin = {
     },
 };
 
-// tslint:disable-next-line: no-default-export
+// eslint-disable-next-line import/no-default-export
 export default plugin;
diff --git a/test/transpile/plugins/visitor.ts b/test/transpile/plugins/visitor.ts
@@ -7,5 +7,5 @@ const plugin: tstl.Plugin = {
     },
 };
 
-// tslint:disable-next-line: no-default-export
+// eslint-disable-next-line import/no-default-export
 export default plugin;
diff --git a/test/transpile/resolve-plugin/ts.ts b/test/transpile/resolve-plugin/ts.ts
@@ -1,2 +1,2 @@
-// tslint:disable-next-line: no-default-export
+// eslint-disable-next-line import/no-default-export
 export default true;

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ export function resolvePlugin(`
`27`	`27`	`return { error: diagnosticFactories.couldNotResolveFrom(kind, query, basedir) };`
`28`	`28`	`}`
`29`	`29`
`30`		`- // tslint:disable-next-line: deprecation`
`31`	`30`	`const hasNoRequireHook = require.extensions[".ts"] === undefined;`
`32`	`31`	`if (hasNoRequireHook && (resolved.endsWith(".ts") \|\| resolved.endsWith(".tsx"))) {`
`33`	`32`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-// tslint:disable-next-line: no-default-export`
	`1`	`+// eslint-disable-next-line import/no-default-export`
`2`	`2`	`export default true;`