fix lazy loading with rollup

ardatan · ardatan · commit 1ae7af37b026 · 2018-03-21T16:47:09.000-04:00
diff --git a/atmosphere-packages/angular-compilers/.versions b/atmosphere-packages/angular-compilers/.versions
@@ -1,7 +1,7 @@
-angular-compilers@0.3.1
-angular-html-compiler@0.3.1
-angular-scss-compiler@0.3.1
-angular-typescript-compiler@0.3.1
+angular-compilers@0.3.1_1
+angular-html-compiler@0.3.1_1
+angular-scss-compiler@0.3.1_1
+angular-typescript-compiler@0.3.1_1
 babel-compiler@7.0.5
 babel-runtime@1.2.0
 dynamic-import@0.3.0
diff --git a/atmosphere-packages/angular-compilers/package.js b/atmosphere-packages/angular-compilers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'angular-compilers',
-  version: '0.3.1',
+  version: '0.3.1_1',
   summary: 'Rollup, AOT, SCSS, HTML and TypeScript compilers for Angular Meteor',
   git: 'https://github.com/Urigo/angular-meteor/tree/master/atmosphere-packages/angular-compilers',
   documentation: 'README.md'
@@ -14,9 +14,9 @@ Package.registerBuildPlugin({
   use: [
     // Uses an external packages to get the actual compilers
     'ecmascript@0.10.5',
-    'angular-typescript-compiler@0.3.1',
-    'angular-html-compiler@0.3.1',
-    'angular-scss-compiler@0.3.1'
+    'angular-typescript-compiler@0.3.1_1',
+    'angular-html-compiler@0.3.1_1',
+    'angular-scss-compiler@0.3.1_1'
   ]
 });
 
diff --git a/atmosphere-packages/angular-html-compiler/.versions b/atmosphere-packages/angular-html-compiler/.versions
@@ -1,4 +1,4 @@
-angular-html-compiler@0.3.1
+angular-html-compiler@0.3.1_1
 babel-compiler@7.0.5
 babel-runtime@1.2.0
 dynamic-import@0.3.0
diff --git a/atmosphere-packages/angular-html-compiler/package.js b/atmosphere-packages/angular-html-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'angular-html-compiler',
-  version: '0.3.1',
+  version: '0.3.1_1',
   summary: 'Angular Html Compiler Package',
   git: 'https://github.com/Urigo/angular-meteor/tree/master/atmosphere-packages/angular-html-compiler',
   documentation: null
diff --git a/atmosphere-packages/angular-scss-compiler/.versions b/atmosphere-packages/angular-scss-compiler/.versions
@@ -1,4 +1,4 @@
-angular-scss-compiler@0.3.1
+angular-scss-compiler@0.3.1_1
 babel-compiler@7.0.5
 babel-runtime@1.2.0
 dynamic-import@0.3.0
diff --git a/atmosphere-packages/angular-scss-compiler/file-utils.js b/atmosphere-packages/angular-scss-compiler/file-utils.js
@@ -0,0 +1,35 @@
+const path = Npm.require('path');
+
+export const basePath = process.cwd();
+
+export function getMeteorPath(filePath) {
+  if (filePath.startsWith(basePath)) {
+    filePath = filePath.slice(basePath.length);
+  }
+  return getNoRooted(filePath);
+}
+
+const ROOTED = /^(\/|\\)/;
+
+export function isRooted(filePath) {
+  return ROOTED.test(filePath);
+}
+
+export function getNoRooted(filePath) {
+  if (isRooted(filePath)) { 
+    return filePath.slice(1);
+  }
+  return filePath;
+}
+
+export function getFullPath(filePath) {
+  filePath = getMeteorPath(filePath);
+  return path.join(basePath, filePath);
+}
+
+export function removeTsExtension(filePath) {
+  if (filePath.endsWith('.ts')) {
+    return filePath.slice(0, -3);
+  }
+  return filePath;
+}
diff --git a/atmosphere-packages/angular-scss-compiler/index.js b/atmosphere-packages/angular-scss-compiler/index.js
@@ -2,7 +2,13 @@ const sass = Npm.require('node-sass');
 
 const path = Npm.require('path');
 
-const basePath = process.cwd();
+import {
+  basePath,
+  ROOTED,
+  getMeteorPath,
+  isRooted,
+  getNoRooted
+} from './file-utils';
 
 const WEB_ARCH_REGEX = /^web/;
 
@@ -18,7 +24,7 @@ export class AngularScssCompiler{
     return CACHE.get(filePath);
   }
   static compileFile(filePath, data){
-    const fullPath = filePath.includes(basePath) ? filePath : path.join(basePath, filePath);
+    const fullPath = isRooted(filePath) ? filePath : path.join(basePath, filePath);
     return sass.renderSync({
       file: fullPath,
       includePaths: [basePath + '/node_modules'],
diff --git a/atmosphere-packages/angular-scss-compiler/package.js b/atmosphere-packages/angular-scss-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'angular-scss-compiler',
-  version: '0.3.1',
+  version: '0.3.1_1',
   summary: 'Angular Scss Compiler Package',
   git: 'https://github.com/Urigo/angular-meteor/tree/master/atmosphere-packages/angular-scss-compiler',
   documentation: null
diff --git a/atmosphere-packages/angular-typescript-compiler/.versions b/atmosphere-packages/angular-typescript-compiler/.versions
@@ -1,6 +1,6 @@
-angular-html-compiler@0.3.1
-angular-scss-compiler@0.3.1
-angular-typescript-compiler@0.3.1
+angular-html-compiler@0.3.1_1
+angular-scss-compiler@0.3.1_1
+angular-typescript-compiler@0.3.1_1
 babel-compiler@7.0.5
 babel-runtime@1.2.0
 dynamic-import@0.3.0
diff --git a/atmosphere-packages/angular-typescript-compiler/index.js b/atmosphere-packages/angular-typescript-compiler/index.js
@@ -65,7 +65,6 @@ const ngcOptions = {
   traceResolution: false,
 };
 
-
 export class AngularTsCompiler {
   constructor({aot, rollup}){
     this.isAot = aot;
@@ -76,7 +75,7 @@ export class AngularTsCompiler {
     }
 
   }
-  addFakeDynamicLoader(source, basePath) {
+  generateFakeDynamicLoader(source, basePath) {
 
     let fakeLoaderCode = '';
 
@@ -88,14 +87,13 @@ export class AngularTsCompiler {
           (this.isAot ? '.ngfactory' : '') +
           replaced[0];
 
-        fakeLoaderCode += `function fakeLoader(){module.dynamicImport(${fixedUrl})}`;
+        additionFakeLoaderCode += `
+          if(false){module.dynamicImport(${fixedUrl})}
+        `;
         return `loadChildren: ${replaced}`;
-      })
-
-    if (fakeLoaderCode)
-      newSource = fakeLoaderCode + '\n' + newSource;
+      });
 
-    return newSource;
+    return {additionFakeLoaderCode, newSource};
 
   }
   replaceStringsWithFullUrls(basePath, urls, firstSlash) {
@@ -209,6 +207,7 @@ export class AngularTsCompiler {
     let mainCodePath;
     let mainCode;
     const codeMap = new Map();
+    let fakeLoaderCode = '';
     console.time(`[${prefix}]: TypeScript Files Compilation`);
     for (const filePath of allPaths) {
       if (!filePath.endsWith('.d.ts')) {
@@ -237,24 +236,34 @@ export class AngularTsCompiler {
         if (!this.isAot) {
           code = this.fixResourceUrls(code, basePath)
         }
-        code = this.addFakeDynamicLoader(code, basePath);
+        let {newSource, additionFakeLoaderCode} = this.generateFakeDynamicLoader(code, basePath);
+        code = newSource;
+        fakeLoaderCode += additionFakeLoaderCode;
         code = code.split('require("node_modules/').join('require("');
         const inputPath = inputFile.getPathInPackage();
         const outputPath = this.removeTsExtension(filePath);
         if (this.isRollup) {
           codeMap.set(outputPath, code);
-        } else {
-          const toBeAdded = {
-            sourcePath: inputPath,
-            path: outputPath + '.js',
-            data: code,
-            hash: result.hash,
-            sourceMap: result.sourceMap
-          };
-          inputFile.addJavaScript(toBeAdded);
         }
+        const toBeAdded = {
+          sourcePath: inputPath,
+          path: outputPath + '.js',
+          data: code,
+          hash: result.hash,
+          sourceMap: result.sourceMap
+        };
+        inputFile.addJavaScript(toBeAdded);
       }
     }
+    const inputFile = inputFiles.find(file => {
+      const filePath = file.getPathInPackage();
+      return filePath.startsWith(prefix) &&
+        filePath.indexOf('imports') === -1;
+    });
+    inputFile.addJavaScript({
+      path: 'fakeLoader.js',
+      data: fakeLoaderCode
+    });
     console.timeEnd(`[${prefix}]: TypeScript Files Compilation`);
     if (this.isRollup && !mainCodePath.includes('node_modules')) {
       console.time(`[${prefix}]: Rollup`);
diff --git a/atmosphere-packages/angular-typescript-compiler/package.js b/atmosphere-packages/angular-typescript-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'angular-typescript-compiler',
-  version: '0.3.1',
+  version: '0.3.1_1',
   summary: 'Angular TypeScript Compiler Package',
   git: 'https://github.com/Urigo/angular-meteor/tree/master/atmosphere-packages/angular-typescript-compiler',
   documentation: null
@@ -19,8 +19,8 @@ Package.onUse(function(api) {
   api.use([
     'ecmascript',
     'babel-compiler@7.0.0',
-    'angular-html-compiler@0.3.1',
-    'angular-scss-compiler@0.3.1'
+    'angular-html-compiler@0.3.1_1',
+    'angular-scss-compiler@0.3.1_1'
   ], 'server');
   api.mainModule('index.js', 'server');
 });
diff --git a/examples/MeteorCLI/lazy-loading/.meteor/packages b/examples/MeteorCLI/lazy-loading/.meteor/packages
@@ -15,4 +15,5 @@ standard-minifier-js@2.3.1    # JS minifier run for production mode
 ecmascript@0.10.0              # Enable ECMAScript2015+ syntax in app code
 shell-server@0.3.1            # Server-side component of the `meteor shell` command
 
+dynamic-import
 angular-compilers
diff --git a/examples/MeteorCLI/lazy-loading/.meteor/versions b/examples/MeteorCLI/lazy-loading/.meteor/versions
@@ -1,8 +1,8 @@
 allow-deny@1.1.0
-angular-compilers@0.3.0_3
-angular-html-compiler@0.3.0
-angular-scss-compiler@0.3.0
-angular-typescript-compiler@0.3.0_3
+angular-compilers@0.3.1
+angular-html-compiler@0.3.1
+angular-scss-compiler@0.3.1
+angular-typescript-compiler@0.3.1
 autoupdate@1.4.0
 babel-compiler@7.0.5
 babel-runtime@1.2.2
diff --git a/examples/MeteorCLI/lazy-loading/client/imports/polyfills.ts b/examples/MeteorCLI/lazy-loading/client/imports/polyfills.ts
@@ -6,4 +6,4 @@ global['System'] = {
   import(path: string){
     return module.dynamicImport(path);
   }
-}
+}
diff --git a/package-lock.json b/package-lock.json

-Original file line number
+Diff line change
@@ @@ -1,7 +1,7 @@ @@
 -[email protected].1
 -[email protected].1
 -[email protected].1
 -[email protected].1
 +[email protected].1_1
 +[email protected].1_1
 +[email protected].1_1
 +[email protected].1_1
 [email protected]
 [email protected]
 [email protected]
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-[email protected].1`
	`1`	`+[email protected].1_1`
`2`	`2`	`[email protected]`
`3`	`3`	`[email protected]`
`4`	`4`	`[email protected]`