From 6b43a0fa26502da00e2f67a5a3e600128ae3a23a Mon Sep 17 00:00:00 2001 From: e-cloud Date: Fri, 11 Nov 2016 11:06:03 +0800 Subject: [PATCH] fix: Object type, relative paths in test and repo link --- enhanced-resolve/enhanced-resolve-tests.ts | 6 +- enhanced-resolve/index.d.ts | 2 +- .../lib/ConcordExtensionsPlugin.d.ts | 4 +- enhanced-resolve/lib/ConcordMainPlugin.d.ts | 4 +- .../lib/ConcordModulesPlugin.d.ts | 4 +- enhanced-resolve/lib/Storage.d.ts | 8 +- enhanced-resolve/lib/UnsafeCachePlugin.d.ts | 4 +- enhanced-resolve/lib/lib-tests.ts | 82 +++++++++++-------- 8 files changed, 65 insertions(+), 49 deletions(-) diff --git a/enhanced-resolve/enhanced-resolve-tests.ts b/enhanced-resolve/enhanced-resolve-tests.ts index ed04190fbb..6588bb125b 100644 --- a/enhanced-resolve/enhanced-resolve-tests.ts +++ b/enhanced-resolve/enhanced-resolve-tests.ts @@ -1,7 +1,7 @@ import resolve = require('enhanced-resolve'); -import { Context } from './lib/concord'; -import { ResolveResult } from './lib/common-types' -import Resolver = require('./lib/Resolver') +import { Context } from 'enhanced-resolve/lib/concord'; +import { ResolveResult } from 'enhanced-resolve/lib/common-types' +import Resolver = require('enhanced-resolve/lib/Resolver') resolve('lib', 'string', function (err) { }); diff --git a/enhanced-resolve/index.d.ts b/enhanced-resolve/index.d.ts index 56406744d2..142e644bd1 100644 --- a/enhanced-resolve/index.d.ts +++ b/enhanced-resolve/index.d.ts @@ -1,5 +1,5 @@ // Type definitions for enhanced-resolve v2.3.0 -// Project: http://github.com/webpack/tapable.git +// Project: http://github.com/webpack/enhanced-resolve.git // Definitions by: e-cloud // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped diff --git a/enhanced-resolve/lib/ConcordExtensionsPlugin.d.ts b/enhanced-resolve/lib/ConcordExtensionsPlugin.d.ts index 84078c327a..89d0880350 100644 --- a/enhanced-resolve/lib/ConcordExtensionsPlugin.d.ts +++ b/enhanced-resolve/lib/ConcordExtensionsPlugin.d.ts @@ -1,10 +1,10 @@ import Resolver = require('./Resolver'); declare class ConcordExtensionsPlugin { source: string; - options: Object; + options: {}; target: string; - constructor(source: string, options: Object, target: string); + constructor(source: string, options: {}, target: string); apply(resolver: Resolver): void; } diff --git a/enhanced-resolve/lib/ConcordMainPlugin.d.ts b/enhanced-resolve/lib/ConcordMainPlugin.d.ts index edbf1627a0..9d2fdf3d44 100644 --- a/enhanced-resolve/lib/ConcordMainPlugin.d.ts +++ b/enhanced-resolve/lib/ConcordMainPlugin.d.ts @@ -1,10 +1,10 @@ import Resolver = require('./Resolver'); declare class ConcordMainPlugin { source: string; - options: Object; + options: {}; target: string; - constructor(source: string, options: Object, target: string); + constructor(source: string, options: {}, target: string); apply(resolver: Resolver): void; } diff --git a/enhanced-resolve/lib/ConcordModulesPlugin.d.ts b/enhanced-resolve/lib/ConcordModulesPlugin.d.ts index c0835be799..3afbd32a9c 100644 --- a/enhanced-resolve/lib/ConcordModulesPlugin.d.ts +++ b/enhanced-resolve/lib/ConcordModulesPlugin.d.ts @@ -1,10 +1,10 @@ import Resolver = require('./Resolver'); declare class ConcordModulesPlugin { source: string; - options: Object; + options: {}; target: string; - constructor(source: string, options: Object, target: string); + constructor(source: string, options: {}, target: string); apply(resolver: Resolver): void; } diff --git a/enhanced-resolve/lib/Storage.d.ts b/enhanced-resolve/lib/Storage.d.ts index 17557d61a7..4260b42ee7 100644 --- a/enhanced-resolve/lib/Storage.d.ts +++ b/enhanced-resolve/lib/Storage.d.ts @@ -3,8 +3,12 @@ import { CommonFileSystemMethod } from './common-types'; declare class Storage { duration: number; - running: Object; - data: Object; + running: { + [name: string]: ((...args: any[]) => any)[] + }; + data: { + [name: string]: any[] + }; levels: string[][]; count: number; interval: NodeJS.Timer | null; diff --git a/enhanced-resolve/lib/UnsafeCachePlugin.d.ts b/enhanced-resolve/lib/UnsafeCachePlugin.d.ts index 7c7ed55ea6..8b8c8f5f09 100644 --- a/enhanced-resolve/lib/UnsafeCachePlugin.d.ts +++ b/enhanced-resolve/lib/UnsafeCachePlugin.d.ts @@ -3,10 +3,10 @@ import { ResolverRequest } from './common-types'; declare class UnsafeCachePlugin { source: string; filterPredicate: (str: ResolverRequest) => boolean; - cache: Object; + cache: {}; target: string; - constructor(source: string, filterPredicate: (str: ResolverRequest) => boolean, cache: Object, target: string); + constructor(source: string, filterPredicate: (str: ResolverRequest) => boolean, cache: {}, target: string); apply(resolver: Resolver): void; } diff --git a/enhanced-resolve/lib/lib-tests.ts b/enhanced-resolve/lib/lib-tests.ts index 9a7c043cca..a41e5d9aeb 100644 --- a/enhanced-resolve/lib/lib-tests.ts +++ b/enhanced-resolve/lib/lib-tests.ts @@ -1,66 +1,66 @@ -import AliasFieldPlugin = require('./AliasFieldPlugin'); +import AliasFieldPlugin = require('enhanced-resolve/lib/AliasFieldPlugin'); -import AliasPlugin = require('./AliasPlugin'); +import AliasPlugin = require('enhanced-resolve/lib/AliasPlugin'); -import AppendPlugin = require('./AppendPlugin'); +import AppendPlugin = require('enhanced-resolve/lib/AppendPlugin'); -import CloneBasenamePlugin = require('./CloneBasenamePlugin'); +import CloneBasenamePlugin = require('enhanced-resolve/lib/CloneBasenamePlugin'); -import ConcordExtensionsPlugin = require('./ConcordExtensionsPlugin'); +import ConcordExtensionsPlugin = require('enhanced-resolve/lib/ConcordExtensionsPlugin'); -import ConcordMainPlugin = require('./ConcordMainPlugin'); +import ConcordMainPlugin = require('enhanced-resolve/lib/ConcordMainPlugin'); -import ConcordModulesPlugin = require('./ConcordModulesPlugin'); +import ConcordModulesPlugin = require('enhanced-resolve/lib/ConcordModulesPlugin'); -import DescriptionFilePlugin = require('./DescriptionFilePlugin'); +import DescriptionFilePlugin = require('enhanced-resolve/lib/DescriptionFilePlugin'); -import DescriptionFileUtils = require('./DescriptionFileUtils'); +import DescriptionFileUtils = require('enhanced-resolve/lib/DescriptionFileUtils'); -import DirectoryExistsPlugin = require('./DirectoryExistsPlugin'); +import DirectoryExistsPlugin = require('enhanced-resolve/lib/DirectoryExistsPlugin'); -import FileExistsPlugin = require('./FileExistsPlugin'); +import FileExistsPlugin = require('enhanced-resolve/lib/FileExistsPlugin'); -import FileKindPlugin = require('./FileKindPlugin'); +import FileKindPlugin = require('enhanced-resolve/lib/FileKindPlugin'); -import getPaths, { basename } from './getPaths'; +import getPaths, { basename } from 'enhanced-resolve/lib/getPaths'; -import { globToRegExp } from './globToRegExp'; +import { globToRegExp } from 'enhanced-resolve/lib/globToRegExp'; -import JoinRequestPlugin = require('./JoinRequestPlugin'); +import JoinRequestPlugin = require('enhanced-resolve/lib/JoinRequestPlugin'); -import LogInfoPlugin = require('./LogInfoPlugin'); +import LogInfoPlugin = require('enhanced-resolve/lib/LogInfoPlugin'); -import MainFieldPlugin = require('./MainFieldPlugin'); +import MainFieldPlugin = require('enhanced-resolve/lib/MainFieldPlugin'); -import ModuleAppendPlugin = require('./ModuleAppendPlugin'); +import ModuleAppendPlugin = require('enhanced-resolve/lib/ModuleAppendPlugin'); -import ModuleKindPlugin = require('./ModuleKindPlugin'); +import ModuleKindPlugin = require('enhanced-resolve/lib/ModuleKindPlugin'); -import ModulesInHierachicDirectoriesPlugin = require('./ModulesInHierachicDirectoriesPlugin'); +import ModulesInHierachicDirectoriesPlugin = require('enhanced-resolve/lib/ModulesInHierachicDirectoriesPlugin'); -import ModulesInRootPlugin = require('./ModulesInRootPlugin'); +import ModulesInRootPlugin = require('enhanced-resolve/lib/ModulesInRootPlugin'); -import NextPlugin = require('./NextPlugin'); +import NextPlugin = require('enhanced-resolve/lib/NextPlugin'); -import ParsePlugin = require('./ParsePlugin'); +import ParsePlugin = require('enhanced-resolve/lib/ParsePlugin'); -import Resolver = require('./Resolver'); +import Resolver = require('enhanced-resolve/lib/Resolver'); -import ResultPlugin = require('./ResultPlugin'); +import ResultPlugin = require('enhanced-resolve/lib/ResultPlugin'); -import Storage from './Storage' +import Storage from 'enhanced-resolve/lib/Storage' -import SymlinkPlugin = require('./SymlinkPlugin'); +import SymlinkPlugin = require('enhanced-resolve/lib/SymlinkPlugin'); -import TryNextPlugin = require('./TryNextPlugin'); +import TryNextPlugin = require('enhanced-resolve/lib/TryNextPlugin'); -import UnsafeCachePlugin = require('./UnsafeCachePlugin'); +import UnsafeCachePlugin = require('enhanced-resolve/lib/UnsafeCachePlugin'); -import UseFilePlugin = require('./UseFilePlugin'); +import UseFilePlugin = require('enhanced-resolve/lib/UseFilePlugin'); import resolve = require('../'); -import { BaseFileSystem } from './common-types' +import { BaseFileSystem } from 'enhanced-resolve/lib/common-types' const aplugin = new AliasFieldPlugin('a', 'b', 'c'); @@ -74,11 +74,20 @@ const aplugin3 = new AppendPlugin('a', 'b', 'c'); const cplugin = new CloneBasenamePlugin('a', 'c'); -const cplugin2 = new ConcordExtensionsPlugin('a', {}, 'b'); +const cplugin2 = new ConcordExtensionsPlugin('a', { + any: 'string', + right: false +}, 'b'); -const cplugin3 = new ConcordMainPlugin('string', {}, 'string'); +const cplugin3 = new ConcordMainPlugin('string', { + any: 'string', + right: false +}, 'string'); -const cplugin4 = new ConcordModulesPlugin('string', {}, 'string'); +const cplugin4 = new ConcordModulesPlugin('string', { + any: 'string', + right: false +}, 'string'); const dplugin = new DescriptionFilePlugin('string', 'string', 'string'); @@ -130,7 +139,10 @@ const splugin = new SymlinkPlugin('string', 's'); const tplugin = new TryNextPlugin('string', 'ap', 's'); -const uplugin = new UnsafeCachePlugin('string', function (e) { return false }, {}, 's'); +const uplugin = new UnsafeCachePlugin('string', function (e) { return false }, { + hi: 'string', + hello: true +}, 's'); const uplugin2 = new UseFilePlugin('string', 'ap', 's');