feat: update the package output of build.sh to APF v6

angular · Mar 18, 2018 · 75df8a8 · 75df8a8
1 parent 1320553
commit 75df8a8
Show file tree

Hide file tree

Showing 68 changed files with 234 additions and 104 deletions.
diff --git a/build.sh b/build.sh
@@ -452,7 +452,9 @@ do
   OUT_DIR_ESM5=${ROOT_OUT_DIR}/${PACKAGE}/esm5
   NPM_DIR=${PWD}/dist/packages-dist/${PACKAGE}
   ESM2015_DIR=${NPM_DIR}/esm2015
+  FESM2015_DIR=${NPM_DIR}/fesm2015
   ESM5_DIR=${NPM_DIR}/esm5
+  FESM5_DIR=${NPM_DIR}/fesm5
   BUNDLES_DIR=${NPM_DIR}/bundles
 
   LICENSE_BANNER=${ROOT_DIR}/license-banner.txt
@@ -474,12 +476,16 @@ do
 
       (
         cd  ${SRC_DIR}
+        echo "======         Copy ESM2015 for ${PACKAGE}"
+        rsync -a --exclude="locale/**" --exclude="**/*.d.ts" --exclude="**/*.metadata.json" ${OUT_DIR}/ ${ESM2015_DIR}
+
         echo "======         Rollup ${PACKAGE}"
-        rollupIndex ${OUT_DIR} ${ESM2015_DIR} ${PACKAGE}
+        rollupIndex ${OUT_DIR} ${FESM2015_DIR} ${PACKAGE}
 
         echo "======         Produce ESM5 version"
         compilePackageES5 ${SRC_DIR} ${OUT_DIR_ESM5} ${PACKAGE}
-        rollupIndex ${OUT_DIR_ESM5} ${ESM5_DIR} ${PACKAGE}
+        rsync -a --exclude="locale/**" --exclude="**/*.d.ts" --exclude="**/*.metadata.json" ${OUT_DIR_ESM5}/ ${ESM5_DIR}
+        rollupIndex ${OUT_DIR_ESM5} ${FESM5_DIR} ${PACKAGE}
 
         echo "======         Run rollup conversions on ${PACKAGE}"
         runRollup ${SRC_DIR}

diff --git a/integration/_payload-limits.json b/integration/_payload-limits.json
@@ -2,9 +2,9 @@
   "cli-hello-world": {
     "master": {
       "uncompressed": {
-        "inline": 1447,
-        "main": 157654,
-        "polyfills": 59179
+        "inline": 1508,
+        "main": 156641,
+        "polyfills": 59483
       }
     }
   },

diff --git a/integration/cli-hello-world/package.json b/integration/cli-hello-world/package.json
@@ -10,7 +10,7 @@
     "lint": "ng lint",
     "e2e": "ng e2e",
     "postinstall": "patch for https://github.com/angular/devkit/pull/524",
-    "postinstall": "sed -i.bak  's/]esm5/]f?esm5/' node_modules/@angular-devkit/build-optimizer/src/build-optimizer/build-ptimizer.js"
+    "postinstall": "sed -i.bak  's/]esm5/]f?esm5/' node_modules/@angular-devkit/build-optimizer/src/build-optimizer/build-optimizer.js"
   },
   "private": true,
   "dependencies": {

diff --git a/integration/hello_world__closure/closure.conf b/integration/hello_world__closure/closure.conf
@@ -16,11 +16,11 @@ node_modules/zone.js/dist/zone_externs.js
 --js node_modules/rxjs/**.js
 
 --js node_modules/@angular/core/package.json
---js node_modules/@angular/core/esm2015/core.js
+--js node_modules/@angular/core/fesm2015/core.js
 --js node_modules/@angular/core/src/testability/testability.externs.js
 
 --js node_modules/@angular/common/package.json
---js node_modules/@angular/common/esm2015/common.js
+--js node_modules/@angular/common/fesm2015/common.js
 
 --js node_modules/@angular/platform-browser/package.json
 --js node_modules/@angular/platform-browser/esm2015/platform-browser.js

diff --git a/packages/animations/browser/package.json b/packages/animations/browser/package.json
@@ -2,7 +2,11 @@
   "name": "@angular/animations/browser",
   "typings": "./browser.d.ts",
   "main": "../bundles/animations-browser.umd.js",
-  "module": "../esm5/browser.js",
-  "es2015": "../esm2015/browser.js",
+  "module": "../fesm5/browser.js",
+  "es2015": "../fesm2015/browser/browser.js",
+  "esm5": "../esm5/browser/browser.js",
+  "esm2015": "../esm2015/browser/browser.js",
+  "fesm5": "../fesm5/browser.js",
+  "fesm2015": "../fesm2015/browser.js",
   "sideEffects": false
 }
diff --git a/packages/animations/browser/rollup.config.js b/packages/animations/browser/rollup.config.js
@@ -16,7 +16,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../../dist/packages-dist/animations/esm5/browser.js',
+  entry: '../../../dist/packages-dist/animations/fesm5/browser.js',
   dest: '../../../dist/packages-dist/animations/bundles/animations-browser.umd.js',
   format: 'umd',
   exports: 'named',

diff --git a/packages/animations/browser/testing/package.json b/packages/animations/browser/testing/package.json
@@ -2,6 +2,10 @@
   "name": "@angular/animations/browser/testing",
   "typings": "./testing.d.ts",
   "main": "../../bundles/platform-browser-animations-testing.umd.js",
-  "module": "../../esm5/animations/testing.js",
-  "es2015": "../../esm2015/animations/testing.js"
+  "module": "../../fesm5/animations/testing.js",
+  "es2015": "../../fesm2015/animations/testing.js",
+  "esm5": "../../esm5/animations/testing.js",
+  "esm2015": "../../esm2015/animations/testing.js",
+  "fesm5": "../../fesm5/animations/testing.js",
+  "fesm2015": "../../fesm2015/animations/testing.js"
 }
diff --git a/packages/animations/browser/testing/rollup.config.js b/packages/animations/browser/testing/rollup.config.js
@@ -18,7 +18,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../../../dist/packages-dist/animations/esm5/browser/testing.js',
+  entry: '../../../../dist/packages-dist/animations/fesm5/browser/testing.js',
   dest: '../../../../dist/packages-dist/animations/bundles/animations-browser-testing.umd.js',
   format: 'umd',
   exports: 'named',

diff --git a/packages/animations/package.json b/packages/animations/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - animations integration with web-animationss",
   "main": "./bundles/animations.umd.js",
-  "module": "./esm5/animations.js",
-  "es2015": "./esm2015/animations.js",
+  "module": "./fesm5/animations.js",
+  "es2015": "./fesm2015/animations.js",
+  "esm5": "./esm5/animations.js",
+  "esm2015": "./esm2015/animations.js",
+  "fesm5": "./fesm5/animations.js",
+  "fesm2015": "./fesm2015/animations.js",
   "typings": "./animations.d.ts",
   "author": "angular",
   "license": "MIT",

diff --git a/packages/animations/rollup.config.js b/packages/animations/rollup.config.js
@@ -17,7 +17,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/animations/esm5/animations.js',
+  entry: '../../dist/packages-dist/animations/fesm5/animations.js',
   dest: '../../dist/packages-dist/animations/bundles/animations.umd.js',
   format: 'umd',
   exports: 'named',

diff --git a/packages/common/http/package.json b/packages/common/http/package.json
@@ -2,7 +2,11 @@
   "name": "@angular/common/http",
   "typings": "./http.d.ts",
   "main": "../bundles/common-http.umd.js",
-  "module": "../esm5/http.js",
-  "es2015": "../esm2015/http.js",
+  "module": "../fesm5/http.js",
+  "es2015": "../fesm2015/http/http.js",
+  "esm5": "../esm5/http/http.js",
+  "esm2015": "../esm2015/http/http.js",
+  "fesm5": "../fesm5/http.js",
+  "fesm2015": "../fesm2015/http.js",
   "sideEffects": false
 }
diff --git a/packages/common/http/rollup.config.js b/packages/common/http/rollup.config.js
@@ -22,7 +22,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../../dist/packages-dist/common/esm5/http.js',
+  entry: '../../../dist/packages-dist/common/fesm5/http.js',
   dest: '../../../dist/packages-dist/common/bundles/common-http.umd.js',
   format: 'umd',
   exports: 'named',

diff --git a/packages/common/http/testing/package.json b/packages/common/http/testing/package.json
@@ -2,6 +2,10 @@
   "name": "@angular/common/http/testing",
   "typings": "./testing.d.ts",
   "main": "../../bundles/common-http-testing.umd.js",
-  "module": "../../esm5/http/testing.js",
-  "es2015": "../../esm2015/http/testing.js"
+  "module": "../../fesm5/http/testing.js",
+  "es2015": "../../fesm2015/http/testing.js",
+  "esm5": "../../esm5/http/testing.js",
+  "esm2015": "../../esm2015/http/testing.js",
+  "fesm5": "../../fesm5/http/testing.js",
+  "fesm2015": "../../fesm2015/http/testing.js"
 }
diff --git a/packages/common/http/testing/rollup.config.js b/packages/common/http/testing/rollup.config.js
@@ -23,7 +23,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../../../dist/packages-dist/common/esm5/http/testing.js',
+  entry: '../../../../dist/packages-dist/common/fesm5/http/testing.js',
   dest: '../../../../dist/packages-dist/common/bundles/common-http-testing.umd.js',
   format: 'umd',
   exports: 'named',

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - commonly needed directives and services",
   "main": "./bundles/common.umd.js",
-  "module": "./esm5/common.js",
-  "es2015": "./esm2015/common.js",
+  "module": "./fesm5/common.js",
+  "es2015": "./fesm2015/common.js",
+  "esm5": "./esm5/common.js",
+  "esm2015": "./esm2015/common.js",
+  "fesm5": "./fesm5/common.js",
+  "fesm2015": "./fesm2015/common.js",
   "typings": "./common.d.ts",
   "author": "angular",
   "license": "MIT",

diff --git a/packages/common/rollup.config.js b/packages/common/rollup.config.js
@@ -18,7 +18,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/common/esm5/common.js',
+  entry: '../../dist/packages-dist/common/fesm5/common.js',
   dest: '../../dist/packages-dist/common/bundles/common.umd.js',
   format: 'umd',
   exports: 'named',

diff --git a/packages/common/testing/package.json b/packages/common/testing/package.json
@@ -2,6 +2,10 @@
   "name": "@angular/common/testing",
   "typings": "./testing.d.ts",
   "main": "../bundles/common-testing.umd.js",
-  "module": "../esm5/testing.js",
-  "es2015": "../esm2015/testing.js"
+  "module": "../fesm5/testing.js",
+  "es2015": "../fesm2015/testing/testing.js",
+  "esm5": "../esm5/testing/testing.js",
+  "esm2015": "../esm2015/testing/testing.js",
+  "fesm5": "../fesm5/testing.js",
+  "fesm2015": "../fesm2015/testing.js"
 }
diff --git a/packages/common/testing/rollup.config.js b/packages/common/testing/rollup.config.js
@@ -18,7 +18,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../../dist/packages-dist/common/esm5/testing.js',
+  entry: '../../../dist/packages-dist/common/fesm5/testing.js',
   dest: '../../../dist/packages-dist/common/bundles/common-testing.umd.js',
   format: 'umd',
   exports: 'named',

diff --git a/packages/compiler/package.json b/packages/compiler/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - the compiler library",
   "main": "./bundles/compiler.umd.js",
-  "module": "./esm5/compiler.js",
-  "es2015": "./esm2015/compiler.js",
+  "module": "./fesm5/compiler.js",
+  "es2015": "./fesm2015/compiler.js",
+  "esm5": "./esm5/compiler.js",
+  "esm2015": "./esm2015/compiler.js",
+  "fesm5": "./fesm5/compiler.js",
+  "fesm2015": "./fesm2015/compiler.js",
   "typings": "./compiler.d.ts",
   "author": "angular",
   "license": "MIT",

diff --git a/packages/compiler/rollup.config.js b/packages/compiler/rollup.config.js
@@ -16,7 +16,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/compiler/esm5/compiler.js',
+  entry: '../../dist/packages-dist/compiler/fesm5/compiler.js',
   dest: '../../dist/packages-dist/compiler/bundles/compiler.umd.js',
   format: 'umd',
   exports: 'named',

diff --git a/packages/compiler/testing/package.json b/packages/compiler/testing/package.json
@@ -2,6 +2,10 @@
   "name": "@angular/compiler/testing",
   "typings": "./testing.d.ts",
   "main": "../bundles/compiler-testing.umd.js",
-  "module": "../esm5/testing.js",
-  "es2015": "../esm2015/testing.js"
+  "module": "../fesm5/testing.js",
+  "es2015": "../fesm2015/testing/testing.js",
+  "esm5": "../esm5/testing/testing.js",
+  "esm2015": "../esm2015/testing/testing.js",
+  "fesm5": "../fesm5/testing.js",
+  "fesm2015": "../fesm2015/testing.js"
 }
diff --git a/packages/compiler/testing/rollup.config.js b/packages/compiler/testing/rollup.config.js
@@ -18,7 +18,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../../dist/packages-dist/compiler/esm5/testing.js',
+  entry: '../../../dist/packages-dist/compiler/fesm5/testing.js',
   dest: '../../../dist/packages-dist/compiler/bundles/compiler-testing.umd.js',
   format: 'umd',
   exports: 'named',

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - the core framework",
   "main": "./bundles/core.umd.js",
-  "module": "./esm5/core.js",
-  "es2015": "./esm2015/core.js",
+  "module": "./fesm5/core.js",
+  "es2015": "./fesm2015/core.js",
+  "esm5": "./esm5/core.js",
+  "esm2015": "./esm2015/core.js",
+  "fesm5": "./fesm5/core.js",
+  "fesm2015": "./fesm2015/core.js",
   "typings": "./core.d.ts",
   "author": "angular",
   "license": "MIT",

diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js
@@ -19,7 +19,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/core/esm5/core.js',
+  entry: '../../dist/packages-dist/core/fesm5/core.js',
   dest: '../../dist/packages-dist/core/bundles/core.umd.js',
   format: 'umd',
   exports: 'named',

diff --git a/packages/core/testing/package.json b/packages/core/testing/package.json
@@ -2,6 +2,10 @@
   "name": "@angular/core/testing",
   "typings": "./testing.d.ts",
   "main": "../bundles/core-testing.umd.js",
-  "module": "../esm5/testing.js",
-  "es2015": "../esm2015/testing.js"
+  "module": "../fesm5/testing.js",
+  "es2015": "../fesm2015/testing/testing.js",
+  "esm5": "../esm5/testing/testing.js",
+  "esm2015": "../esm2015/testing/testing.js",
+  "fesm5": "../fesm5/testing.js",
+  "fesm2015": "../fesm2015/testing.js"
 }
diff --git a/packages/core/testing/rollup.config.js b/packages/core/testing/rollup.config.js
@@ -16,7 +16,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../../dist/packages-dist/core/esm5/testing.js',
+  entry: '../../../dist/packages-dist/core/fesm5/testing.js',
   dest: '../../../dist/packages-dist/core/bundles/core-testing.umd.js',
   format: 'umd',
   exports: 'named',

diff --git a/packages/elements/package.json b/packages/elements/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - library for using Angular Components as Custom Elements",
   "main": "./bundles/elements.umd.js",
-  "module": "./esm5/elements.js",
-  "es2015": "./esm2015/elements.js",
+  "module": "./fesm5/elements.js",
+  "es2015": "./fesm2015/elements.js",
+  "esm5": "./esm5/elements.js",
+  "esm2015": "./esm2015/elements.js",
+  "fesm5": "../fesm5/testing.js",
+  "fesm2015": "../fesm2015/testing.js",
   "typings": "./elements.d.ts",
   "author": "angular",
   "license": "MIT",

diff --git a/packages/elements/rollup.config.js b/packages/elements/rollup.config.js
@@ -19,7 +19,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/elements/esm5/elements.js',
+  entry: '../../dist/packages-dist/elements/fesm5/elements.js',
   dest: '../../dist/packages-dist/elements/bundles/elements.umd.js',
   format: 'umd',
   exports: 'named',

diff --git a/packages/forms/package.json b/packages/forms/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - directives and services for creating forms",
   "main": "./bundles/forms.umd.js",
-  "module": "./esm5/forms.js",
-  "es2015": "./esm2015/forms.js",
+  "module": "./fesm5/forms.js",
+  "es2015": "./fesm2015/forms.js",
+  "esm5": "./esm5/forms.js",
+  "esm2015": "./esm2015/forms.js",
+  "fesm5": "./fesm5/forms.js",
+  "fesm2015": "./fesm2015/forms.js",
   "typings": "./forms.d.ts",
   "author": "angular",
   "license": "MIT",

diff --git a/packages/forms/rollup.config.js b/packages/forms/rollup.config.js
@@ -22,7 +22,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/forms/esm5/forms.js',
+  entry: '../../dist/packages-dist/forms/fesm5/forms.js',
   dest: '../../dist/packages-dist/forms/bundles/forms.umd.js',
   format: 'umd',
   exports: 'named',

diff --git a/packages/http/package.json b/packages/http/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - the http service",
   "main": "./bundles/http.umd.js",
-  "module": "./esm5/http.js",
-  "es2015": "./esm2015/http.js",
+  "module": "./fesm5/http.js",
+  "es2015": "./fesm2015/http.js",
+  "esm5": "./esm5/http.js",
+  "esm2015": "./esm2015/http.js",
+  "fesm5": "./fesm5/http.js",
+  "fesm2015": "./fesm2015/http.js",
   "typings": "./http.d.ts",
   "author": "angular",
   "license": "MIT",

diff --git a/packages/http/rollup.config.js b/packages/http/rollup.config.js
@@ -19,7 +19,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/http/esm5/http.js',
+  entry: '../../dist/packages-dist/http/fesm5/http.js',
   dest: '../../dist/packages-dist/http/bundles/http.umd.js',
   format: 'umd',
   exports: 'named',