Skip to content

Commit 0afdff0

Browse files
clydinalan-agius4
clydin
authored and
alan-agius4
committed
refactor(@angular-devkit/build-angular): move all builders into a builders subdirectory
All Angular builders are now located within one subdirectory of the `src` directory. This organization provides better discovery of the builders and will allow builder specific code to be stored in a single area.
1 parent 018a3aa commit 0afdff0

File tree

131 files changed

+216
-194
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+216
-194
lines changed

‎packages/angular/cli/BUILD.bazel

+8-8
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,14 @@ ts_library(
9696
)
9797

9898
CLI_SCHEMA_DATA = [
99-
"//packages/angular_devkit/build_angular:src/app-shell/schema.json",
100-
"//packages/angular_devkit/build_angular:src/browser/schema.json",
101-
"//packages/angular_devkit/build_angular:src/dev-server/schema.json",
102-
"//packages/angular_devkit/build_angular:src/extract-i18n/schema.json",
103-
"//packages/angular_devkit/build_angular:src/karma/schema.json",
104-
"//packages/angular_devkit/build_angular:src/ng-packagr/schema.json",
105-
"//packages/angular_devkit/build_angular:src/protractor/schema.json",
106-
"//packages/angular_devkit/build_angular:src/server/schema.json",
99+
"//packages/angular_devkit/build_angular:src/builders/app-shell/schema.json",
100+
"//packages/angular_devkit/build_angular:src/builders/browser/schema.json",
101+
"//packages/angular_devkit/build_angular:src/builders/dev-server/schema.json",
102+
"//packages/angular_devkit/build_angular:src/builders/extract-i18n/schema.json",
103+
"//packages/angular_devkit/build_angular:src/builders/karma/schema.json",
104+
"//packages/angular_devkit/build_angular:src/builders/ng-packagr/schema.json",
105+
"//packages/angular_devkit/build_angular:src/builders/protractor/schema.json",
106+
"//packages/angular_devkit/build_angular:src/builders/server/schema.json",
107107
"//packages/schematics/angular:app-shell/schema.json",
108108
"//packages/schematics/angular:application/schema.json",
109109
"//packages/schematics/angular:class/schema.json",

‎packages/angular/cli/lib/config/workspace-schema.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -338,12 +338,12 @@
338338
"description": "A default named configuration to use when a target configuration is not provided."
339339
},
340340
"options": {
341-
"$ref": "../../../../angular_devkit/build_angular/src/app-shell/schema.json"
341+
"$ref": "../../../../angular_devkit/build_angular/src/builders/app-shell/schema.json"
342342
},
343343
"configurations": {
344344
"type": "object",
345345
"additionalProperties": {
346-
"$ref": "../../../../angular_devkit/build_angular/src/app-shell/schema.json"
346+
"$ref": "../../../../angular_devkit/build_angular/src/builders/app-shell/schema.json"
347347
}
348348
}
349349
}
@@ -360,12 +360,12 @@
360360
"description": "A default named configuration to use when a target configuration is not provided."
361361
},
362362
"options": {
363-
"$ref": "../../../../angular_devkit/build_angular/src/browser/schema.json"
363+
"$ref": "../../../../angular_devkit/build_angular/src/builders/browser/schema.json"
364364
},
365365
"configurations": {
366366
"type": "object",
367367
"additionalProperties": {
368-
"$ref": "../../../../angular_devkit/build_angular/src/browser/schema.json"
368+
"$ref": "../../../../angular_devkit/build_angular/src/builders/browser/schema.json"
369369
}
370370
}
371371
}
@@ -382,12 +382,12 @@
382382
"description": "A default named configuration to use when a target configuration is not provided."
383383
},
384384
"options": {
385-
"$ref": "../../../../angular_devkit/build_angular/src/dev-server/schema.json"
385+
"$ref": "../../../../angular_devkit/build_angular/src/builders/dev-server/schema.json"
386386
},
387387
"configurations": {
388388
"type": "object",
389389
"additionalProperties": {
390-
"$ref": "../../../../angular_devkit/build_angular/src/dev-server/schema.json"
390+
"$ref": "../../../../angular_devkit/build_angular/src/builders/dev-server/schema.json"
391391
}
392392
}
393393
}
@@ -404,12 +404,12 @@
404404
"description": "A default named configuration to use when a target configuration is not provided."
405405
},
406406
"options": {
407-
"$ref": "../../../../angular_devkit/build_angular/src/extract-i18n/schema.json"
407+
"$ref": "../../../../angular_devkit/build_angular/src/builders/extract-i18n/schema.json"
408408
},
409409
"configurations": {
410410
"type": "object",
411411
"additionalProperties": {
412-
"$ref": "../../../../angular_devkit/build_angular/src/extract-i18n/schema.json"
412+
"$ref": "../../../../angular_devkit/build_angular/src/builders/extract-i18n/schema.json"
413413
}
414414
}
415415
}
@@ -426,12 +426,12 @@
426426
"description": "A default named configuration to use when a target configuration is not provided."
427427
},
428428
"options": {
429-
"$ref": "../../../../angular_devkit/build_angular/src/karma/schema.json"
429+
"$ref": "../../../../angular_devkit/build_angular/src/builders/karma/schema.json"
430430
},
431431
"configurations": {
432432
"type": "object",
433433
"additionalProperties": {
434-
"$ref": "../../../../angular_devkit/build_angular/src/karma/schema.json"
434+
"$ref": "../../../../angular_devkit/build_angular/src/builders/karma/schema.json"
435435
}
436436
}
437437
}
@@ -448,12 +448,12 @@
448448
"description": "A default named configuration to use when a target configuration is not provided."
449449
},
450450
"options": {
451-
"$ref": "../../../../angular_devkit/build_angular/src/protractor/schema.json"
451+
"$ref": "../../../../angular_devkit/build_angular/src/builders/protractor/schema.json"
452452
},
453453
"configurations": {
454454
"type": "object",
455455
"additionalProperties": {
456-
"$ref": "../../../../angular_devkit/build_angular/src/protractor/schema.json"
456+
"$ref": "../../../../angular_devkit/build_angular/src/builders/protractor/schema.json"
457457
}
458458
}
459459
}
@@ -470,12 +470,12 @@
470470
"description": "A default named configuration to use when a target configuration is not provided."
471471
},
472472
"options": {
473-
"$ref": "../../../../angular_devkit/build_angular/src/server/schema.json"
473+
"$ref": "../../../../angular_devkit/build_angular/src/builders/server/schema.json"
474474
},
475475
"configurations": {
476476
"type": "object",
477477
"additionalProperties": {
478-
"$ref": "../../../../angular_devkit/build_angular/src/server/schema.json"
478+
"$ref": "../../../../angular_devkit/build_angular/src/builders/server/schema.json"
479479
}
480480
}
481481
}
@@ -492,12 +492,12 @@
492492
"description": "A default named configuration to use when a target configuration is not provided."
493493
},
494494
"options": {
495-
"$ref": "../../../../angular_devkit/build_angular/src/ng-packagr/schema.json"
495+
"$ref": "../../../../angular_devkit/build_angular/src/builders/ng-packagr/schema.json"
496496
},
497497
"configurations": {
498498
"type": "object",
499499
"additionalProperties": {
500-
"$ref": "../../../../angular_devkit/build_angular/src/ng-packagr/schema.json"
500+
"$ref": "../../../../angular_devkit/build_angular/src/builders/ng-packagr/schema.json"
501501
}
502502
}
503503
}

‎packages/angular_devkit/build_angular/BUILD.bazel

+16-16
Original file line numberDiff line numberDiff line change
@@ -19,42 +19,42 @@ package(default_visibility = ["//visibility:public"])
1919

2020
ts_json_schema(
2121
name = "app_shell_schema",
22-
src = "src/app-shell/schema.json",
22+
src = "src/builders/app-shell/schema.json",
2323
)
2424

2525
ts_json_schema(
2626
name = "browser_schema",
27-
src = "src/browser/schema.json",
27+
src = "src/builders/browser/schema.json",
2828
)
2929

3030
ts_json_schema(
3131
name = "dev_server_schema",
32-
src = "src/dev-server/schema.json",
32+
src = "src/builders/dev-server/schema.json",
3333
)
3434

3535
ts_json_schema(
3636
name = "extract_i18n_schema",
37-
src = "src/extract-i18n/schema.json",
37+
src = "src/builders/extract-i18n/schema.json",
3838
)
3939

4040
ts_json_schema(
4141
name = "karma_schema",
42-
src = "src/karma/schema.json",
42+
src = "src/builders/karma/schema.json",
4343
)
4444

4545
ts_json_schema(
4646
name = "protractor_schema",
47-
src = "src/protractor/schema.json",
47+
src = "src/builders/protractor/schema.json",
4848
)
4949

5050
ts_json_schema(
5151
name = "server_schema",
52-
src = "src/server/schema.json",
52+
src = "src/builders/server/schema.json",
5353
)
5454

5555
ts_json_schema(
5656
name = "ng_packagr_schema",
57-
src = "src/ng-packagr/schema.json",
57+
src = "src/builders/ng-packagr/schema.json",
5858
)
5959

6060
ts_library(
@@ -72,14 +72,14 @@ ts_library(
7272
"src/testing/**/*.ts",
7373
],
7474
) + [
75-
"//packages/angular_devkit/build_angular:src/app-shell/schema.ts",
76-
"//packages/angular_devkit/build_angular:src/browser/schema.ts",
77-
"//packages/angular_devkit/build_angular:src/dev-server/schema.ts",
78-
"//packages/angular_devkit/build_angular:src/extract-i18n/schema.ts",
79-
"//packages/angular_devkit/build_angular:src/karma/schema.ts",
80-
"//packages/angular_devkit/build_angular:src/protractor/schema.ts",
81-
"//packages/angular_devkit/build_angular:src/server/schema.ts",
82-
"//packages/angular_devkit/build_angular:src/ng-packagr/schema.ts",
75+
"//packages/angular_devkit/build_angular:src/builders/app-shell/schema.ts",
76+
"//packages/angular_devkit/build_angular:src/builders/browser/schema.ts",
77+
"//packages/angular_devkit/build_angular:src/builders/dev-server/schema.ts",
78+
"//packages/angular_devkit/build_angular:src/builders/extract-i18n/schema.ts",
79+
"//packages/angular_devkit/build_angular:src/builders/karma/schema.ts",
80+
"//packages/angular_devkit/build_angular:src/builders/protractor/schema.ts",
81+
"//packages/angular_devkit/build_angular:src/builders/server/schema.ts",
82+
"//packages/angular_devkit/build_angular:src/builders/ng-packagr/schema.ts",
8383
],
8484
data = glob(
8585
include = [

‎packages/angular_devkit/build_angular/builders.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,43 @@
22
"$schema": "../architect/src/builders-schema.json",
33
"builders": {
44
"app-shell": {
5-
"implementation": "./src/app-shell",
6-
"schema": "./src/app-shell/schema.json",
5+
"implementation": "./src/builders/app-shell",
6+
"schema": "./src/builders/app-shell/schema.json",
77
"description": "Build a server application and a browser application, then render the index.html and use it for the browser output."
88
},
99
"browser": {
10-
"implementation": "./src/browser",
11-
"schema": "./src/browser/schema.json",
10+
"implementation": "./src/builders/browser",
11+
"schema": "./src/builders/browser/schema.json",
1212
"description": "Build a browser application."
1313
},
1414
"dev-server": {
15-
"implementation": "./src/dev-server",
16-
"schema": "./src/dev-server/schema.json",
15+
"implementation": "./src/builders/dev-server",
16+
"schema": "./src/builders/dev-server/schema.json",
1717
"description": "Serve a browser application."
1818
},
1919
"extract-i18n": {
20-
"implementation": "./src/extract-i18n",
21-
"schema": "./src/extract-i18n/schema.json",
20+
"implementation": "./src/builders/extract-i18n",
21+
"schema": "./src/builders/extract-i18n/schema.json",
2222
"description": "Extract i18n strings from a browser application."
2323
},
2424
"karma": {
25-
"implementation": "./src/karma",
26-
"schema": "./src/karma/schema.json",
25+
"implementation": "./src/builders/karma",
26+
"schema": "./src/builders/karma/schema.json",
2727
"description": "Run Karma unit tests."
2828
},
2929
"protractor": {
30-
"implementation": "./src/protractor",
31-
"schema": "./src/protractor/schema.json",
30+
"implementation": "./src/builders/protractor",
31+
"schema": "./src/builders/protractor/schema.json",
3232
"description": "Run protractor over a dev server."
3333
},
3434
"server": {
35-
"implementation": "./src/server",
36-
"schema": "./src/server/schema.json",
35+
"implementation": "./src/builders/server",
36+
"schema": "./src/builders/server/schema.json",
3737
"description": "Build a server Angular application."
3838
},
3939
"ng-packagr": {
40-
"implementation": "./src/ng-packagr",
41-
"schema": "./src/ng-packagr/schema.json",
40+
"implementation": "./src/builders/ng-packagr",
41+
"schema": "./src/builders/ng-packagr/schema.json",
4242
"description": "Build a library with ng-packagr."
4343
}
4444
}

‎packages/angular_devkit/build_angular/src/app-shell/app-shell_spec.ts renamed to ‎packages/angular_devkit/build_angular/src/builders/app-shell/app-shell_spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { getSystemPath, join, normalize, virtualFs } from '@angular-devkit/core'
1111
import express from 'express'; // eslint-disable-line import/no-extraneous-dependencies
1212
import * as http from 'http';
1313
import { AddressInfo } from 'net';
14-
import { createArchitect, host } from '../testing/test-utils';
14+
import { createArchitect, host } from '../../testing/test-utils';
1515

1616
describe('AppShell Builder', () => {
1717
const target = { project: 'app', target: 'app-shell' };

‎packages/angular_devkit/build_angular/src/app-shell/index.ts renamed to ‎packages/angular_devkit/build_angular/src/builders/app-shell/index.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ import {
1515
import { JsonObject, normalize, resolve } from '@angular-devkit/core';
1616
import * as fs from 'fs';
1717
import * as path from 'path';
18+
import { normalizeOptimization } from '../../utils';
19+
import { InlineCriticalCssProcessor } from '../../utils/index-file/inline-critical-css';
20+
import { augmentAppWithServiceWorker } from '../../utils/service-worker';
21+
import { Spinner } from '../../utils/spinner';
1822
import { BrowserBuilderOutput } from '../browser';
1923
import { Schema as BrowserBuilderSchema } from '../browser/schema';
2024
import { ServerBuilderOutput } from '../server';
21-
import { normalizeOptimization } from '../utils';
22-
import { InlineCriticalCssProcessor } from '../utils/index-file/inline-critical-css';
23-
import { augmentAppWithServiceWorker } from '../utils/service-worker';
24-
import { Spinner } from '../utils/spinner';
2525
import { Schema as BuildWebpackAppShellSchema } from './schema';
2626

2727
async function _renderUniversal(

‎packages/angular_devkit/build_angular/src/app-shell/schema.json renamed to ‎packages/angular_devkit/build_angular/src/builders/app-shell/schema.json

File renamed without changes.

‎packages/angular_devkit/build_angular/src/browser/index.ts renamed to ‎packages/angular_devkit/build_angular/src/builders/browser/index.ts

+23-20
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,35 @@ import { Observable, from } from 'rxjs';
1515
import { concatMap, map, switchMap } from 'rxjs/operators';
1616
import { ScriptTarget } from 'typescript';
1717
import webpack from 'webpack';
18-
import { ExecutionTransformer } from '../transforms';
18+
import { ExecutionTransformer } from '../../transforms';
1919
import {
2020
BuildBrowserFeatures,
2121
deleteOutputDir,
2222
normalizeAssetPatterns,
2323
normalizeOptimization,
2424
urlJoin,
25-
} from '../utils';
26-
import { ThresholdSeverity, checkBudgets } from '../utils/bundle-calculator';
27-
import { colors } from '../utils/color';
28-
import { copyAssets } from '../utils/copy-assets';
29-
import { i18nInlineEmittedFiles } from '../utils/i18n-inlining';
30-
import { I18nOptions } from '../utils/i18n-options';
31-
import { FileInfo } from '../utils/index-file/augment-index-html';
32-
import { IndexHtmlGenerator, IndexHtmlTransform } from '../utils/index-file/index-html-generator';
33-
import { ensureOutputPaths } from '../utils/output-paths';
34-
import { generateEntryPoints } from '../utils/package-chunk-sort';
35-
import { readTsconfig } from '../utils/read-tsconfig';
36-
import { augmentAppWithServiceWorker } from '../utils/service-worker';
37-
import { Spinner } from '../utils/spinner';
38-
import { assertCompatibleAngularVersion } from '../utils/version';
25+
} from '../../utils';
26+
import { ThresholdSeverity, checkBudgets } from '../../utils/bundle-calculator';
27+
import { colors } from '../../utils/color';
28+
import { copyAssets } from '../../utils/copy-assets';
29+
import { i18nInlineEmittedFiles } from '../../utils/i18n-inlining';
30+
import { I18nOptions } from '../../utils/i18n-options';
31+
import { FileInfo } from '../../utils/index-file/augment-index-html';
32+
import {
33+
IndexHtmlGenerator,
34+
IndexHtmlTransform,
35+
} from '../../utils/index-file/index-html-generator';
36+
import { ensureOutputPaths } from '../../utils/output-paths';
37+
import { generateEntryPoints } from '../../utils/package-chunk-sort';
38+
import { readTsconfig } from '../../utils/read-tsconfig';
39+
import { augmentAppWithServiceWorker } from '../../utils/service-worker';
40+
import { Spinner } from '../../utils/spinner';
41+
import { assertCompatibleAngularVersion } from '../../utils/version';
3942
import {
4043
generateI18nBrowserWebpackConfigFromContext,
4144
getIndexInputFile,
4245
getIndexOutputFile,
43-
} from '../utils/webpack-browser-config';
46+
} from '../../utils/webpack-browser-config';
4447
import {
4548
getAnalyticsConfig,
4649
getBrowserConfig,
@@ -49,16 +52,16 @@ import {
4952
getStylesConfig,
5053
getTypeScriptConfig,
5154
getWorkerConfig,
52-
} from '../webpack/configs';
53-
import { markAsyncChunksNonInitial } from '../webpack/utils/async-chunks';
54-
import { normalizeExtraEntryPoints } from '../webpack/utils/helpers';
55+
} from '../../webpack/configs';
56+
import { markAsyncChunksNonInitial } from '../../webpack/utils/async-chunks';
57+
import { normalizeExtraEntryPoints } from '../../webpack/utils/helpers';
5558
import {
5659
statsErrorsToString,
5760
statsHasErrors,
5861
statsHasWarnings,
5962
statsWarningsToString,
6063
webpackStatsLogger,
61-
} from '../webpack/utils/stats';
64+
} from '../../webpack/utils/stats';
6265
import { Schema as BrowserBuilderSchema } from './schema';
6366

6467
/**

‎packages/angular_devkit/build_angular/src/browser/schema.json renamed to ‎packages/angular_devkit/build_angular/src/builders/browser/schema.json

File renamed without changes.

‎packages/angular_devkit/build_angular/src/browser/specs/allow-js_spec.ts renamed to ‎packages/angular_devkit/build_angular/src/builders/browser/specs/allow-js_spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
1111
import { join, normalize, relative, virtualFs } from '@angular-devkit/core';
1212
import { Observable } from 'rxjs';
1313
import { take, tap } from 'rxjs/operators';
14-
import { createArchitect, host } from '../../testing/test-utils';
14+
import { createArchitect, host } from '../../../testing/test-utils';
1515

1616
describe('Browser Builder allow js', () => {
1717
const targetSpec = { project: 'app', target: 'build' };

‎packages/angular_devkit/build_angular/src/browser/specs/aot_spec.ts renamed to ‎packages/angular_devkit/build_angular/src/builders/browser/specs/aot_spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import { Architect } from '@angular-devkit/architect';
1010
import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
1111
import { join, logging, normalize, virtualFs } from '@angular-devkit/core';
12-
import { createArchitect, host } from '../../testing/test-utils';
12+
import { createArchitect, host } from '../../../testing/test-utils';
1313

1414
describe('Browser Builder AOT', () => {
1515
const targetSpec = { project: 'app', target: 'build' };

0 commit comments

Comments
 (0)