Skip to content

Commit 7b0d759

Browse files
author
Angular Builds
committed
b8e9e09a5 refactor(@angular-devkit/build-angular): replace most custom path normalize usage with Node.js builtins
1 parent 10a6b11 commit 7b0d759

File tree

14 files changed

+114
-77
lines changed

14 files changed

+114
-77
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "@angular-devkit/build-angular",
3-
"version": "14.0.0-next.7+3.sha-dcc00f4",
3+
"version": "14.0.0-next.7+4.sha-b8e9e09",
44
"description": "Angular Webpack Build Facade",
55
"main": "src/index.js",
66
"typings": "src/index.d.ts",
77
"builders": "builders.json",
88
"dependencies": {
99
"@ampproject/remapping": "2.1.2",
10-
"@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#dcc00f4e2",
11-
"@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#dcc00f4e2",
12-
"@angular-devkit/core": "github:angular/angular-devkit-core-builds#dcc00f4e2",
10+
"@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#b8e9e09a5",
11+
"@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#b8e9e09a5",
12+
"@angular-devkit/core": "github:angular/angular-devkit-core-builds#b8e9e09a5",
1313
"@babel/core": "7.17.8",
1414
"@babel/generator": "7.17.7",
1515
"@babel/helper-annotate-as-pure": "7.16.7",
@@ -20,7 +20,7 @@
2020
"@babel/runtime": "7.17.8",
2121
"@babel/template": "7.16.7",
2222
"@discoveryjs/json-ext": "0.5.7",
23-
"@ngtools/webpack": "github:angular/ngtools-webpack-builds#dcc00f4e2",
23+
"@ngtools/webpack": "github:angular/ngtools-webpack-builds#b8e9e09a5",
2424
"ansi-colors": "4.1.1",
2525
"babel-loader": "8.2.4",
2626
"babel-plugin-istanbul": "6.1.1",

src/builders/app-shell/index.js

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/builders/browser/index.js

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/builders/karma/index.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ export declare function execute(options: KarmaBuilderOptions, context: BuilderCo
2323
karmaOptions?: (options: KarmaConfigOptions) => KarmaConfigOptions;
2424
}): Observable<BuilderOutput>;
2525
export { KarmaBuilderOptions };
26-
declare const _default: import("../../../../architect/src/internal").Builder<Record<string, string> & KarmaBuilderOptions & import("@angular-devkit/core").JsonObject>;
26+
declare const _default: import("../../../../architect/src/internal").Builder<Record<string, string> & KarmaBuilderOptions & import("../../../../core/src").JsonObject>;
2727
export default _default;

src/builders/karma/index.js

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/utils/normalize-asset-patterns.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license
77
*/
8-
import { BaseException, Path } from '@angular-devkit/core';
8+
import { BaseException } from '@angular-devkit/core';
99
import { AssetPattern, AssetPatternClass } from '../builders/browser/schema';
1010
export declare class MissingAssetSourceRootException extends BaseException {
1111
constructor(path: String);
1212
}
13-
export declare function normalizeAssetPatterns(assetPatterns: AssetPattern[], root: Path, projectRoot: Path, maybeSourceRoot: Path | undefined): AssetPatternClass[];
13+
export declare function normalizeAssetPatterns(assetPatterns: AssetPattern[], workspaceRoot: string, projectRoot: string, projectSourceRoot: string | undefined): AssetPatternClass[];

src/utils/normalize-asset-patterns.js

Lines changed: 35 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/utils/normalize-builder-schema.js

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/utils/normalize-file-replacements.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license
77
*/
8-
import { BaseException, Path } from '@angular-devkit/core';
8+
import { BaseException } from '@angular-devkit/core';
99
import { FileReplacement } from '../builders/browser/schema';
1010
export declare class MissingFileReplacementException extends BaseException {
1111
constructor(path: String);
1212
}
1313
export interface NormalizedFileReplacement {
14-
replace: Path;
15-
with: Path;
14+
replace: string;
15+
with: string;
1616
}
17-
export declare function normalizeFileReplacements(fileReplacements: FileReplacement[], root: Path): NormalizedFileReplacement[];
17+
export declare function normalizeFileReplacements(fileReplacements: FileReplacement[], workspaceRoot: string): NormalizedFileReplacement[];

0 commit comments

Comments
 (0)