Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(@angular-devkit/build-angular): remove pure_getters #15607

Merged
merged 2 commits into from
Sep 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
"pacote": "^9.2.3",
"pidtree": "^0.3.0",
"pidusage": "^2.0.17",
"rxjs": "~6.4.0",
"rxjs": "6.5.3",
"sauce-connect-proxy": "https://saucelabs.com/downloads/sc-4.5.4-linux.tar.gz",
"semver": "6.3.0",
"source-map": "^0.7.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/architect/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"typings": "src/index.d.ts",
"dependencies": {
"@angular-devkit/core": "0.0.0",
"rxjs": "6.4.0"
"rxjs": "6.5.3"
},
"builders": "./builders/builders.json"
}
2 changes: 1 addition & 1 deletion packages/angular_devkit/architect_cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@angular-devkit/core": "0.0.0",
"minimist": "1.2.0",
"progress": "2.0.3",
"rxjs": "6.4.0",
"rxjs": "6.5.3",
"symbol-observable": "1.2.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/benchmark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"minimist": "1.2.0",
"pidusage": "2.0.17",
"pidtree": "0.3.0",
"rxjs": "6.4.0",
"rxjs": "6.5.3",
"tree-kill": "^1.2.0"
}
}
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"postcss-loader": "3.0.0",
"raw-loader": "3.1.0",
"regenerator-runtime": "0.13.3",
"rxjs": "6.4.0",
"rxjs": "6.5.3",
"sass": "1.22.12",
"sass-loader": "8.0.0",
"semver": "6.3.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,6 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
}
: {
ecma: terserEcma,
pure_getters: buildOptions.buildOptimizer,
// PURE comments work best with 3 passes.
// See https://github.com/webpack/webpack/issues/2899#issuecomment-317425926.
passes: buildOptions.buildOptimizer ? 3 : 1,
Expand Down
5 changes: 2 additions & 3 deletions packages/angular_devkit/build_angular/src/browser/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ import { NodeJsSyncHost } from '@angular-devkit/core/node';
import { createHash } from 'crypto';
import * as findCacheDirectory from 'find-cache-dir';
import * as fs from 'fs';
import * as os from 'os';
import * as path from 'path';
import { from, of } from 'rxjs';
import { Observable, from, of } from 'rxjs';
import { bufferCount, catchError, concatMap, map, mergeScan, switchMap } from 'rxjs/operators';
import { ScriptTarget } from 'typescript';
import * as webpack from 'webpack';
Expand Down Expand Up @@ -192,7 +191,7 @@ export function buildWebpackBrowser(
logging?: WebpackLoggingCallback;
indexHtml?: IndexHtmlTransform;
} = {},
) {
): Observable<BrowserBuilderOutput> {
const host = new NodeJsSyncHost();
const root = normalize(context.workspaceRoot);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
* found in the LICENSE file at https://angular.io/license
*/
import { Path, resolve, virtualFs } from '@angular-devkit/core';
import { EMPTY } from 'rxjs';
import { concatMap, last } from 'rxjs/operators';
import { EMPTY, Observable } from 'rxjs';
import { concatMap, last, map } from 'rxjs/operators';

/**
* Delete an output directory, but error out if it's the root of the project.
*/
export function deleteOutputDir(root: Path, outputPath: Path, host: virtualFs.Host) {
export function deleteOutputDir(root: Path, outputPath: Path, host: virtualFs.Host): Observable<void> {
const resolvedOutputPath = resolve(root, outputPath);
if (resolvedOutputPath === root) {
throw new Error('Output path MUST not be project root directory!');
Expand All @@ -21,5 +21,6 @@ export function deleteOutputDir(root: Path, outputPath: Path, host: virtualFs.Ho
return host.exists(resolvedOutputPath).pipe(
concatMap(exists => exists ? host.delete(resolvedOutputPath) : EMPTY),
last(null, null),
map(() => undefined),
);
}
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_ng_packagr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"builders": "builders.json",
"dependencies": {
"@angular-devkit/architect": "0.0.0",
"rxjs": "6.4.0"
"rxjs": "6.5.3"
},
"peerDependencies": {
"ng-packagr": "^4.0.0 || ^5.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dependencies": {
"@angular-devkit/architect": "0.0.0",
"@angular-devkit/core": "0.0.0",
"rxjs": "6.4.0",
"rxjs": "6.5.3",
"webpack-merge": "4.2.2"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"ajv": "6.10.2",
"fast-json-stable-stringify": "2.0.0",
"magic-string": "0.25.3",
"rxjs": "6.4.0",
"rxjs": "6.5.3",
"source-map": "0.7.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/schematics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
],
"dependencies": {
"@angular-devkit/core": "0.0.0",
"rxjs": "6.4.0"
"rxjs": "6.5.3"
}
}
2 changes: 1 addition & 1 deletion packages/angular_devkit/schematics_cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@schematics/schematics": "0.0.0",
"inquirer": "7.0.0",
"minimist": "1.2.0",
"rxjs": "6.4.0",
"rxjs": "6.5.3",
"symbol-observable": "1.2.0"
}
}
2 changes: 1 addition & 1 deletion packages/ngtools/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"dependencies": {
"@angular-devkit/core": "0.0.0",
"enhanced-resolve": "4.1.0",
"rxjs": "6.4.0",
"rxjs": "6.5.3",
"tree-kill": "1.2.1",
"webpack-sources": "1.4.3"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/schematics/angular/utility/latest-versions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
export const latestVersions = {
// These versions should be kept up to date with latest Angular peer dependencies.
Angular: '~9.0.0-next.7',
RxJs: '~6.4.0',
RxJs: '~6.5.3',
ZoneJs: '~0.10.2',
TypeScript: '~3.5.3',
TsLib: '^1.10.0',
Expand Down
2 changes: 1 addition & 1 deletion packages/schematics/update/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
"pacote": "9.5.8",
"semver": "6.3.0",
"semver-intersect": "1.4.0",
"rxjs": "6.4.0"
"rxjs": "6.5.3"
}
}
9 changes: 1 addition & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8773,14 +8773,7 @@ run-queue@^1.0.0, run-queue@^1.0.3:
dependencies:
aproba "^1.1.1"

rxjs@6.4.0, rxjs@~6.4.0:
version "6.4.0"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
dependencies:
tslib "^1.9.0"

rxjs@^6.0.0, rxjs@^6.4.0:
rxjs@6.5.3, rxjs@^6.0.0, rxjs@^6.4.0, rxjs@~6.5.3:
version "6.5.3"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"
integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==
Expand Down