From f7c55952bf155cd3c73ddea53e4f10b11aeb1634 Mon Sep 17 00:00:00 2001 From: Igor Minar Date: Fri, 6 Apr 2018 22:42:00 -0700 Subject: [PATCH] build: update to rxjs@6.0.0-tactical-rc.1 (#23234) PR Close #23234 --- integration/cli-hello-world/yarn.lock | 14 ++++++-------- tools/postinstall-patches.js | 5 +++++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/integration/cli-hello-world/yarn.lock b/integration/cli-hello-world/yarn.lock index 33dfbe752d..2b150588b8 100644 --- a/integration/cli-hello-world/yarn.lock +++ b/integration/cli-hello-world/yarn.lock @@ -5606,14 +5606,8 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" -rxjs@^6.0.0-beta.3, rxjs@^6.0.0-rc.0: +rxjs@^6.0.0-beta.3, rxjs@^6.0.0-rc.0, "rxjs@file:../../node_modules/rxjs": version "6.0.0-tactical-rc.1" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0-tactical-rc.1.tgz#1fe1f1204132d1c71c72f249a487f8e76a5ec1d5" - dependencies: - tslib "^1.9.0" - -"rxjs@file:../../node_modules/rxjs": - version "6.0.0-rc.0" dependencies: tslib "^1.9.0" @@ -6620,13 +6614,17 @@ typedarray@^0.0.6, typedarray@~0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -"typescript@file:../../node_modules/typescript", typescript@~2.7.2: +"typescript@file:../../node_modules/typescript": version "2.7.2" typescript@~2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4" +typescript@~2.7.2: + version "2.7.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.2.tgz#2d615a1ef4aee4f574425cdff7026edf81919836" + uglify-es@^3.3.4: version "3.3.9" resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677" diff --git a/tools/postinstall-patches.js b/tools/postinstall-patches.js index f406a97d52..c90deeedec 100644 --- a/tools/postinstall-patches.js +++ b/tools/postinstall-patches.js @@ -26,5 +26,10 @@ log('\n# patch: reactivex/rxjs#3302 make node_modules/rxjs compilable with Types sed('-i', '(\'response\' in xhr)', '(\'response\' in (xhr as any))', 'node_modules/rxjs/src/observable/dom/AjaxObservable.ts'); */ +log('\n# patch: ReactiveX/rxjs#3534 make node_modules/rxjs compilable without rxjs-compat'); +sed('-i', /\["\*\*\/\*\.ts"],/, '["internal/**/*.ts"],', + 'node_modules/rxjs/src/BUILD.bazel'); +sed('-i', /glob\(\["\*\.ts"]\)/, 'glob(["index.ts"])', + 'node_modules/rxjs/src/operators/BUILD.bazel'); log('===== finished running the postinstall-patches.js script =====');