make the cache check more robust. always check for sourcemap in manif…

…est too (#101)
dojo · Dec 13, 2018 · 65ad68f · 65ad68f
1 parent a4ac7c9
commit 65ad68f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/build-time-render/BuildTimeRender.ts b/src/build-time-render/BuildTimeRender.ts
@@ -165,7 +165,7 @@ export default class BuildTimeRender {
 	private _writeBuildBridgeCache() {
 		Object.keys(this._manifestContent).forEach((chunkname) => {
 			let modified = false;
-			if (/\.js$/.test(chunkname)) {
+			if (/\.js$/.test(chunkname) && this._manifestContent[`${chunkname}.map`]) {
 				const content = this._manifestContent[chunkname];
 				const sourceMap = this._manifestContent[`${chunkname}.map`];
 				const node = SourceNode.fromStringWithSourceMap(content, new SourceMapConsumer(sourceMap));

diff --git a/src/build-time-render/bridge.js b/src/build-time-render/bridge.js
@@ -8,6 +8,13 @@ export default function () {
 		return global.__dojoBuildBridge(modulePath, args);
 	}
 	else {
-		return global.__dojoBuildBridgeCache[modulePath][JSON.stringify(args)];
+		var stringifiedArgs = JSON.stringify(args);
+		if (global__dojoBuildBridgeCache &&
+			global.__dojoBuildBridgeCache[modulePath] &&
+			global.__dojoBuildBridgeCache[modulePath][stringifiedArgs]
+		) {
+			return global.__dojoBuildBridgeCache[modulePath][stringifiedArgs];
+		}
+		return undefined;
 	}
 }