Merge branch 'KingHenne-fix-ts-issues' into release-0.54.0

# Conflicts:
#	src/utils/mergeOptions.ts

package.json

@@ -91,6 +91,7 @@
     "dist/rollup.es.js",
     "dist/rollup.js",
     "dist/**/*.d.ts",
+    "./typings/package.json.d.ts",
     "bin/rollup",
     "README.md"
   ],

src/Module.ts

@@ -138,7 +138,7 @@ export default class Module {
 	private astClone: Program;
 	declarations: {
 		'*'?: NamespaceVariable;
-		[name: string]: Variable;
+		[name: string]: Variable | undefined;
 	};
 	private exportAllModules: (Module | ExternalModule)[];
 

src/node-entry.ts

@@ -1,3 +1,5 @@
+/// <reference path="../typings/package.json.d.ts" />
+
 export * from './rollup/index';
 export * from './watch/index';
 

src/utils/mergeOptions.ts

@@ -1,6 +1,6 @@
 import ensureArray from './ensureArray.js';
 import deprecateOptions, { Deprecation } from './deprecateOptions';
-import { InputOptions, WarningHandler, OutputOptions } from '../../src/rollup/index';
+import { InputOptions, WarningHandler, OutputOptions } from '../rollup/index';
 
 function normalizeObjectOptionValue (optionValue: any) {
 	if (!optionValue) {

typings/declarations.d.ts

@@ -5,10 +5,6 @@ declare module 'help.md' {
 	export default str;
 }
 
-declare module 'package.json' {
-	const version: string;
-}
-
 // external libs
 declare module "ansi-escapes";
 declare module 'pretty-ms';

typings/package.json.d.ts

@@ -0,0 +1,3 @@
+declare module 'package.json' {
+	const version: string;
+}