feat(tsc-wrapped): always convert shorthand imports (#16898)

Now converts shorthand imports for every TypeScript target. Tsickle is able to expand index shorthand imports for every TypeScript target and module possibility. Expanding shorthand imports for CommonJS modules is also helpful when testing in the browser. Module loaders like SystemJS are not able to understand directory imports (or index shorthand imports)
angular · May 30, 2017 · ea8a43d · ea8a43d
1 parent 535d9da
commit ea8a43d
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 6 deletions.
diff --git a/tools/@angular/tsc-wrapped/src/main.ts b/tools/@angular/tsc-wrapped/src/main.ts
@@ -99,12 +99,8 @@ export function main(
       addGeneratedFileName(name);
     }
 
-    const tsickleCompilerHostOptions: tsickle.Options = {
+    const tsickleCompilerHostOptions:
-      googmodule: false,
+        tsickle.Options = {googmodule: false, untyped: true, convertIndexImportShorthand: true};
-      untyped: true,
-      convertIndexImportShorthand:
-          ngOptions.target === ts.ScriptTarget.ES2015,  // This covers ES6 too
-    };
 
     const tsickleHost: tsickle.TsickleHost = {
       shouldSkipTsickleProcessing: (fileName) => /\.d\.ts$/.test(fileName),

diff --git a/tools/@angular/tsc-wrapped/test/main.spec.ts b/tools/@angular/tsc-wrapped/test/main.spec.ts
@@ -366,4 +366,57 @@ describe('tsc-wrapped', () => {
         })
         .catch(e => done.fail(e));
   });
+
+  it('should expand shorthand imports for ES2015 modules', (done) => {
+    write('tsconfig.json', `{
+      "compilerOptions": {
+        "experimentalDecorators": true,
+        "types": [],
+        "outDir": "built",
+        "declaration": true,
+        "moduleResolution": "node",
+        "target": "es2015",
+        "module": "es2015"
+      },
+      "angularCompilerOptions": {
+        "annotateForClosureCompiler": true
+      },
+      "files": ["test.ts"]
+    }`);
+
+    main(basePath, {basePath})
+        .then(() => {
+          const fileOutput = readOut('js');
+          expect(fileOutput).toContain(`export { A, B } from './dep/index'`);
+          done();
+        })
+        .catch(e => done.fail(e));
+  });
+
+  it('should expand shorthand imports for ES5 CommonJS modules', (done) => {
+    write('tsconfig.json', `{
+      "compilerOptions": {
+        "experimentalDecorators": true,
+        "types": [],
+        "outDir": "built",
+        "declaration": true,
+        "moduleResolution": "node",
+        "target": "es5",
+        "module": "commonjs"
+      },
+      "angularCompilerOptions": {
+        "annotateForClosureCompiler": true
+      },
+      "files": ["test.ts"]
+    }`);
+
+    main(basePath, {basePath})
+        .then(() => {
+          const fileOutput = readOut('js');
+          expect(fileOutput).toContain(`var index_1 = require("./dep/index");`);
+          done();
+        })
+        .catch(e => done.fail(e));
+  });
+
 });