fix(*): remove common instance lock, fixes #103

Author: s-panferov

src/index.ts

@@ -27,8 +27,6 @@ async function loader(text) {
     }
 }
 
-let externalsInvocation: Promise<void>;
-
 async function compiler(webpack: IWebPack, text: string): Promise<void> {
     if (webpack.cacheable) {
         webpack.cacheable();
@@ -65,16 +63,19 @@ async function compiler(webpack: IWebPack, text: string): Promise<void> {
     });
 
     if (instance.options.externals && !instance.externalsInvoked) {
-        if (externalsInvocation) {
-            await externalsInvocation;
+        if (instance.externalsInvocation) {
+            await instance.externalsInvocation;
         } else {
-            externalsInvocation = instance.options.externals.map(async (external) => {
+            let promises = instance.options.externals.map(async (external) => {
                 await state.fileAnalyzer.checkDependencies(resolver, external);
             });
 
-            await Promise.all(externalsInvocation as any);
+            instance.externalsInvocation = Promise.all(promises).then(() => {
+                instance.externalsInvoked = true;
+            });
+
+            await instance.externalsInvocation;
         }
-        instance.externalsInvoked = true;
     }
 
     instance.compiledFiles[fileName] = true;

src/instance.ts

@@ -23,6 +23,7 @@ export interface LoaderPluginDef {
 }
 
 export interface ICompilerInstance {
+    id: number;
     tsFlow: Promise<any>;
     tsState: State;
     babelImpl?: any;
@@ -33,6 +34,7 @@ export interface ICompilerInstance {
     cacheIdentifier: any;
     plugins: LoaderPluginDef[];
     initedPlugins: LoaderPlugin[];
+    externalsInvocation: Promise<any>;
 }
 
 interface ICompiler {
@@ -101,6 +103,7 @@ const BABEL_ERROR = colors.red(`\n\nBabel compiler cannot be found, please add i
 /**
  * Creates compiler instance
  */
+let id = 0;
 export function ensureInstance(webpack: IWebPack, options: ICompilerOptions, instanceName: string): ICompilerInstance {
     ensureInstanceStore(webpack._compiler);
 
@@ -251,6 +254,7 @@ export function ensureInstance(webpack: IWebPack, options: ICompilerOptions, ins
     }
 
     return getInstanceStore(webpack._compiler)[instanceName] = {
+        id: ++id,
         tsFlow,
         tsState,
         babelImpl,
@@ -262,7 +266,8 @@ export function ensureInstance(webpack: IWebPack, options: ICompilerOptions, ins
             : null,
         cacheIdentifier,
         plugins,
-        initedPlugins
+        initedPlugins,
+        externalsInvocation: null
     };
 }