fix(packages): use ES modules for primary build (angular#11120)

Author: mhevery

build.sh

@@ -51,6 +51,7 @@ TSCONFIG=./modules/tsconfig.json
 echo "====== (all)COMPILING: \$(npm bin)/tsc -p ${TSCONFIG} ====="
 # compile ts code
 TSC="node --max-old-space-size=3000 dist/tools/@angular/tsc-wrapped/src/main"
+UGLIFYJS=`pwd`/node_modules/.bin/uglifyjs
 $TSC -p modules/tsconfig.json
 
 rm -rf ./dist/packages-dist
@@ -68,56 +69,61 @@ for PACKAGE in \
   upgrade \
   compiler-cli
 do
-  SRCDIR=./modules/@angular/${PACKAGE}
-  DESTDIR=./dist/packages-dist/${PACKAGE}
-  UMD_ES6_PATH=${DESTDIR}/esm/${PACKAGE}.umd.js
+  PWD=`pwd`
+  SRCDIR=${PWD}/modules/@angular/${PACKAGE}
+  DESTDIR=${PWD}/dist/packages-dist/${PACKAGE}
   UMD_ES5_PATH=${DESTDIR}/bundles/${PACKAGE}.umd.js
+  UMD_TESTING_ES5_PATH=${DESTDIR}/bundles/${PACKAGE}-testing.umd.js
   UMD_ES5_MIN_PATH=${DESTDIR}/bundles/${PACKAGE}.umd.min.js
+  LICENSE_BANNER=${PWD}/modules/@angular/license-banner.txt
 
-  echo "======      COMPILING: ${TSC} -p ${SRCDIR}/tsconfig-es5.json        ====="
-  $TSC -p ${SRCDIR}/tsconfig-es5.json
+  echo "======      COMPILING: ${TSC} -p ${SRCDIR}/tsconfig.json        ====="
+  $TSC -p ${SRCDIR}/tsconfig.json
 
   cp ${SRCDIR}/package.json ${DESTDIR}/
 
+  if [[ -e ${SRCDIR}/tsconfig-testing.json ]]; then
+    echo "======      COMPILING TESTING: ${TSC} -p ${SRCDIR}/tsconfig-testing.json"
+    $TSC -p ${SRCDIR}/tsconfig-testing.json
+  fi
 
   echo "======      TSC 1.8 d.ts compat for ${DESTDIR}   ====="
   # safely strips 'readonly' specifier from d.ts files to make them compatible with tsc 1.8
   if [ "$(uname)" == "Darwin" ]; then
-    find ${DESTDIR} -type f -name '*.d.ts' -print0 | xargs -0 sed -i ''    -e 's/\(^ *(static |private )*\)*readonly  */\1/g'
-    find ${DESTDIR} -type f -name '*.d.ts' -print0 | xargs -0 sed -i ''    -E 's/^( +)abstract ([[:alnum:]]+\:)/\1\2/g'
+    find ${DESTDIR} -type f -name '*.d.ts' -print0 | xargs -0 sed -i '' -e 's/\(^ *(static |private )*\)*readonly  */\1/g'
+    find ${DESTDIR} -type f -name '*.d.ts' -print0 | xargs -0 sed -i '' -e 's/\/\/\/ <reference types="node" \/>//g'
+    find ${DESTDIR} -type f -name '*.d.ts' -print0 | xargs -0 sed -i '' -E 's/^( +)abstract ([[:alnum:]]+\:)/\1\2/g'
   else
     find ${DESTDIR} -type f -name '*.d.ts' -print0 | xargs -0 sed -i -e 's/\(^ *(static |private )*\)*readonly  */\1/g'
+    find ${DESTDIR} -type f -name '*.d.ts' -print0 | xargs -0 sed -i -e 's/\/\/\/ <reference types="node" \/>//g'
     find ${DESTDIR} -type f -name '*.d.ts' -print0 | xargs -0 sed -i -E 's/^( +)abstract ([[:alnum:]]+\:)/\1\2/g'
   fi
 
   if [[ ${PACKAGE} != compiler-cli ]]; then
 
-    echo "====== (esm)COMPILING: $TSC -p ${SRCDIR}/tsconfig-es2015.json ====="
-    $TSC -p ${SRCDIR}/tsconfig-es2015.json
-
     echo "======      BUNDLING: ${SRCDIR} ====="
     mkdir ${DESTDIR}/bundles
 
     (
       cd  ${SRCDIR}
-      echo "..."  # here just to have grep match something and not exit with 1
+      echo "======         Rollup ${PACKAGE} index"
       ../../../node_modules/.bin/rollup -c rollup.config.js
+      cat ${LICENSE_BANNER} > ${UMD_ES5_PATH}.tmp
+      cat ${UMD_ES5_PATH} >> ${UMD_ES5_PATH}.tmp
+      mv ${UMD_ES5_PATH}.tmp ${UMD_ES5_PATH}
+      $UGLIFYJS -c --screw-ie8 --comments -o ${UMD_ES5_MIN_PATH} ${UMD_ES5_PATH}
+
+
+      if [[ -e rollup-testing.config.js ]]; then
+        echo "======         Rollup ${PACKAGE} testing"
+        ../../../node_modules/.bin/rollup -c rollup-testing.config.js
+        echo "{\"main\": \"../bundles/${PACKAGE}-testing.umd.js\"}" > ${DESTDIR}/testing/package.json
+        cat ${LICENSE_BANNER} > ${UMD_TESTING_ES5_PATH}.tmp
+        cat ${UMD_TESTING_ES5_PATH} >> ${UMD_TESTING_ES5_PATH}.tmp
+        mv ${UMD_TESTING_ES5_PATH}.tmp ${UMD_TESTING_ES5_PATH}
+      fi
     ) 2>&1 | grep -v "as external dependency"
 
-    $(npm bin)/tsc  \
-        --out ${UMD_ES5_PATH} \
-        --target es5 \
-        --lib "es6,dom" \
-        --allowJs \
-        ${UMD_ES6_PATH}
-
-    rm ${UMD_ES6_PATH}
-
-    cat ./modules/@angular/license-banner.txt > ${UMD_ES5_PATH}.tmp
-    cat ${UMD_ES5_PATH} >> ${UMD_ES5_PATH}.tmp
-    mv ${UMD_ES5_PATH}.tmp ${UMD_ES5_PATH}
-
-    $(npm bin)/uglifyjs -c --screw-ie8 -o ${UMD_ES5_MIN_PATH} ${UMD_ES5_PATH}
   fi
 done
 

gulpfile.js

@@ -30,22 +30,22 @@ gulp.task('format', () => {
 
 const entrypoints = [
   'dist/packages-dist/core/index.d.ts',
-  'dist/packages-dist/core/testing.d.ts',
+  'dist/packages-dist/core/testing/index.d.ts',
   'dist/packages-dist/common/index.d.ts',
-  'dist/packages-dist/common/testing.d.ts',
+  'dist/packages-dist/common/testing/index.d.ts',
   // The API surface of the compiler is currently unstable - all of the important APIs are exposed
   // via @angular/core, @angular/platform-browser or @angular/platform-browser-dynamic instead.
   //'dist/packages-dist/compiler/index.d.ts',
   //'dist/packages-dist/compiler/testing.d.ts',
   'dist/packages-dist/upgrade/index.d.ts',
   'dist/packages-dist/platform-browser/index.d.ts',
-  'dist/packages-dist/platform-browser/testing.d.ts',
+  'dist/packages-dist/platform-browser/testing/index.d.ts',
   'dist/packages-dist/platform-browser-dynamic/index.d.ts',
-  'dist/packages-dist/platform-browser-dynamic/testing.d.ts',
+  'dist/packages-dist/platform-browser-dynamic/testing/index.d.ts',
   'dist/packages-dist/platform-server/index.d.ts',
-  'dist/packages-dist/platform-server/testing.d.ts',
+  'dist/packages-dist/platform-server/testing/index.d.ts',
   'dist/packages-dist/http/index.d.ts',
-  'dist/packages-dist/http/testing.d.ts',
+  'dist/packages-dist/http/testing/index.d.ts',
   'dist/packages-dist/forms/index.d.ts',
   'dist/packages-dist/router/index.d.ts'
 ];
@@ -102,9 +102,10 @@ gulp.task('lint', ['format:enforce', 'tools:build'], () => {
     .pipe(tslint({
       tslint: require('tslint').default,
       configuration: tslintConfig,
-      rulesDirectory: 'dist/tools/tslint'
+      rulesDirectory: 'dist/tools/tslint',
+      formatter: 'prose'
     }))
-    .pipe(tslint.report('prose', {emitError: true}));
+    .pipe(tslint.report({emitError: true}));
 });
 
 gulp.task('tools:build', (done) => { tsc('tools/', done); });

modules/@angular/common/index.ts

@@ -6,8 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './src/pipes';
-export * from './src/directives';
-export * from './src/location';
-export {NgLocalization} from './src/localization';
-export {CommonModule} from './src/common_module';
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of the common package.
+ */
+export * from './src/common';
+
+// This file only reexports content of the `src` folder. Keep it that way.

modules/@angular/common/package.json

@@ -2,8 +2,8 @@
   "name": "@angular/common",
   "version": "0.0.0-PLACEHOLDER",
   "description": "",
-  "main": "index.js",
-  "jsnext:main": "esm/index.js",
+  "main": "bundles/common.umd.js",
+  "module": "index.js",
   "typings": "index.d.ts",
   "author": "angular",
   "license": "MIT",

modules/@angular/common/rollup-testing.config.js

@@ -0,0 +1,15 @@
+
+export default {
+  entry: '../../../dist/packages-dist/common/testing/index.js',
+  dest: '../../../dist/packages-dist/common/bundles/common-testing.umd.js',
+  format: 'umd',
+  moduleName: 'ng.common.testing',
+  globals: {
+    '@angular/core': 'ng.core',
+    '@angular/common': 'ng.common',
+    'rxjs/Subject': 'Rx',
+    'rxjs/observable/PromiseObservable': 'Rx', // this is wrong, but this stuff has changed in rxjs b.6 so we need to fix it when we update.
+    'rxjs/operator/toPromise': 'Rx.Observable.prototype',
+    'rxjs/Observable': 'Rx'
+  }
+}

modules/@angular/common/rollup.config.js

@@ -1,7 +1,7 @@
 
 export default {
-  entry: '../../../dist/packages-dist/common/esm/index.js',
-  dest: '../../../dist/packages-dist/common/esm/common.umd.js',
+  entry: '../../../dist/packages-dist/common/index.js',
+  dest: '../../../dist/packages-dist/common/bundles/common.umd.js',
   format: 'umd',
   moduleName: 'ng.common',
   globals: {
@@ -10,8 +10,5 @@ export default {
     'rxjs/observable/PromiseObservable': 'Rx', // this is wrong, but this stuff has changed in rxjs b.6 so we need to fix it when we update.
     'rxjs/operator/toPromise': 'Rx.Observable.prototype',
     'rxjs/Observable': 'Rx'
-  },
-  plugins: [
-//    nodeResolve({ jsnext: true, main: true }),
-  ]
+  }
 }

modules/@angular/common/src/common.ts

@@ -0,0 +1,13 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export * from './pipes';
+export * from './directives';
+export * from './location';
+export {NgLocalization} from './localization';
+export {CommonModule} from './common_module';

modules/@angular/common/testing/facade

@@ -0,0 +1 @@
+../../facade/src

modules/@angular/common/testing/index.ts

@@ -0,0 +1,15 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of the common/testing package.
+ */
+export {SpyLocation} from './location_mock';
+export {MockLocationStrategy} from './mock_location_strategy';

modules/@angular/common/testing/location_mock.ts

@@ -6,11 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {Location, LocationStrategy} from '@angular/common';
 import {EventEmitter, Injectable} from '@angular/core';
 
-import {Location} from '../index';
-import {LocationStrategy} from '../src/location/location_strategy';
-
 
 /**
  * A spy for {@link Location} that allows tests to fire simulated location events.