fix(compiler): generate loader when es5 is disabled

ionic-team · Jun 20, 2019 · 0b4d814 · 0b4d814
1 parent 0bbda39
commit 0b4d814
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 29 deletions.
diff --git a/src/compiler/component-lazy/generate-cjs.ts b/src/compiler/component-lazy/generate-cjs.ts
@@ -5,9 +5,6 @@ import { OutputOptions, RollupBuild } from 'rollup';
 import { relativeImport } from '@utils';
 
 export async function generateCjs(config: d.Config, compilerCtx: d.CompilerCtx, buildCtx: d.BuildCtx, _build: d.Build, rollupBuild: RollupBuild, outputTargets: d.OutputTargetDistLazy[]) {
-  if (!config.buildDist) {
-    return;
-  }
   const cjsOutputs = outputTargets.filter(o => !!o.cjsDir);
 
   if (cjsOutputs.length > 0) {

diff --git a/src/compiler/component-lazy/generate-esm.ts b/src/compiler/component-lazy/generate-esm.ts
@@ -6,10 +6,6 @@ import { relativeImport } from '@utils';
 import { RollupResult } from '../../declarations';
 
 export async function generateEsm(config: d.Config, compilerCtx: d.CompilerCtx, buildCtx: d.BuildCtx, rollupBuild: RollupBuild, outputTargets: d.OutputTargetDistLazy[]) {
-  if (!config.buildDist) {
-    return;
-  }
-
   const esmEs5Outputs = config.buildEs5 ? outputTargets.filter(o => !!o.esmEs5Dir && !o.isBrowserBuild) : [];
   const esmOutputs = outputTargets.filter(o => !!o.esmDir && !o.isBrowserBuild);
   if (esmOutputs.length + esmEs5Outputs.length > 0) {

diff --git a/src/compiler/component-lazy/generate-system.ts b/src/compiler/component-lazy/generate-system.ts
@@ -6,9 +6,6 @@ import { OutputOptions, RollupBuild } from 'rollup';
 import { relativeImport } from '@utils';
 
 export async function generateSystem(config: d.Config, compilerCtx: d.CompilerCtx, buildCtx: d.BuildCtx, build: d.Build, rollupBuild: RollupBuild, outputTargets: d.OutputTargetDistLazy[]) {
-  if (!config.buildEs5) {
-    return;
-  }
   const systemOutputs = outputTargets.filter(o => !!o.systemDir);
 
   if (systemOutputs.length > 0) {

diff --git a/src/compiler/config/validate-config.ts b/src/compiler/config/validate-config.ts
@@ -72,8 +72,7 @@ export function validateConfig(config: d.Config, diagnostics: d.Diagnostic[], se
   setBooleanConfig(config, 'minifyJs', null, !config.devMode);
 
   setBooleanConfig(config, 'buildEs5', 'es5', !config.devMode);
-  setBooleanConfig(config, 'buildDist', 'esm', config.buildEs5);
-  setBooleanConfig(config, 'buildScoped', null, config.buildEs5);
+  setBooleanConfig(config, 'buildDist', 'esm', !config.devMode || config.buildEs5);
 
   // setup the outputTargets
   validateOutputTargets(config, diagnostics);
@@ -100,7 +99,6 @@ export function validateConfig(config: d.Config, diagnostics: d.Diagnostic[], se
     }
   }
 
-
   validateDevServer(config, diagnostics);
 
   if (!config.watchIgnoredRegex) {

diff --git a/src/compiler/config/validate-outputs-dist.ts b/src/compiler/config/validate-outputs-dist.ts
@@ -81,13 +81,14 @@ export function validateOutputTargetDist(config: d.Config) {
 
     const namespace = config.fsNamespace || 'app';
     const lazyDir = path.join(outputTarget.buildDir, namespace);
+
     // Lazy build for CDN in dist
     config.outputTargets.push({
       type: DIST_LAZY,
       copyDir: lazyDir,
       esmDir: lazyDir,
-      systemDir: lazyDir,
-      systemLoaderFile: path.join(lazyDir, namespace + '.js'),
+      systemDir: config.buildEs5 ? lazyDir : undefined,
+      systemLoaderFile: config.buildEs5 ? path.join(lazyDir, namespace + '.js') : undefined,
       legacyLoaderFile: path.join(outputTarget.buildDir, namespace + '.js'),
       polyfills: true,
       isBrowserBuild: true,
@@ -101,7 +102,7 @@ export function validateOutputTargetDist(config: d.Config) {
 
     if (config.buildDist) {
       const esmDir = path.join(outputTarget.dir, 'esm');
-      const esmEs5Dir = path.join(outputTarget.dir, 'esm', 'legacy');
+      const esmEs5Dir = config.buildEs5 ? path.join(outputTarget.dir, 'esm', 'legacy') : undefined;
       const cjsDir = path.join(outputTarget.dir, 'cjs');
 
       // Create lazy output-target

diff --git a/src/compiler/output-targets/output-lazy-loader.ts b/src/compiler/output-targets/output-lazy-loader.ts
@@ -5,10 +5,6 @@ import { normalizePath, relativeImport } from '@utils';
 import { getClientPolyfill } from '../app-core/app-polyfills';
 
 export async function outputLazyLoader(config: d.Config, compilerCtx: d.CompilerCtx) {
-  if (!config.buildDist) {
-    return;
-  }
-
   const outputTargets = config.outputTargets.filter(isOutputTargetDistLazyLoader);
   if (outputTargets.length === 0) {
     return;
@@ -44,17 +40,21 @@ async function generateLoader(config: d.Config, compilerCtx: d.CompilerCtx, outp
   const es5EntryPoint = config.sys.path.join(es5Dir, 'loader.mjs');
   const es2017EntryPoint = config.sys.path.join(es2017Dir, 'loader.mjs');
   const polyfillsEntryPoint = config.sys.path.join(es2017Dir, 'polyfills/index.js');
-
   const cjsEntryPoint = config.sys.path.join(cjsDir, 'loader.cjs.js');
-
-  const polyfillsExport = `export * from '${normalizePath(config.sys.path.relative(loaderPath, polyfillsEntryPoint))}';\n`;
-  const indexPath = config.buildEs5 ? es5EntryPoint : es2017EntryPoint;
-  const indexContent = `${es5HtmlElement}\n${polyfillsExport}export * from '${normalizePath(config.sys.path.relative(loaderPath, indexPath))}';`;
-  const indexES2017Content = `${polyfillsExport}export * from '${normalizePath(config.sys.path.relative(loaderPath, es2017EntryPoint))}';`;
+  const polyfillsExport = `export * from '${normalizePath(config.sys.path.relative(loaderPath, polyfillsEntryPoint))}';`;
+  const indexContent = `
+${es5HtmlElement}
+${polyfillsExport}
+export * from '${normalizePath(config.sys.path.relative(loaderPath, es5EntryPoint))}';
+`;
+  const indexES2017Content = `
+${polyfillsExport}
+export * from '${normalizePath(config.sys.path.relative(loaderPath, es2017EntryPoint))}';
+`;
   const indexCjsContent = `
-  module.exports = require('${normalizePath(config.sys.path.relative(loaderPath, cjsEntryPoint))}');
-  module.exports.applyPolyfills = function() { return Promise.resolve() };
-  `;
+module.exports = require('${normalizePath(config.sys.path.relative(loaderPath, cjsEntryPoint))}');
+module.exports.applyPolyfills = function() { return Promise.resolve() };
+`;
 
   const indexDtsPath = config.sys.path.join(loaderPath, 'index.d.ts');
   await Promise.all([