Build bazel umds

package.json

@@ -216,7 +216,7 @@
     "platform": "1.3.5",
     "promise": "8.0.1",
     "protractor": "3.1.1",
-    "rollup": "0.36.3",
+    "rollup": "0.66.6",
     "rollup-plugin-alias": "1.4.0",
     "rollup-plugin-inject": "2.0.0",
     "rollup-plugin-node-resolve": "2.0.0",

tools/make-closure-compat.js

@@ -1,15 +1,3 @@
-var compiler = require('google-closure-compiler-js').compile;
-var fs = require('fs');
+var makeClosure = require('./make-closure');
 
-var source = fs.readFileSync('dist-compat/global/rxjs-compat.umd.js', 'utf8');
-
-var compilerFlags = {
-  jsCode: [{src: source}],
-  languageIn: 'ES2015',
-  createSourceMap: true,
-};
-
-var output = compiler(compilerFlags);
-
-fs.writeFileSync('dist-compat/global/rxjs-compat.umd.min.js', output.compiledCode, 'utf8');
-fs.writeFileSync('dist-compat/global/rxjs-compat.umd.min.js.map', output.sourceMap, 'utf8');
+makeClosure('dist-compat/global/rxjs-compat.umd.js');

tools/make-closure-core.js

@@ -1,15 +1,3 @@
-var compiler = require('google-closure-compiler-js').compile;
-var fs = require('fs');
+var makeClosure = require('./make-closure');
 
-var source = fs.readFileSync('dist/global/rxjs.umd.js', 'utf8');
-
-var compilerFlags = {
-  jsCode: [{src: source}],
-  languageIn: 'ES2015',
-  createSourceMap: true,
-};
-
-var output = compiler(compilerFlags);
-
-fs.writeFileSync('dist/global/rxjs.umd.min.js', output.compiledCode, 'utf8');
-fs.writeFileSync('dist/global/rxjs.umd.min.js.map', output.sourceMap, 'utf8');
+makeClosure('dist/global/rxjs.umd.js');

tools/make-closure.js

@@ -0,0 +1,22 @@
+var compiler = require('google-closure-compiler-js').compile;
+var fs = require('fs');
+var path = require('path');
+
+module.exports = function makeClosure(sourcePath) {
+  var source = fs.readFileSync(sourcePath, 'utf8');
+
+  var compilerFlags = {
+    jsCode: [{src: source}],
+    languageIn: 'ES2015',
+    createSourceMap: true,
+  };
+
+  var output = compiler(compilerFlags);
+
+  var dest = sourcePath.replace(/.js$/, '.min.js');
+  var sourceMapDest = dest + '.map';
+  output.compiledCode = output.compiledCode + '\n//# sourceMappingURL=' + path.basename(sourceMapDest);
+
+  fs.writeFileSync(dest, output.compiledCode, 'utf8');
+  fs.writeFileSync(sourceMapDest, output.sourceMap, 'utf8');
+};

tools/make-umd-bundle.js

@@ -1,34 +1,6 @@
-var _ = require('lodash');
+var rollupBundle = require('./rollup-bundle');
 
-var rollup = require('rollup');
-var rollupInject = require('rollup-plugin-inject');
-var rollupNodeResolve = require('rollup-plugin-node-resolve');
-
-var fs = require('fs');
-var path = require('path');
-
-var tslib = require('tslib');
-
-rollup.rollup({
-  entry: 'dist/esm5_for_rollup/internal/umd.js',
-  plugins: [
-    rollupNodeResolve({
-      jsnext: true,
-    }),
-    rollupInject({
-      exclude: 'node_modules/**',
-      modules: _.mapValues(tslib, function (value, key) {
-        return ['tslib', key];
-      }),
-    }),
-  ],
-}).then(function (bundle) {
-  var result = bundle.generate({
-    format: 'umd',
-    moduleName: 'rxjs',
-    sourceMap: true
-  });
-
-  fs.writeFileSync('dist/global/rxjs.umd.js', result.code);
-  fs.writeFileSync('dist/global/rxjs.umd.js.map', result.map);
+rollupBundle({
+  input: 'dist/esm5_for_rollup/internal/umd.js',
+  dest: 'dist/global/rxjs.umd.js',
 });

tools/make-umd-compat-bundle.js

@@ -1,41 +1,14 @@
-var _ = require('lodash');
-
-var rollup = require('rollup');
-var rollupAlias = require('rollup-plugin-alias');
-var rollupInject = require('rollup-plugin-inject');
-var rollupNodeResolve = require('rollup-plugin-node-resolve');
-
-var fs = require('fs');
-var tslib = require('tslib');
-
-rollup.rollup({
-  entry: 'dist-compat/esm5_for_rollup/compat/umd.js',
-  plugins: [
-    rollupAlias({
-      'rxjs/testing': 'dist-compat/esm5_for_rollup/src/testing/index.js',
-      'rxjs/operators': 'dist-compat/esm5_for_rollup/src/operators/index.js',
-      'rxjs/webSocket': 'dist-compat/esm5_for_rollup/src/webSocket/index.js',
-      'rxjs/ajax': 'dist-compat/esm5_for_rollup/src/ajax/index.js',
-      'rxjs/internal-compatibility': 'dist-compat/esm5_for_rollup/src/internal-compatibility/index.js',
-      'rxjs': 'dist-compat/esm5_for_rollup/src/index.js',
-    }),
-    rollupNodeResolve({
-      jsnext: true,
-    }),
-    rollupInject({
-      exclude: 'node_modules/**',
-      modules: _.mapValues(tslib, function (value, key) {
-        return ['tslib', key];
-      }),
-    }),
-  ],
-}).then(function (bundle) {
-  var result = bundle.generate({
-    format: 'umd',
-    moduleName: 'rxjs',
-    sourceMap: true
-  });
-
-  fs.writeFileSync('dist-compat/global/rxjs-compat.umd.js', result.code);
-  fs.writeFileSync('dist-compat/global/rxjs-compat.umd.js.map', result.map);
+var rollupBundle = require('./rollup-bundle');
+
+rollupBundle({
+  input: 'dist-compat/esm5_for_rollup/compat/umd.js',
+  dest: 'dist-compat/global/rxjs-compat.umd.js',
+  aliases: {
+    'rxjs/testing': 'dist-compat/esm5_for_rollup/src/testing/index.js',
+    'rxjs/operators': 'dist-compat/esm5_for_rollup/src/operators/index.js',
+    'rxjs/webSocket': 'dist-compat/esm5_for_rollup/src/webSocket/index.js',
+    'rxjs/ajax': 'dist-compat/esm5_for_rollup/src/ajax/index.js',
+    'rxjs/internal-compatibility': 'dist-compat/esm5_for_rollup/src/internal-compatibility/index.js',
+    'rxjs': 'dist-compat/esm5_for_rollup/src/index.js',
+  },
 });

tools/rollup-bundle.js

@@ -0,0 +1,50 @@
+var _ = require('lodash');
+
+var rollup = require('rollup');
+var rollupAlias = require('rollup-plugin-alias');
+var rollupInject = require('rollup-plugin-inject');
+var rollupNodeResolve = require('rollup-plugin-node-resolve');
+
+var fs = require('fs');
+var tslib = require('tslib');
+var path = require('path');
+
+module.exports = function rollupBundle(options) {
+  var dest = options.dest;
+  var sourcemapFullFile = dest + '.map';
+
+  rollup.rollup({
+    input: options.input,
+    plugins: [
+      rollupAlias(options.aliases),
+      rollupNodeResolve({
+        jsnext: true,
+      }),
+      rollupInject({
+        exclude: 'node_modules/**',
+        modules: _.mapValues(tslib, function (value, key) {
+          return ['tslib', key];
+        }),
+      }),
+    ],
+  }).then(function (bundle) {
+    return bundle.generate({
+      format: 'umd',
+      name: 'rxjs',
+      amd: {
+        id: 'rxjs'
+      },
+      sourcemap: true,
+    });
+  }).then(function (result) {
+    // rollup doesn't add a sourceMappingURL
+    // https://github.com/rollup/rollup/issues/121
+    result.code = result.code + '\n//# sourceMappingURL=' + path.basename(sourcemapFullFile);
+
+    fs.writeFileSync(dest, result.code);
+    fs.writeFileSync(sourcemapFullFile, result.map);
+  }).catch(function (err) {
+    console.error(err);
+    process.exit(1);
+  });
+};