Skip to content

Commit fc5d2b3

Browse files
alan-agius4filipesilva
alan-agius4
authored and
filipesilva
committed
test: remove tsconfig.base.json from test cases
1 parent a0cc1fc commit fc5d2b3

Some content is hidden

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

41 files changed

+120
-165
lines changed

‎integration/angular_cli/e2e/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../tsconfig.base.json",
2+
"extends": "../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/e2e",
55
"module": "commonjs",

‎integration/angular_cli/tsconfig.app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "./tsconfig.base.json",
2+
"extends": "./tsconfig.json",
33
"compilerOptions": {
44
"outDir": "./out-tsc/app",
55
"types": []

‎integration/angular_cli/tsconfig.base.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎integration/angular_cli/tsconfig.json

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
1-
// This tsConfig file is used by editors and TypeScript’s language server to improve development experience.
2-
// Note: This should not be used to perform a compilation.
31
{
4-
"files": [],
5-
"references": [
6-
{
7-
"path": "./tsconfig.app.json"
8-
},
9-
{
10-
"path": "./tsconfig.spec.json"
11-
}
12-
]
2+
"compileOnSave": false,
3+
"compilerOptions": {
4+
"baseUrl": "./",
5+
"outDir": "./dist/out-tsc",
6+
"sourceMap": true,
7+
"declaration": false,
8+
"moduleResolution": "node",
9+
"emitDecoratorMetadata": true,
10+
"experimentalDecorators": true,
11+
"target": "es2015",
12+
"module": "es2020",
13+
"typeRoots": [
14+
"node_modules/@types"
15+
],
16+
"lib": [
17+
"es2017",
18+
"dom"
19+
]
20+
},
21+
"angularCompilerOptions": {
22+
"enableIvy": true,
23+
"disableTypeScriptVersionCheck": true
24+
}
1325
}

‎integration/angular_cli/tsconfig.spec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "./tsconfig.base.json",
2+
"extends": "./tsconfig.json",
33
"compilerOptions": {
44
"outDir": "./out-tsc/spec",
55
"types": [

‎packages/angular/cli/commands/version-impl.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ export class VersionCommand extends Command<VersionCommandSchema> {
194194

195195
private getIvyWorkspace(): string {
196196
try {
197-
const content = fs.readFileSync(path.resolve(this.workspace.root, 'tsconfig.base.json'), 'utf-8');
197+
const content = fs.readFileSync(path.resolve(this.workspace.root, 'tsconfig.json'), 'utf-8');
198198
const tsConfig = parseJson(content, JsonParseMode.Loose);
199199
if (!isJsonObject(tsConfig)) {
200200
return '<error>';

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ describe('Browser Builder allow js', () => {
2929
});
3030

3131
host.replaceInFile(
32-
'tsconfig.base.json',
32+
'tsconfig.json',
3333
'"target": "es2015"',
3434
'"target": "es5", "allowJs": true',
3535
);
@@ -54,7 +54,7 @@ describe('Browser Builder allow js', () => {
5454
});
5555

5656
host.replaceInFile(
57-
'tsconfig.base.json',
57+
'tsconfig.json',
5858
'"target": "es2015"',
5959
'"target": "es5", "allowJs": true',
6060
);
@@ -81,7 +81,7 @@ describe('Browser Builder allow js', () => {
8181
});
8282

8383
host.replaceInFile(
84-
'tsconfig.base.json',
84+
'tsconfig.json',
8585
'"target": "es2015"',
8686
'"target": "es5", "allowJs": true',
8787
);

‎packages/angular_devkit/build_angular/src/browser/specs/common-js-warning_spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ describe('Browser Builder commonjs warning', () => {
7979
});
8080

8181
it('should not show warning in JIT for templateUrl and styleUrl when using paths', async () => {
82-
host.replaceInFile('tsconfig.base.json', /"baseUrl": ".\/",/, `
82+
host.replaceInFile('tsconfig.json', /"baseUrl": ".\/",/, `
8383
"baseUrl": "./",
8484
"paths": {
8585
"@app/*": [

‎packages/angular_devkit/build_angular/src/browser/specs/differential_loading_spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ describe('Browser Builder with differential loading', () => {
6565

6666
it('emits all the neccessary files for target of ES2016', async () => {
6767
host.replaceInFile(
68-
'tsconfig.base.json',
68+
'tsconfig.json',
6969
'"target": "es2015",',
7070
`"target": "es2016",`,
7171
);
@@ -107,7 +107,7 @@ describe('Browser Builder with differential loading', () => {
107107

108108
it('emits all the neccessary files for target of ESNext', async () => {
109109
host.replaceInFile(
110-
'tsconfig.base.json',
110+
'tsconfig.json',
111111
'"target": "es2015",',
112112
`"target": "esnext",`,
113113
);

‎packages/angular_devkit/build_angular/src/browser/specs/optimization-level_spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe('Browser Builder optimization level', () => {
2727
});
2828

2929
it('tsconfig target changes optimizations to use ES2015', async () => {
30-
host.replaceInFile('tsconfig.base.json', '"target": "es5"', '"target": "es2015"');
30+
host.replaceInFile('tsconfig.json', '"target": "es5"', '"target": "es2015"');
3131

3232
const overrides = { optimization: true };
3333
const { files } = await browserBuild(architect, host, target, overrides);

‎packages/angular_devkit/build_angular/src/browser/specs/resolve-json-module_spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ describe('Browser Builder resolve json module', () => {
2929
});
3030

3131
host.replaceInFile(
32-
'tsconfig.base.json',
32+
'tsconfig.json',
3333
'"target": "es2015"',
3434
'"target": "es5", "resolveJsonModule": true',
3535
);

‎packages/angular_devkit/build_angular/src/browser/specs/tsconfig-paths_spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ describe('Browser Builder tsconfig paths', () => {
2222

2323
it('works', async () => {
2424
host.replaceInFile('src/app/app.module.ts', './app.component', '@root/app/app.component');
25-
host.replaceInFile('tsconfig.base.json', /"baseUrl": ".\/",/, `
25+
host.replaceInFile('tsconfig.json', /"baseUrl": ".\/",/, `
2626
"baseUrl": "./",
2727
"paths": {
2828
"@root/*": [
@@ -40,7 +40,7 @@ describe('Browser Builder tsconfig paths', () => {
4040
'src/app/shared/meaning.ts': 'export var meaning = 42;',
4141
'src/app/shared/index.ts': `export * from './meaning'`,
4242
});
43-
host.replaceInFile('tsconfig.base.json', /"baseUrl": ".\/",/, `
43+
host.replaceInFile('tsconfig.json', /"baseUrl": ".\/",/, `
4444
"baseUrl": "./",
4545
"paths": {
4646
"@shared": [

‎packages/angular_devkit/build_angular/src/browser/specs/web-worker_spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ describe('Browser Builder Web Worker support', () => {
5757
// tests, and integration with other build targets.
5858
'./src/tsconfig.worker.json': `
5959
{
60-
"extends": "../tsconfig.base.json",
60+
"extends": "../tsconfig.json",
6161
"compilerOptions": {
6262
"outDir": "../out-tsc/worker",
6363
"lib": [
@@ -73,7 +73,7 @@ describe('Browser Builder Web Worker support', () => {
7373
// Alter the app tsconfig to not include *.worker.ts files.
7474
'./src/tsconfig.app.json': `
7575
{
76-
"extends": "../tsconfig.base.json",
76+
"extends": "../tsconfig.json",
7777
"compilerOptions": {
7878
"outDir": "../out-tsc/worker",
7979
"types": []

‎packages/angular_devkit/build_angular/src/karma/code-coverage_spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ describe('Karma Builder code coverage', () => {
8787

8888
host.writeMultipleFiles(files);
8989

90-
host.replaceInFile('tsconfig.base.json', /"baseUrl": ".\/",/, `
90+
host.replaceInFile('tsconfig.json', /"baseUrl": ".\/",/, `
9191
"baseUrl": "./",
9292
"paths": {
9393
"my-lib": [

‎packages/angular_devkit/build_angular/src/karma/works_spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ describe('Karma Builder', () => {
4141
});
4242

4343
it('supports ES2015 target', async () => {
44-
host.replaceInFile('tsconfig.base.json', '"target": "es5"', '"target": "es2015"');
44+
host.replaceInFile('tsconfig.json', '"target": "es5"', '"target": "es2015"');
4545

4646
const run = await architect.scheduleTarget(karmaTargetSpec);
4747

‎packages/angular_devkit/build_angular/src/test-utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export async function createArchitect(workspaceRoot: Path) {
5555

5656
// Set AOT compilation to use VE if needed.
5757
if (veEnabled) {
58-
host.replaceInFile('tsconfig.base.json', `"enableIvy": true,`, `"enableIvy": false,`);
58+
host.replaceInFile('tsconfig.json', `"enableIvy": true,`, `"enableIvy": false,`);
5959
}
6060

6161
return {

‎packages/angular_devkit/build_angular/test/hello-world-app/e2e/tsconfig.e2e.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../tsconfig.base.json",
2+
"extends": "../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/e2e",
55
"module": "commonjs",

‎packages/angular_devkit/build_angular/test/hello-world-app/src/tsconfig.app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../tsconfig.base.json",
2+
"extends": "../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/app",
55
"types": []

‎packages/angular_devkit/build_angular/test/hello-world-app/src/tsconfig.spec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../tsconfig.base.json",
2+
"extends": "../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/spec",
55
"types": [

‎packages/angular_devkit/build_angular/test/hello-world-app/tsconfig.base.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎packages/angular_devkit/build_angular/test/hello-world-app/tsconfig.json

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
1-
// This tsConfig file is used by editors and TypeScript’s language server to improve development experience.
2-
// Note: This should not be used to perform a compilation.
31
{
4-
"files": [],
5-
"references": [
6-
{
7-
"path": "./src/tsconfig.app.json"
8-
},
9-
{
10-
"path": "./src/tsconfig.spec.json"
11-
},
12-
{
13-
"path": "./src/tsconfig.server.json"
14-
},
15-
{
16-
"path": "./e2e/tsconfig.e2e.json"
17-
}
18-
]
2+
"compileOnSave": false,
3+
"compilerOptions": {
4+
"baseUrl": "./",
5+
"outDir": "./dist/out-tsc",
6+
"sourceMap": true,
7+
"declaration": false,
8+
"moduleResolution": "node",
9+
"emitDecoratorMetadata": true,
10+
"experimentalDecorators": true,
11+
"target": "es2015",
12+
"module": "es2020",
13+
"typeRoots": [
14+
"node_modules/@types"
15+
],
16+
"lib": [
17+
"es2017",
18+
"dom"
19+
]
20+
},
21+
"angularCompilerOptions": {
22+
"enableIvy": true,
23+
"disableTypeScriptVersionCheck": true
24+
}
1925
}

‎packages/angular_devkit/build_ng_packagr/src/build/index_spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ describe('NgPackagr Builder', () => {
5050

5151
// Set AOT compilation to use VE if needed.
5252
if (veEnabled) {
53-
host.replaceInFile('tsconfig.base.json', `"enableIvy": true,`, `"enableIvy": false,`);
53+
host.replaceInFile('tsconfig.json', `"enableIvy": true,`, `"enableIvy": false,`);
5454
}
5555
});
5656

‎packages/angular_devkit/build_ng_packagr/test/ng-packaged/projects/lib/tsconfig.lib.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"target": "es2015",
55
"declaration": true,

‎packages/angular_devkit/build_ng_packagr/test/ng-packaged/projects/lib/tsconfig.spec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../out-tsc/spec",
55
"types": [

‎packages/angular_devkit/build_ng_packagr/test/ng-packaged/tsconfig.base.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)