Skip to content

Commit

Permalink
fix(migrations): deploy compiled JS rather than just the TS files.
Browse files Browse the repository at this point in the history
  • Loading branch information
benlesh committed Apr 13, 2018
1 parent 5ae929b commit 9aed72f
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .make-packages.js
Original file line number Diff line number Diff line change
Expand Up @@ -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/';
Expand Down Expand Up @@ -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);
Expand Down
8 changes: 7 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
"bazelOptions": {
"suppressTsconfigOverrideWarnings": true
}
}
}
11 changes: 11 additions & 0 deletions tsconfig/tsconfig.migrations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"extends": "../tsconfig.base.json",
"compilerOptions": {
"noEmit": false,
"outDir": "../dist/migrations"
},
"files": [
// entry-points
"../migrations/update-6_0_0/index.ts"
]
}

0 comments on commit 9aed72f

Please sign in to comment.