diff --git a/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/package.json b/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/package.json index ba04386..742de48 100644 --- a/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/package.json +++ b/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/package.json @@ -1,6 +1,6 @@ { "name": "aspnet-webpack", - "version": "1.0.1", + "version": "1.0.2", "description": "Helpers for using Webpack in ASP.NET projects. Works in conjunction with the Microsoft.AspNet.SpaServices NuGet package.", "main": "index.js", "scripts": { diff --git a/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/LoadViaWebpack.ts b/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/LoadViaWebpack.ts index 50300d0..a084457 100644 --- a/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/LoadViaWebpack.ts +++ b/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/LoadViaWebpack.ts @@ -4,12 +4,17 @@ // that your loader plugins (e.g., require('./mystyles.less')) work in exactly the same way on the server as // on the client. import 'es6-promise'; -import ExternalsPlugin from 'webpack-externals-plugin'; -import requireFromString from 'require-from-string'; -import MemoryFS from 'memory-fs'; import * as webpack from 'webpack'; import { requireNewCopy } from './RequireNewCopy'; +// Strange import syntax to work around https://github.com/Microsoft/TypeScript/issues/2719 +import { webpackexternals } from './typings/webpack-externals-plugin'; +import { requirefromstring } from './typings/require-from-string'; +import { memoryfs } from './typings/memory-fs'; +const ExternalsPlugin = require('webpack-externals-plugin') as typeof webpackexternals.ExternalsPlugin; +const requireFromString = require('require-from-string') as typeof requirefromstring.requireFromString; +const MemoryFS = require('memory-fs') as typeof memoryfs.MemoryFS; + // Ensure we only go through the compile process once per [config, module] pair const loadViaWebpackPromisesCache: { [key: string]: any } = {}; diff --git a/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/typings/memory-fs.d.ts b/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/typings/memory-fs.d.ts index 6ae2ee6..6a2d353 100644 --- a/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/typings/memory-fs.d.ts +++ b/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/typings/memory-fs.d.ts @@ -1,3 +1,3 @@ -declare module 'memory-fs' { - export default class MemoryFS {} +export namespace memoryfs { + export class MemoryFS {} } diff --git a/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/typings/require-from-string.d.ts b/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/typings/require-from-string.d.ts index 9bfd268..80e4645 100644 --- a/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/typings/require-from-string.d.ts +++ b/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/typings/require-from-string.d.ts @@ -1,3 +1,3 @@ -declare module 'require-from-string' { - export default function requireFromString(fileContent: string): T; +export namespace requirefromstring { + export function requireFromString(fileContent: string): T; } diff --git a/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/typings/webpack-externals-plugin.d.ts b/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/typings/webpack-externals-plugin.d.ts index c47e5f7..cf94a1d 100644 --- a/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/typings/webpack-externals-plugin.d.ts +++ b/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/typings/webpack-externals-plugin.d.ts @@ -1,12 +1,12 @@ -declare module 'webpack-externals-plugin' { - import * as webpack from 'webpack'; - +import * as webpack from 'webpack'; + +export namespace webpackexternals { export interface ExternalsPluginOptions { type: string; include: webpack.LoaderCondition; } - export default class ExternalsPlugin { + export class ExternalsPlugin { constructor(options: ExternalsPluginOptions); } }