diff --git a/package.json b/package.json index 550d286812..706cb7ea7c 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "clean_dist_global": "Clean up existing Global package output", "commit": "Run git commit wizard", "compile_dist_cjs": "Compile codebase into CJS module", - "compile_dist_es6": "Compile codebase into ES6", + "compile_module_es6": "Compile codebase into ES6", "cover": "Execute test coverage", "lint_perf": "Run lint against performance test suite", "lint_spec": "Run lint against test spec", @@ -54,7 +54,7 @@ "info": "npm-scripts-info", "build_all": "npm-run-all build_cjs build_global generate_packages", "build_cjs": "npm-run-all clean_dist_cjs copy_src_cjs compile_dist_cjs", - "build_es6": "npm-run-all clean_dist_es6 copy_src_es6 compile_dist_es6", + "build_es6": "npm-run-all clean_dist_es6 copy_src_es6 compile_module_es6", "build_es6_for_docs": "npm-run-all clean_dist_es6 copy_src_es6 compile_dist_es6_for_docs", "build_closure_core": "node ./tools/make-closure-core.js", "build_global": "npm-run-all clean_dist_global build_es6 && mkdirp ./dist/global && node ./tools/make-umd-bundle.js && npm-run-all build_closure_core", @@ -73,7 +73,7 @@ "copy_src_es6": "mkdirp ./dist/es6/src && shx cp -r ./src/* ./dist/es6/src", "commit": "git-cz", "compile_dist_cjs": "tsc ./dist/cjs/src/Rx.ts ./dist/cjs/src/add/observable/of.ts -m commonjs --lib es5,es2015.iterable,es2015.collection,es2015.promise,dom --sourceMap --outDir ./dist/cjs --target ES5 -d --diagnostics --pretty --noImplicitAny --noImplicitReturns --suppressImplicitAnyIndexErrors --moduleResolution node", - "compile_dist_es6": "tsc ./dist/es6/src/Rx.ts ./dist/es6/src/add/observable/of.ts -m es2015 --sourceMap --outDir ./dist/es6 --target ES6 -d --diagnostics --pretty --noImplicitAny --noImplicitReturns --suppressImplicitAnyIndexErrors --moduleResolution node", + "compile_module_es6": "tsc ./dist/es6/src/Rx.ts ./dist/es6/src/add/observable/of.ts -m es2015 --sourceMap --outDir ./dist/es6 --target ES5 -d --diagnostics --pretty --noImplicitAny --noImplicitReturns --suppressImplicitAnyIndexErrors --moduleResolution node --noEmitHelpers --lib es5,es2015.iterable,es2015.collection,es2015.promise,dom ", "compile_dist_es6_for_docs": "tsc ./dist/es6/src/Rx.ts ./dist/es6/src/add/observable/of.ts ./dist/es6/src/MiscJSDoc.ts -m es2015 --sourceMap --outDir ./dist/es6 --target ES6 -d --diagnostics --pretty --noImplicitAny --noImplicitReturns --suppressImplicitAnyIndexErrors --moduleResolution node", "cover": "shx rm -rf dist/cjs && tsc src/Rx.ts src/add/observable/of.ts -m commonjs --lib es5,es2015.iterable,es2015.collection,es2015.promise,dom --outDir dist/cjs --sourceMap --target ES5 -d && nyc --reporter=lcov --reporter=html --exclude=spec/support/**/* --exclude=spec-js/**/* --exclude=node_modules mocha --opts spec/support/default.opts spec-js", "decision_tree_widget": "cd doc/decision-tree-widget && npm run build && cd ../..", @@ -149,9 +149,6 @@ "@types/mocha": "^2.2.32", "@types/sinon": "^1.16.31", "@types/sinon-chai": "^2.7.27", - "babel-core": "6.17.0", - "babel-polyfill": "6.16.0", - "babel-preset-es2015": "6.16.0", "benchmark": "^2.1.0", "benchpress": "2.0.0-beta.1", "chai": "^3.5.0", @@ -192,6 +189,7 @@ "sinon": "^2.0.0-pre", "sinon-chai": "^2.8.0", "source-map-support": "^0.4.0", + "tslib": "^1.0.0", "tslint": "^3.15.1", "typescript": "^2.0.3", "validate-commit-msg": "^2.3.1", @@ -207,4 +205,4 @@ "dependencies": { "symbol-observable": "^1.0.1" } -} \ No newline at end of file +} diff --git a/tools/make-umd-bundle.js b/tools/make-umd-bundle.js index bc9450a741..f4792646f8 100644 --- a/tools/make-umd-bundle.js +++ b/tools/make-umd-bundle.js @@ -1,21 +1,17 @@ var rollup = require('rollup'); var fs = require('fs'); - -var babel = require('babel-core'); +var path = require('path'); rollup.rollup({ entry: 'dist/es6/Rx.js' }).then(function (bundle) { var result = bundle.generate({ - format: 'es' - }); - - var out = babel.transform(result.code, { - compact: false, - presets: [ - ['es2015', { loose: true }] - ], + format: 'umd', + moduleName: 'Rx', + sourceMap: true }); + var tslib = fs.readFileSync(path.join(process.cwd() + '/node_modules/tslib/tslib.js'), 'utf8') - fs.writeFileSync('dist/global/Rx.js', out.code); + fs.writeFileSync('dist/global/Rx.js', tslib + result.code); + fs.writeFileSync('dist/global/Rx.js.map', result.map); });