diff --git a/.make-packages.js b/.make-packages.js index 0fd4c66a0b..b5e8c894e1 100644 --- a/.make-packages.js +++ b/.make-packages.js @@ -29,6 +29,7 @@ const UMD_ROOT = ROOT + 'global/'; const ESM5_FOR_ROLLUP_ROOT = ROOT + 'esm5_for_rollup/'; const LEGACY_REEXPORT_ROOT = ROOT + 'legacy-reexport/'; const TYPE_ROOT = ROOT + 'typings/'; +const MIGRATION_PKG = ROOT + 'migrations/'; const PKG_ROOT = ROOT + 'package/'; const CJS_PKG = PKG_ROOT + ''; const ESM5_PKG = PKG_ROOT + '_esm5/'; @@ -139,7 +140,7 @@ fs.copySync('src/testing/package.json', PKG_ROOT + '/testing/package.json'); fs.copySync('src/internal-compatibility/package.json', PKG_ROOT + '/internal-compatibility/package.json'); // Copy over migrations -fs.copySync('migrations/', PKG_ROOT + 'migrations/'); +fs.copySync(MIGRATION_PKG, PKG_ROOT + 'migrations/'); if (fs.existsSync(UMD_ROOT)) { fs.copySync(UMD_ROOT, UMD_PKG); diff --git a/package-lock.json b/package-lock.json index b48cc4ae29..7ee1e9c271 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@reactivex/rxjs", - "version": "6.0.0-tactical-rc.1", + "version": "6.0.0-turbo-rc.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -124,6 +124,12 @@ "@types/sinon": "4.1.3" } }, + "@types/source-map": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@types/source-map/-/source-map-0.5.2.tgz", + "integrity": "sha512-++w4WmMbk3dS3UeHGzAG+xJOSz5Xqtjys/TBkqG3qp3SeWE7Wwezqe5eB7B51cxUyh4PW7bwVotpsLdBK0D8cw==", + "dev": true + }, "@types/strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz", diff --git a/package.json b/package.json index 0a9773a975..f736221bd9 100644 --- a/package.json +++ b/package.json @@ -75,13 +75,14 @@ "precommit": "lint-staged", "commitmsg": "validate-commit-msg", "info": "npm-scripts-info", - "build_all": "npm-run-all compat_build_all clean_dist copy_sources build_cjs build_esm5 build_esm2015 build_esm5_for_rollup build_umd build_legacy_reexport generate_packages copy_for_tests", + "build_all": "npm-run-all compat_build_all clean_dist copy_sources build_cjs build_esm5 build_esm2015 build_esm5_for_rollup build_umd build_legacy_reexport build_migrations generate_packages copy_for_tests", "build_cjs": "npm-run-all clean_dist_cjs compile_dist_cjs", "build_esm5": "npm-run-all clean_dist_esm5 compile_dist_esm5", "build_esm5_for_rollup": "npm-run-all clean_dist_esm5_for_rollup compile_dist_esm5_for_rollup && mkdirp dist/esm5_for_rollup/node_modules && shx cp -r ./dist-compat/package ./dist/esm5_for_rollup/node_modules/rxjs-compat", "build_esm2015": "npm-run-all clean_dist_esm2015 compile_dist_esm2015", "build_esm2015_for_docs": "npm-run-all clean_dist_esm2015 compile_dist_esm2015_for_docs", "build_legacy_reexport": "npm-run-all compile_legacy_reexport", + "build_migrations": "npm-run-all clean_dist_migrations compile_dist_migrations", "build_closure_core": "node ./tools/make-closure-core.js", "build_global": "npm-run-all clean_dist_global build_esm5_for_rollup && mkdirp ./dist/global && node ./tools/make-umd-bundle.js && npm-run-all build_closure_core clean_dist_esm5_for_rollup", "build_umd": "npm-run-all clean_dist_global && mkdirp ./dist/global && node ./tools/make-umd-bundle.js && npm-run-all build_closure_core", @@ -96,12 +97,14 @@ "clean_dist_esm5_for_rollup": "shx rm -rf ./dist/esm5_for_rollup", "clean_dist_esm2015": "shx rm -rf ./dist/esm2015", "clean_dist_global": "shx rm -rf ./dist/global", + "clean_dist_migrations": "shx rm -rf ./dist/migrations", "commit": "git-cz", "compile_dist_cjs": "tsc -p ./tsconfig/tsconfig.cjs.json", "compile_dist_esm5": "tsc -p ./tsconfig/tsconfig.esm5.json", "compile_dist_esm2015": "tsc -p ./tsconfig/tsconfig.esm2015.json", "compile_dist_esm2015_for_docs": "tsc ./dist/src/internal/Rx.ts ./dist/src/add/observable/of.ts ./dist/src/MiscJSDoc.ts -m es2015 --sourceMap --outDir ./dist/es6 --target es2015 -d --diagnostics --pretty --noImplicitAny --noImplicitReturns --noImplicitThis --suppressImplicitAnyIndexErrors --moduleResolution node", "compile_dist_esm5_for_rollup": "tsc -p ./tsconfig/tsconfig.esm5.rollup.json", + "compile_dist_migrations": "tsc -p ./tsconfig/tsconfig.migrations.json", "compile_legacy_reexport": "tsc -p ./tsconfig/tsconfig.legacy-reexport.json", "copy_sources": "mkdirp dist && shx cp -r ./src/ ./dist/src", "copy_for_tests": "shx rm -rf ./spec-build && shx cp -r ./spec/ ./spec-build/ && mkdirp ./spec-build/node_modules && shx cp -r ./dist/package/ ./spec-build/node_modules/rxjs && shx cp -r ./dist-compat/package/ ./spec-build/node_modules/rxjs-compat", @@ -197,6 +200,7 @@ "@types/node": "9.4.5", "@types/sinon": "4.1.3", "@types/sinon-chai": "2.7.29", + "@types/source-map": "^0.5.2", "babel-polyfill": "6.26.0", "benchmark": "2.1.0", "benchpress": "2.0.0-beta.1", diff --git a/tsconfig.base.json b/tsconfig.base.json index 6d0829bd41..97ffda3726 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -29,4 +29,4 @@ "bazelOptions": { "suppressTsconfigOverrideWarnings": true } -} \ No newline at end of file +} diff --git a/tsconfig/tsconfig.migrations.json b/tsconfig/tsconfig.migrations.json new file mode 100644 index 0000000000..200c52687c --- /dev/null +++ b/tsconfig/tsconfig.migrations.json @@ -0,0 +1,11 @@ +{ + "extends": "../tsconfig.base.json", + "compilerOptions": { + "noEmit": false, + "outDir": "../dist/migrations" + }, + "files": [ + // entry-points + "../migrations/update-6_0_0/index.ts" + ] +}