pr feedback

rollup · Aug 11, 2018 · 8ecb1e0 · 8ecb1e0
1 parent 0193bb3
commit 8ecb1e0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 19 deletions.
diff --git a/src/Graph.ts b/src/Graph.ts
@@ -16,7 +16,7 @@ import {
 	OutputBundle,
 	RollupCache,
 	RollupWarning,
-	SerialisablePluginCache,
+	SerializablePluginCache,
 	SourceDescription,
 	TreeshakingOptions,
 	WarningHandler,
@@ -73,8 +73,8 @@ export default class Graph {
 	contextParse: (code: string, acornOptions?: acorn.Options) => Program;
 
 	pluginDriver: PluginDriver;
-	pluginCache: Record<string, SerialisablePluginCache>;
-	watchFiles: string[] = [];
+	pluginCache: Record<string, SerializablePluginCache>;
+	watchFiles: Record<string, true> = Object.create(null);
 	cacheExpiry: number;
 
 	// deprecated
@@ -624,7 +624,7 @@ Try defining "${chunkName}" first in the manualChunks definitions of the Rollup
 
 		const module: Module = new Module(this, id);
 		this.moduleById.set(id, module);
-		this.watchFiles.push(id);
+		this.watchFiles[id] = true;
 
 		timeStart('load modules', 3);
 		return Promise.resolve(this.pluginDriver.hookFirst('load', [id]))

diff --git a/src/rollup/index.ts b/src/rollup/index.ts
@@ -369,7 +369,7 @@ export default function rollup(
 				const cache = rawInputOptions.cache === false ? undefined : graph.getCache();
 				const result: RollupSingleFileBuild | RollupBuild = {
 					cache,
-					watchFiles: graph.watchFiles,
+					watchFiles: Object.keys(graph.watchFiles),
 					generate: <any>((rawOutputOptions: GenericConfigObject) => {
 						const promise = generate(rawOutputOptions, false).then(
 							result =>

diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts
@@ -364,14 +364,14 @@ export interface OutputChunk {
 	map?: SourceMap;
 }
 
-export interface SerialisablePluginCache {
+export interface SerializablePluginCache {
 	[key: string]: [number, any];
 }
 
 export interface RollupCache {
 	// to be deprecated
 	modules?: ModuleJSON[];
-	plugins?: Record<string, SerialisablePluginCache>;
+	plugins?: Record<string, SerializablePluginCache>;
 }
 
 export interface RollupSingleFileBuild {

diff --git a/src/utils/assetHooks.ts b/src/utils/assetHooks.ts
@@ -47,7 +47,7 @@ export function getAssetFileName(
 
 export function createAssetPluginHooks(
 	assetsById: Map<string, Asset>,
-	watchFiles: string[],
+	watchFiles: Record<string, true>,
 	outputBundle?: OutputBundle,
 	assetFileNames?: string
 ) {
@@ -98,9 +98,7 @@ export function createAssetPluginHooks(
 			if (outputBundle && source !== undefined) finaliseAsset(asset, outputBundle, assetFileNames);
 			assetsById.set(assetId, asset);
 			if (!asset.transform && asset.dependencies && asset.dependencies.length) {
-				for (const depId of asset.dependencies) {
-					if (watchFiles.indexOf(depId) === -1) watchFiles.push(depId);
-				}
+				for (const depId of asset.dependencies) watchFiles[depId] = true;
 			}
 			return assetId;
 		},
@@ -139,9 +137,7 @@ export function createAssetPluginHooks(
 				});
 			asset.source = source;
 			if (!asset.transform && asset.dependencies && asset.dependencies.length) {
-				for (const depId of asset.dependencies) {
-					if (watchFiles.indexOf(depId) === -1) watchFiles.push(depId);
-				}
+				for (const depId of asset.dependencies) watchFiles[depId] = true;
 			}
 			if (outputBundle) finaliseAsset(asset, outputBundle, assetFileNames);
 		},

diff --git a/src/utils/pluginDriver.ts b/src/utils/pluginDriver.ts
@@ -6,13 +6,12 @@ import {
 	PluginContext,
 	RollupError,
 	RollupWarning,
-	SerialisablePluginCache,
+	SerializablePluginCache,
 	Watcher
 } from '../rollup/types';
 import { createAssetPluginHooks, EmitAsset } from './assetHooks';
 import { getRollupDefaultPlugin } from './default-plugin';
 import error from './error';
-import { resolve } from './path';
 
 export interface PluginDriver {
 	emitAsset: EmitAsset;
@@ -42,7 +41,7 @@ export type HookContext = (context: PluginContext, plugin?: Plugin) => PluginCon
 export function createPluginDriver(
 	graph: Graph,
 	options: InputOptions,
-	pluginCache: Record<string, SerialisablePluginCache>,
+	pluginCache: Record<string, SerializablePluginCache>,
 	watcher?: Watcher
 ): PluginDriver {
 	const plugins = [...(options.plugins || []), getRollupDefaultPlugin(options)];
@@ -86,7 +85,7 @@ export function createPluginDriver(
 		const context: PluginContext = {
 			watcher,
 			addWatchFile(id: string) {
-				graph.watchFiles.push(resolve(id));
+				graph.watchFiles[id] = true;
 			},
 			cache: cacheInstance,
 			isExternal(id: string, parentId: string, isResolved = false) {
@@ -227,7 +226,7 @@ export function createPluginDriver(
 	return pluginDriver;
 }
 
-export function createPluginCache(cache: SerialisablePluginCache): PluginCache {
+export function createPluginCache(cache: SerializablePluginCache): PluginCache {
 	return {
 		has(id: string) {
 			const item = cache[id];