diff --git a/body-parser/body-parser.d.ts b/body-parser/body-parser.d.ts index 994aa4e1b4..bf318d946e 100644 --- a/body-parser/body-parser.d.ts +++ b/body-parser/body-parser.d.ts @@ -6,7 +6,7 @@ /// declare module "body-parser" { - import express = require('express'); + import * as express from "express"; /** * bodyParser: use individual json/urlencoded middlewares diff --git a/express/express-tests.ts b/express/express-tests.ts index 22ae73e72f..72beb0790f 100644 --- a/express/express-tests.ts +++ b/express/express-tests.ts @@ -1,6 +1,6 @@ /// -import express = require('express'); +import * as express from 'express'; var app = express(); app.engine('jade', require('jade').__express); diff --git a/express/express.d.ts b/express/express.d.ts index 1cba6909c3..97b4ef2b88 100644 --- a/express/express.d.ts +++ b/express/express.d.ts @@ -5,7 +5,7 @@ /* =================== USAGE =================== - import express = require('express'); + import * as express from "express"; var app = express(); =============================================== */ @@ -24,8 +24,8 @@ declare module Express { declare module "express" { - import http = require('http'); - import serveStatic = require('serve-static'); + import * as http from "http"; + import * as serveStatic from "serve-static"; function e(): e.Express; diff --git a/mime/mime-tests.ts b/mime/mime-tests.ts index 36f0e5c15d..abfee0bd64 100644 --- a/mime/mime-tests.ts +++ b/mime/mime-tests.ts @@ -1,6 +1,6 @@ /// -import mime = require('mime'); +import * as mime from "mime"; var str: string; var obj: Object; diff --git a/node/node-tests.ts b/node/node-tests.ts index fe63dc6315..25a19db082 100644 --- a/node/node-tests.ts +++ b/node/node-tests.ts @@ -1,18 +1,16 @@ -/// - -import assert = require("assert"); -import fs = require("fs"); -import events = require("events"); -import zlib = require("zlib"); -import url = require('url'); -import util = require("util"); -import crypto = require("crypto"); -import tls = require("tls"); -import http = require("http"); -import net = require("net"); -import dgram = require("dgram"); -import querystring = require('querystring'); -import path = require("path"); +import * as assert from "assert"; +import * as fs from "fs"; +import * as events from "events"; +import * as zlib from "zlib"; +import * as url from "url"; +import * as util from "util"; +import * as crypto from "crypto"; +import * as tls from "tls"; +import * as http from "http"; +import * as net from "net"; +import * as dgram from "dgram"; +import * as querystring from "querystring"; +import * as path from "path"; assert(1 + 1 - 2 === 0, "The universe isn't how it should."); diff --git a/node/node.d.ts b/node/node.d.ts index d260c19660..1b661d8fad 100644 --- a/node/node.d.ts +++ b/node/node.d.ts @@ -422,9 +422,9 @@ declare module "events" { } declare module "http" { - import events = require("events"); - import net = require("net"); - import stream = require("stream"); + import * as events from "events"; + import * as net from "net"; + import * as stream from "stream"; export interface Server extends events.EventEmitter { listen(port: number, hostname?: string, backlog?: number, callback?: Function): Server; @@ -568,8 +568,8 @@ declare module "http" { } declare module "cluster" { - import child = require("child_process"); - import events = require("events"); + import * as child from "child_process"; + import * as events from "events"; export interface ClusterSettings { exec?: string; @@ -608,7 +608,7 @@ declare module "cluster" { } declare module "zlib" { - import stream = require("stream"); + import * as stream from "stream"; export interface ZlibOptions { chunkSize?: number; windowBits?: number; level?: number; memLevel?: number; strategy?: number; dictionary?: any; } export interface Gzip extends stream.Transform { } @@ -693,9 +693,9 @@ declare module "os" { } declare module "https" { - import tls = require("tls"); - import events = require("events"); - import http = require("http"); + import * as tls from "tls"; + import * as events from "events"; + import * as http from "http"; export interface ServerOptions { pfx?: any; @@ -759,8 +759,8 @@ declare module "punycode" { } declare module "repl" { - import stream = require("stream"); - import events = require("events"); + import * as stream from "stream"; + import * as events from "events"; export interface ReplOptions { prompt?: string; @@ -777,8 +777,8 @@ declare module "repl" { } declare module "readline" { - import events = require("events"); - import stream = require("stream"); + import * as events from "events"; + import * as stream from "stream"; export interface ReadLine extends events.EventEmitter { setPrompt(prompt: string, length: number): void; @@ -812,8 +812,8 @@ declare module "vm" { } declare module "child_process" { - import events = require("events"); - import stream = require("stream"); + import * as events from "events"; + import * as stream from "stream"; export interface ChildProcess extends events.EventEmitter { stdin: stream.Writable; @@ -939,7 +939,7 @@ declare module "dns" { } declare module "net" { - import stream = require("stream"); + import * as stream from "stream"; export interface Socket extends stream.Duplex { // Extended base methods @@ -1007,7 +1007,7 @@ declare module "net" { } declare module "dgram" { - import events = require("events"); + import * as events from "events"; interface RemoteInfo { address: string; @@ -1037,8 +1037,8 @@ declare module "dgram" { } declare module "fs" { - import stream = require("stream"); - import events = require("events"); + import * as stream from "stream"; + import * as events from "events"; interface Stats { isFile(): boolean; @@ -1476,9 +1476,9 @@ declare module "string_decoder" { } declare module "tls" { - import crypto = require("crypto"); - import net = require("net"); - import stream = require("stream"); + import * as crypto from "crypto"; + import * as net from "net"; + import * as stream from "stream"; var CLIENT_RENEG_LIMIT: number; var CLIENT_RENEG_WINDOW: number; @@ -1654,7 +1654,7 @@ declare module "crypto" { } declare module "stream" { - import events = require("events"); + import * as events from "events"; export interface Stream extends events.EventEmitter { pipe(destination: T, options?: { end?: boolean; }): T; @@ -1819,7 +1819,7 @@ declare module "assert" { } declare module "tty" { - import net = require("net"); + import * as net from "net"; export function isatty(fd: number): boolean; export interface ReadStream extends net.Socket { @@ -1833,7 +1833,7 @@ declare module "tty" { } declare module "domain" { - import events = require("events"); + import * as events from "events"; export class Domain extends events.EventEmitter { run(fn: Function): void; diff --git a/serve-static/serve-static-tests.ts b/serve-static/serve-static-tests.ts index 36d2761cdd..9813794a6f 100644 --- a/serve-static/serve-static-tests.ts +++ b/serve-static/serve-static-tests.ts @@ -1,7 +1,7 @@ /// -import express = require('express'); -import serveStatic = require('serve-static'); +import * as express from 'express'; +import * as serveStatic from 'serve-static'; var app = express(); app.use(serveStatic('/1')); diff --git a/serve-static/serve-static.d.ts b/serve-static/serve-static.d.ts index cbf9406d74..ef59fa2bcf 100644 --- a/serve-static/serve-static.d.ts +++ b/serve-static/serve-static.d.ts @@ -5,8 +5,8 @@ /* =================== USAGE =================== - import serveStatic = require('serve-static'); - app.use(serveStatic('public/ftp', {'index': ['default.html', 'default.htm']})) + import * as serveStatic from "serve-static"; + app.use(serveStatic("public/ftp", {"index": ["default.html", "default.htm"]})) =============================================== */ @@ -14,7 +14,7 @@ /// declare module "serve-static" { - import express = require('express'); + import * as express from "express"; /** * Create a new middleware function to serve files from within a given root directory. @@ -76,7 +76,7 @@ declare module "serve-static" { setHeaders?: (res: express.Response, path: string, stat: any) => any; }): express.Handler; - import m = require('mime'); + import * as m from "mime"; module serveStatic { var mime: typeof m;