From 9db85d76c031e137616fc79f6a155208844efa09 Mon Sep 17 00:00:00 2001 From: Lenz Weber Date: Sat, 27 Apr 2019 10:51:26 +0200 Subject: [PATCH] Revert commits for #260 and #250 to re-apply them manually after merging Revert "Enables custom resolver only if they're used in incremental mode (#260)" This reverts commit 3990a135cb93e336ef0890061f6c360e7efc2f4d. Revert "Adds support for custom resolvers to CompilerHost (#250) - fixes #181" This reverts commit dfd8933f23da7ca72aa3a864e5811725146323d4. --- CHANGELOG.md | 11 ++-- src/ApiIncrementalChecker.ts | 9 +-- src/CompilerHost.ts | 55 +--------------- src/IncrementalChecker.ts | 58 ++--------------- src/VueProgram.ts | 44 +------------ src/index.ts | 52 +++++---------- src/resolution.ts | 63 ------------------- src/service.ts | 17 +---- test/integration/helpers.js | 3 +- test/integration/index.spec.js | 30 --------- test/integration/project/src/defs.d.ts | 1 - test/integration/project/src/export.ts | 1 - .../project/src/pathResolutions.ts | 1 - .../project/src/weirdResolutions.ts | 5 -- ...tsconfig-weird-resolutions-with-paths.json | 9 --- .../project/tsconfig-weird-resolutions.json | 8 --- test/integration/project/weirdResolver.js | 11 ---- 17 files changed, 30 insertions(+), 348 deletions(-) delete mode 100644 src/resolution.ts delete mode 100644 test/integration/project/src/defs.d.ts delete mode 100644 test/integration/project/src/export.ts delete mode 100644 test/integration/project/src/pathResolutions.ts delete mode 100644 test/integration/project/src/weirdResolutions.ts delete mode 100644 test/integration/project/tsconfig-weird-resolutions-with-paths.json delete mode 100644 test/integration/project/tsconfig-weird-resolutions.json delete mode 100644 test/integration/project/weirdResolver.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 075d8cdb..5425aa9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,22 +1,19 @@ # [1.2.0-beta.4](https://github.com/Realytics/fork-ts-checker-webpack-plugin/compare/v1.2.0-beta.3@beta...v1.2.0-beta.4@beta) (2019-04-23) - ### Bug Fixes -* **tests:** fix linter tests that were doing nothing ([d078278](https://github.com/Realytics/fork-ts-checker-webpack-plugin/commit/d078278)) -* **tests:** linter tests - useTypescriptIncrementalApi usage ([e0020d6](https://github.com/Realytics/fork-ts-checker-webpack-plugin/commit/e0020d6)) - +- **tests:** fix linter tests that were doing nothing ([d078278](https://github.com/Realytics/fork-ts-checker-webpack-plugin/commit/d078278)) +- **tests:** linter tests - useTypescriptIncrementalApi usage ([e0020d6](https://github.com/Realytics/fork-ts-checker-webpack-plugin/commit/e0020d6)) ### Features -* **apiincrementalchecker:** improve generation of diagnostics ([ae80e5f](https://github.com/Realytics/fork-ts-checker-webpack-plugin/commit/ae80e5f)), closes [#257](https://github.com/Realytics/fork-ts-checker-webpack-plugin/issues/257) +- **apiincrementalchecker:** improve generation of diagnostics ([ae80e5f](https://github.com/Realytics/fork-ts-checker-webpack-plugin/commit/ae80e5f)), closes [#257](https://github.com/Realytics/fork-ts-checker-webpack-plugin/issues/257) # [1.2.0-beta.3](https://github.com/Realytics/fork-ts-checker-webpack-plugin/compare/v1.2.0-beta.2@beta...v1.2.0-beta.3@beta) (2019-04-22) - ### Bug Fixes -* **tests:** rework vue integration tests ([5ad2568](https://github.com/Realytics/fork-ts-checker-webpack-plugin/commit/5ad2568)) +- **tests:** rework vue integration tests ([5ad2568](https://github.com/Realytics/fork-ts-checker-webpack-plugin/commit/5ad2568)) # [1.2.0-beta.2](https://github.com/Realytics/fork-ts-checker-webpack-plugin/compare/v1.2.0-beta.1@beta...v1.2.0-beta.2@beta) (2019-04-22) diff --git a/src/ApiIncrementalChecker.ts b/src/ApiIncrementalChecker.ts index dfceab58..2945accd 100644 --- a/src/ApiIncrementalChecker.ts +++ b/src/ApiIncrementalChecker.ts @@ -13,7 +13,6 @@ import { } from './linterConfigHelpers'; import { NormalizedMessage } from './NormalizedMessage'; import { CompilerHost } from './CompilerHost'; -import { ResolveModuleName, ResolveTypeReferenceDirective } from './resolution'; import { FsHelper } from './FsHelper'; export class ApiIncrementalChecker implements IncrementalCheckerInterface { @@ -42,9 +41,7 @@ export class ApiIncrementalChecker implements IncrementalCheckerInterface { private context: string, private linterConfigFile: string | boolean, private linterAutoFix: boolean, - checkSyntacticErrors: boolean, - resolveModuleName: ResolveModuleName | undefined, - resolveTypeReferenceDirective: ResolveTypeReferenceDirective | undefined + checkSyntacticErrors: boolean ) { this.hasFixedConfig = typeof this.linterConfigFile === 'string'; @@ -54,9 +51,7 @@ export class ApiIncrementalChecker implements IncrementalCheckerInterface { typescript, programConfigFile, compilerOptions, - checkSyntacticErrors, - resolveModuleName, - resolveTypeReferenceDirective + checkSyntacticErrors ); } diff --git a/src/CompilerHost.ts b/src/CompilerHost.ts index f0bbc0e7..fba29832 100644 --- a/src/CompilerHost.ts +++ b/src/CompilerHost.ts @@ -2,7 +2,6 @@ import * as ts from 'typescript'; // Imported for types alone import { LinkedList } from './LinkedList'; import { VueProgram } from './VueProgram'; -import { ResolveModuleName, ResolveTypeReferenceDirective } from './resolution'; interface DirectoryWatchDelaySlot { events: { fileName: string }[]; @@ -52,29 +51,11 @@ export class CompilerHost private compilationStarted = false; - public resolveModuleNames: - | (( - moduleNames: string[], - containingFile: string, - reusedNames?: string[] | undefined, - redirectedReference?: ts.ResolvedProjectReference | undefined - ) => (ts.ResolvedModule | undefined)[]) - | undefined; - public resolveTypeReferenceDirectives: - | (( - typeReferenceDirectiveNames: string[], - containingFile: string, - redirectedReference?: ts.ResolvedProjectReference | undefined - ) => (ts.ResolvedTypeReferenceDirective | undefined)[]) - | undefined; - constructor( private typescript: typeof ts, programConfigFile: string, compilerOptions: ts.CompilerOptions, - checkSyntacticErrors: boolean, - userResolveModuleName?: ResolveModuleName, - userResolveTypeReferenceDirective?: ResolveTypeReferenceDirective + checkSyntacticErrors: boolean ) { this.tsHost = typescript.createWatchCompilerHost( programConfigFile, @@ -94,40 +75,6 @@ export class CompilerHost this.configFileName = this.tsHost.configFileName; this.optionsToExtend = this.tsHost.optionsToExtend || {}; - - if (userResolveModuleName) { - this.resolveModuleNames = ( - moduleNames: string[], - containingFile: string - ) => { - return moduleNames.map(moduleName => { - return userResolveModuleName( - this.typescript, - moduleName, - containingFile, - this.optionsToExtend, - this - ).resolvedModule; - }); - }; - } - - if (userResolveTypeReferenceDirective) { - this.resolveTypeReferenceDirectives = ( - typeDirectiveNames: string[], - containingFile: string - ) => { - return typeDirectiveNames.map(typeDirectiveName => { - return userResolveTypeReferenceDirective( - this.typescript, - typeDirectiveName, - containingFile, - this.optionsToExtend, - this - ).resolvedTypeReferenceDirective; - }); - }; - } } public async processChanges(): Promise<{ diff --git a/src/IncrementalChecker.ts b/src/IncrementalChecker.ts index a3492b7f..d284e003 100644 --- a/src/IncrementalChecker.ts +++ b/src/IncrementalChecker.ts @@ -14,11 +14,6 @@ import { import { WorkSet } from './WorkSet'; import { NormalizedMessage } from './NormalizedMessage'; import { CancellationToken } from './CancellationToken'; -import { - ResolveModuleName, - ResolveTypeReferenceDirective, - makeResolutionFunctions -} from './resolution'; import * as minimatch from 'minimatch'; import { VueProgram } from './VueProgram'; import { FsHelper } from './FsHelper'; @@ -64,11 +59,7 @@ export class IncrementalChecker implements IncrementalCheckerInterface { private workNumber: number = 0, private workDivision: number = 1, private checkSyntacticErrors: boolean = false, - private vue: boolean = false, - private resolveModuleName: ResolveModuleName | undefined, - private resolveTypeReferenceDirective: - | ResolveTypeReferenceDirective - | undefined + private vue: boolean = false ) { this.hasFixedConfig = typeof this.linterConfigFile === 'string'; } @@ -111,48 +102,11 @@ export class IncrementalChecker implements IncrementalCheckerInterface { programConfig: ts.ParsedCommandLine, files: FilesRegister, watcher: FilesWatcher, - oldProgram: ts.Program, - userResolveModuleName: ResolveModuleName | undefined, - userResolveTypeReferenceDirective: ResolveTypeReferenceDirective | undefined + oldProgram: ts.Program ) { const host = typescript.createCompilerHost(programConfig.options); const realGetSourceFile = host.getSourceFile; - const { - resolveModuleName, - resolveTypeReferenceDirective - } = makeResolutionFunctions( - userResolveModuleName, - userResolveTypeReferenceDirective - ); - - host.resolveModuleNames = (moduleNames, containingFile) => { - return moduleNames.map(moduleName => { - return resolveModuleName( - typescript, - moduleName, - containingFile, - programConfig.options, - host - ).resolvedModule; - }); - }; - - host.resolveTypeReferenceDirectives = ( - typeDirectiveNames, - containingFile - ) => { - return typeDirectiveNames.map(typeDirectiveName => { - return resolveTypeReferenceDirective( - typescript, - typeDirectiveName, - containingFile, - programConfig.options, - host - ).resolvedTypeReferenceDirective; - }); - }; - host.getSourceFile = (filePath, languageVersion, onError) => { // first check if watcher is watching file - if not - check it's mtime if (!watcher.isWatchingFile(filePath)) { @@ -261,9 +215,7 @@ export class IncrementalChecker implements IncrementalCheckerInterface { path.dirname(this.programConfigFile), this.files, this.watcher!, - this.program!, - this.resolveModuleName, - this.resolveTypeReferenceDirective + this.program! ); } @@ -281,9 +233,7 @@ export class IncrementalChecker implements IncrementalCheckerInterface { this.programConfig, this.files, this.watcher!, - this.program!, - this.resolveModuleName, - this.resolveTypeReferenceDirective + this.program! ); } diff --git a/src/VueProgram.ts b/src/VueProgram.ts index 9ba596c2..f5bd7b8b 100644 --- a/src/VueProgram.ts +++ b/src/VueProgram.ts @@ -4,11 +4,6 @@ import * as path from 'path'; import * as ts from 'typescript'; // import for types alone import { FilesRegister } from './FilesRegister'; import { FilesWatcher } from './FilesWatcher'; -import { - ResolveModuleName, - ResolveTypeReferenceDirective, - makeResolutionFunctions -} from './resolution'; // tslint:disable-next-line:no-implicit-dependencies import * as vueCompiler from 'vue-template-compiler'; @@ -125,48 +120,11 @@ export class VueProgram { basedir: string, files: FilesRegister, watcher: FilesWatcher, - oldProgram: ts.Program, - userResolveModuleName: ResolveModuleName | undefined, - userResolveTypeReferenceDirective: ResolveTypeReferenceDirective | undefined + oldProgram: ts.Program ) { const host = typescript.createCompilerHost(programConfig.options); const realGetSourceFile = host.getSourceFile; - const { - resolveModuleName, - resolveTypeReferenceDirective - } = makeResolutionFunctions( - userResolveModuleName, - userResolveTypeReferenceDirective - ); - - host.resolveModuleNames = (moduleNames, containingFile) => { - return moduleNames.map(moduleName => { - return resolveModuleName( - typescript, - moduleName, - containingFile, - programConfig.options, - host - ).resolvedModule; - }); - }; - - host.resolveTypeReferenceDirectives = ( - typeDirectiveNames, - containingFile - ) => { - return typeDirectiveNames.map(typeDirectiveName => { - return resolveTypeReferenceDirective( - typescript, - typeDirectiveName, - containingFile, - programConfig.options, - host - ).resolvedTypeReferenceDirective; - }); - }; - // We need a host that can parse Vue SFCs (single file components). host.getSourceFile = (filePath, languageVersion, onError) => { // first check if watcher is watching file - if not - check it's mtime diff --git a/src/index.ts b/src/index.ts index 6ed585af..d6c7c2f6 100644 --- a/src/index.ts +++ b/src/index.ts @@ -53,8 +53,6 @@ interface Options { vue: boolean; useTypescriptIncrementalApi: boolean; measureCompilationTime: boolean; - resolveModuleNameModule: string; - resolveTypeReferenceDirectiveModule: string; } /** @@ -101,8 +99,6 @@ class ForkTsCheckerWebpackPlugin { private colors: Chalk; private formatter: Formatter; private useTypescriptIncrementalApi: boolean; - private resolveModuleNameModule: string | undefined; - private resolveTypeReferenceDirectiveModule: string | undefined; private tsconfigPath?: string; private tslintPath?: string; @@ -162,9 +158,6 @@ class ForkTsCheckerWebpackPlugin { this.silent = options.silent === true; // default false this.async = options.async !== false; // default true this.checkSyntacticErrors = options.checkSyntacticErrors === true; // default false - this.resolveModuleNameModule = options.resolveModuleNameModule; - this.resolveTypeReferenceDirectiveModule = - options.resolveTypeReferenceDirectiveModule; this.workersNumber = options.workers || ForkTsCheckerWebpackPlugin.ONE_CPU; this.memoryLimit = options.memoryLimit || ForkTsCheckerWebpackPlugin.DEFAULT_MEMORY_LIMIT; @@ -576,34 +569,6 @@ class ForkTsCheckerWebpackPlugin { } private spawnService() { - const env: { [key: string]: string | undefined } = { - ...process.env, - TYPESCRIPT_PATH: this.typescriptPath, - TSCONFIG: this.tsconfigPath, - COMPILER_OPTIONS: JSON.stringify(this.compilerOptions), - TSLINT: this.tslintPath || (this.tslint ? 'true' : ''), - CONTEXT: this.compiler.options.context, - TSLINTAUTOFIX: String(this.tslintAutoFix), - WATCH: this.isWatching ? this.watchPaths.join('|') : '', - WORK_DIVISION: String(Math.max(1, this.workersNumber)), - MEMORY_LIMIT: String(this.memoryLimit), - CHECK_SYNTACTIC_ERRORS: String(this.checkSyntacticErrors), - USE_INCREMENTAL_API: String(this.useTypescriptIncrementalApi === true), - VUE: String(this.vue) - }; - - if (typeof this.resolveModuleNameModule !== 'undefined') { - env.RESOLVE_MODULE_NAME = this.resolveModuleNameModule; - } else { - delete env.RESOLVE_MODULE_NAME; - } - - if (typeof this.resolveTypeReferenceDirectiveModule !== 'undefined') { - env.RESOLVE_TYPE_REFERENCE_DIRECTIVE = this.resolveTypeReferenceDirectiveModule; - } else { - delete env.RESOLVE_TYPE_REFERENCE_DIRECTIVE; - } - this.service = childProcess.fork( path.resolve( __dirname, @@ -611,15 +576,28 @@ class ForkTsCheckerWebpackPlugin { ), [], { - env, execArgv: (this.workersNumber > 1 ? [] : ['--max-old-space-size=' + this.memoryLimit] ).concat(this.nodeArgs), + env: { + ...process.env, + TYPESCRIPT_PATH: this.typescriptPath, + TSCONFIG: this.tsconfigPath, + COMPILER_OPTIONS: JSON.stringify(this.compilerOptions), + TSLINT: this.tslintPath || (this.tslint ? 'true' : ''), + CONTEXT: this.compiler.options.context, + TSLINTAUTOFIX: this.tslintAutoFix, + WATCH: this.isWatching ? this.watchPaths.join('|') : '', + WORK_DIVISION: Math.max(1, this.workersNumber), + MEMORY_LIMIT: this.memoryLimit, + CHECK_SYNTACTIC_ERRORS: this.checkSyntacticErrors, + USE_INCREMENTAL_API: this.useTypescriptIncrementalApi === true, + VUE: this.vue + }, stdio: ['inherit', 'inherit', 'inherit', 'ipc'] } ); - this.serviceRpc = new RpcProvider(message => this.service!.send(message)); this.service.on('message', message => this.serviceRpc!.dispatch(message)); diff --git a/src/resolution.ts b/src/resolution.ts deleted file mode 100644 index ef67408a..00000000 --- a/src/resolution.ts +++ /dev/null @@ -1,63 +0,0 @@ -// tslint:disable-next-line:no-implicit-dependencies -import * as ts from 'typescript'; // Imported for types alone - -export type ResolveModuleName = ( - typescript: typeof ts, - moduleName: string, - containingFile: string, - compilerOptions: ts.CompilerOptions, - moduleResolutionHost: ts.ModuleResolutionHost -) => ts.ResolvedModuleWithFailedLookupLocations; - -export type ResolveTypeReferenceDirective = ( - typescript: typeof ts, - typeDirectiveName: string, - containingFile: string, - compilerOptions: ts.CompilerOptions, - moduleResolutionHost: ts.ModuleResolutionHost -) => ts.ResolvedTypeReferenceDirectiveWithFailedLookupLocations; - -export function makeResolutionFunctions( - resolveModuleName: ResolveModuleName | undefined, - resolveTypeReferenceDirective: ResolveTypeReferenceDirective | undefined -) { - resolveModuleName = - resolveModuleName || - (( - // tslint:disable-next-line:no-shadowed-variable - typescript, - moduleName, - containingFile, - // tslint:disable-next-line:no-shadowed-variable - compilerOptions, - moduleResolutionHost - ) => { - return typescript.resolveModuleName( - moduleName, - containingFile, - compilerOptions, - moduleResolutionHost - ); - }); - - resolveTypeReferenceDirective = - resolveTypeReferenceDirective || - (( - // tslint:disable-next-line:no-shadowed-variable - typescript, - typeDirectiveName, - containingFile, - // tslint:disable-next-line:no-shadowed-variable - compilerOptions, - moduleResolutionHost - ) => { - return typescript.resolveTypeReferenceDirective( - typeDirectiveName, - containingFile, - compilerOptions, - moduleResolutionHost - ); - }); - - return { resolveModuleName, resolveTypeReferenceDirective }; -} diff --git a/src/service.ts b/src/service.ts index ecca61b2..6e3fd60d 100644 --- a/src/service.ts +++ b/src/service.ts @@ -41,15 +41,6 @@ export const createNormalizedMessageFromDiagnostic = makeCreateNormalizedMessage export const createNormalizedMessageFromRuleFailure = makeCreateNormalizedMessageFromRuleFailure(); export const createNormalizedMessageFromInternalError = makeCreateNormalizedMessageFromInternalError(); -const resolveModuleName = process.env.RESOLVE_MODULE_NAME - ? require(process.env.RESOLVE_MODULE_NAME!).resolveModuleName - : undefined; -const resolveTypeReferenceDirective = process.env - .RESOLVE_TYPE_REFERENCE_DIRECTIVE - ? require(process.env.RESOLVE_TYPE_REFERENCE_DIRECTIVE!) - .resolveTypeReferenceDirective - : undefined; - const checker: IncrementalCheckerInterface = process.env.USE_INCREMENTAL_API === 'true' ? new ApiIncrementalChecker( @@ -61,9 +52,7 @@ const checker: IncrementalCheckerInterface = process.env.CONTEXT!, process.env.TSLINT === 'true' ? true : process.env.TSLINT! || false, process.env.TSLINTAUTOFIX === 'true', - process.env.CHECK_SYNTACTIC_ERRORS === 'true', - resolveModuleName, - resolveTypeReferenceDirective + process.env.CHECK_SYNTACTIC_ERRORS === 'true' ) : new IncrementalChecker( typescript, @@ -78,9 +67,7 @@ const checker: IncrementalCheckerInterface = parseInt(process.env.WORK_NUMBER!, 10) || 0, parseInt(process.env.WORK_DIVISION!, 10) || 1, process.env.CHECK_SYNTACTIC_ERRORS === 'true', - process.env.VUE === 'true', - resolveModuleName, - resolveTypeReferenceDirective + process.env.VUE === 'true' ); async function run(cancellationToken: CancellationToken) { diff --git a/test/integration/helpers.js b/test/integration/helpers.js index b913acff..5f748a4f 100644 --- a/test/integration/helpers.js +++ b/test/integration/helpers.js @@ -34,8 +34,7 @@ exports.createVueCompiler = async function(options) { resolve: { extensions: ['.ts', '.js', '.vue', '.json'], alias: { - '@': path.resolve(__dirname, './vue/src'), - surprise: './src/index.ts' + '@': path.resolve(__dirname, './vue/src') } }, module: { diff --git a/test/integration/index.spec.js b/test/integration/index.spec.js index b2dccae8..61f78c5a 100644 --- a/test/integration/index.spec.js +++ b/test/integration/index.spec.js @@ -37,8 +37,6 @@ function makeCommonTests(useTypescriptIncrementalApi) { return compiler.webpack; } - const skipIfIncremental = useTypescriptIncrementalApi ? it.skip : it; - /** * Implicitly check whether killService was called by checking that * the service property was set to undefined. @@ -153,34 +151,6 @@ function makeCommonTests(useTypescriptIncrementalApi) { }); }); - it('should support custom resolution', function(callback) { - var compiler = createCompiler({ - tsconfig: 'tsconfig-weird-resolutions.json', - resolveModuleNameModule: `${__dirname}/project/weirdResolver.js`, - resolveTypeReferenceDirectiveModule: `${__dirname}/project/weirdResolver.js` - }); - - compiler.run(function(err, stats) { - expect(stats.compilation.errors.length).to.be.eq(0); - callback(); - }); - }); - - skipIfIncremental('should support custom resolution w/ "paths"', function( - callback - ) { - var compiler = createCompiler({ - tsconfig: 'tsconfig-weird-resolutions-with-paths.json', - resolveModuleNameModule: `${__dirname}/project/weirdResolver.js`, - resolveTypeReferenceDirectiveModule: `${__dirname}/project/weirdResolver.js` - }); - - compiler.run(function(err, stats) { - expect(stats.compilation.errors.length).to.be.eq(0); - callback(); - }); - }); - it('should fix linting errors with tslintAutofix flag set to true', function(callback) { const fileName = 'lintingError1'; helpers.testLintAutoFixTest( diff --git a/test/integration/project/src/defs.d.ts b/test/integration/project/src/defs.d.ts deleted file mode 100644 index 5bc7fee2..00000000 --- a/test/integration/project/src/defs.d.ts +++ /dev/null @@ -1 +0,0 @@ -declare function helloWorld(): void; diff --git a/test/integration/project/src/export.ts b/test/integration/project/src/export.ts deleted file mode 100644 index 9d0bfc44..00000000 --- a/test/integration/project/src/export.ts +++ /dev/null @@ -1 +0,0 @@ -export const fortyTwo = 42; diff --git a/test/integration/project/src/pathResolutions.ts b/test/integration/project/src/pathResolutions.ts deleted file mode 100644 index 328c3a21..00000000 --- a/test/integration/project/src/pathResolutions.ts +++ /dev/null @@ -1 +0,0 @@ -import 'surprise'; diff --git a/test/integration/project/src/weirdResolutions.ts b/test/integration/project/src/weirdResolutions.ts deleted file mode 100644 index ed316416..00000000 --- a/test/integration/project/src/weirdResolutions.ts +++ /dev/null @@ -1,5 +0,0 @@ -/// - -import { fortyTwo } from 'please-find-my-export'; - -helloWorld(); diff --git a/test/integration/project/tsconfig-weird-resolutions-with-paths.json b/test/integration/project/tsconfig-weird-resolutions-with-paths.json deleted file mode 100644 index d88e9aa2..00000000 --- a/test/integration/project/tsconfig-weird-resolutions-with-paths.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "compilerOptions": { - "lib": ["es2016"], - "paths": { - "surprise": "./index.ts" - } - }, - "include": ["src/pathResolutions.ts", "src/weirdResolutions.ts"] -} diff --git a/test/integration/project/tsconfig-weird-resolutions.json b/test/integration/project/tsconfig-weird-resolutions.json deleted file mode 100644 index 057019f2..00000000 --- a/test/integration/project/tsconfig-weird-resolutions.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "compilerOptions": { - "lib": ["es2016"], - }, - "include": [ - "src/weirdResolutions.ts" - ] -} diff --git a/test/integration/project/weirdResolver.js b/test/integration/project/weirdResolver.js deleted file mode 100644 index 5cb1e55d..00000000 --- a/test/integration/project/weirdResolver.js +++ /dev/null @@ -1,11 +0,0 @@ -exports.resolveModuleName = function() { - return { resolvedModule: { resolvedFileName: `${__dirname}/src/export.ts` } }; -}; - -exports.resolveTypeReferenceDirective = function() { - return { - resolvedTypeReferenceDirective: { - resolvedFileName: `${__dirname}/src/defs.d.ts` - } - }; -};