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.

Sign up for GitHub

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

Jump to bottom

Remove solutions tsconfig #18478

Merged
merged 4 commits into from Aug 12, 2020
Merged

Remove solutions tsconfig #18478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17c8e20
test: remove tsconfig.base.json from test cases
alan-agius4 Aug 7, 2020
03b6140
fix(@schematics/angular): remove solution style tsconfig from new pro…
alan-agius4 Aug 7, 2020
4ab4f03
feat(@schematics/angular): add migration to remove solution style tsc…
alan-agius4 Aug 10, 2020
e173a22
refactor(@schematics/angular): throw on AST parse errors
alan-agius4 Aug 10, 2020
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 integration/angular_cli/e2e/tsconfig.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "../tsconfig.base.json",
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
Expand Down
2 changes: 1 addition & 1 deletion integration/angular_cli/tsconfig.app.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "./tsconfig.base.json",
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./out-tsc/app",
"types": []
Expand Down
25 changes: 0 additions & 25 deletions integration/angular_cli/tsconfig.base.json
View file
Open in desktop

This file was deleted.

34 changes: 23 additions & 11 deletions integration/angular_cli/tsconfig.json
View file
Open in desktop
@@ -1,13 +1,25 @@
// This tsConfig file is used by editors and TypeScript’s language server to improve development experience.
// Note: This should not be used to perform a compilation.
{
"files": [],
"references": [
{
"path": "./tsconfig.app.json"
},
{
"path": "./tsconfig.spec.json"
}
]
"compileOnSave": false,
"compilerOptions": {
"baseUrl": "./",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es2015",
"module": "es2020",
"typeRoots": [
"node_modules/@types"
],
"lib": [
"es2017",
"dom"
]
},
"angularCompilerOptions": {
"enableIvy": true,
"disableTypeScriptVersionCheck": true
}
}
2 changes: 1 addition & 1 deletion integration/angular_cli/tsconfig.spec.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "./tsconfig.base.json",
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./out-tsc/spec",
"types": [
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/cli/commands/version-impl.ts
View file
Open in desktop
Expand Up @@ -194,7 +194,7 @@ export class VersionCommand extends Command<VersionCommandSchema> {

private getIvyWorkspace(): string {
try {
const content = fs.readFileSync(path.resolve(this.workspace.root, 'tsconfig.base.json'), 'utf-8');
const content = fs.readFileSync(path.resolve(this.workspace.root, 'tsconfig.json'), 'utf-8');
const tsConfig = parseJson(content, JsonParseMode.Loose);
if (!isJsonObject(tsConfig)) {
return '<error>';
Expand Down
6 changes: 3 additions & 3 deletions packages/angular_devkit/build_angular/src/browser/specs/allow-js_spec.ts
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ describe('Browser Builder allow js', () => {
});

host.replaceInFile(
'tsconfig.base.json',
'tsconfig.json',
'"target": "es2015"',
'"target": "es5", "allowJs": true',
);
Expand All @@ -54,7 +54,7 @@ describe('Browser Builder allow js', () => {
});

host.replaceInFile(
'tsconfig.base.json',
'tsconfig.json',
'"target": "es2015"',
'"target": "es5", "allowJs": true',
);
Expand All @@ -81,7 +81,7 @@ describe('Browser Builder allow js', () => {
});

host.replaceInFile(
'tsconfig.base.json',
'tsconfig.json',
'"target": "es2015"',
'"target": "es5", "allowJs": true',
);
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/src/browser/specs/common-js-warning_spec.ts
View file
Open in desktop
Expand Up @@ -79,7 +79,7 @@ describe('Browser Builder commonjs warning', () => {
});

it('should not show warning in JIT for templateUrl and styleUrl when using paths', async () => {
host.replaceInFile('tsconfig.base.json', /"baseUrl": ".\/",/, `
host.replaceInFile('tsconfig.json', /"baseUrl": ".\/",/, `
"baseUrl": "./",
"paths": {
"@app/*": [
Expand Down
4 changes: 2 additions & 2 deletions packages/angular_devkit/build_angular/src/browser/specs/differential_loading_spec.ts
View file
Open in desktop
Expand Up @@ -65,7 +65,7 @@ describe('Browser Builder with differential loading', () => {

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

it('emits all the neccessary files for target of ESNext', async () => {
host.replaceInFile(
'tsconfig.base.json',
'tsconfig.json',
'"target": "es2015",',
`"target": "esnext",`,
);
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/src/browser/specs/optimization-level_spec.ts
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@ describe('Browser Builder optimization level', () => {
});

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

const overrides = { optimization: true };
const { files } = await browserBuild(architect, host, target, overrides);
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/src/browser/specs/resolve-json-module_spec.ts
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ describe('Browser Builder resolve json module', () => {
});

host.replaceInFile(
'tsconfig.base.json',
'tsconfig.json',
'"target": "es2015"',
'"target": "es5", "resolveJsonModule": true',
);
Expand Down
4 changes: 2 additions & 2 deletions packages/angular_devkit/build_angular/src/browser/specs/tsconfig-paths_spec.ts
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ describe('Browser Builder tsconfig paths', () => {

it('works', async () => {
host.replaceInFile('src/app/app.module.ts', './app.component', '@root/app/app.component');
host.replaceInFile('tsconfig.base.json', /"baseUrl": ".\/",/, `
host.replaceInFile('tsconfig.json', /"baseUrl": ".\/",/, `
"baseUrl": "./",
"paths": {
"@root/*": [
Expand All @@ -40,7 +40,7 @@ describe('Browser Builder tsconfig paths', () => {
'src/app/shared/meaning.ts': 'export var meaning = 42;',
'src/app/shared/index.ts': `export * from './meaning'`,
});
host.replaceInFile('tsconfig.base.json', /"baseUrl": ".\/",/, `
host.replaceInFile('tsconfig.json', /"baseUrl": ".\/",/, `
"baseUrl": "./",
"paths": {
"@shared": [
Expand Down
4 changes: 2 additions & 2 deletions packages/angular_devkit/build_angular/src/browser/specs/web-worker_spec.ts
View file
Open in desktop
Expand Up @@ -57,7 +57,7 @@ describe('Browser Builder Web Worker support', () => {
// tests, and integration with other build targets.
'./src/tsconfig.worker.json': `
{
"extends": "../tsconfig.base.json",
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/worker",
"lib": [
Expand All @@ -73,7 +73,7 @@ describe('Browser Builder Web Worker support', () => {
// Alter the app tsconfig to not include *.worker.ts files.
'./src/tsconfig.app.json': `
{
"extends": "../tsconfig.base.json",
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/worker",
"types": []
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/src/karma/code-coverage_spec.ts
View file
Open in desktop
Expand Up @@ -87,7 +87,7 @@ describe('Karma Builder code coverage', () => {

host.writeMultipleFiles(files);

host.replaceInFile('tsconfig.base.json', /"baseUrl": ".\/",/, `
host.replaceInFile('tsconfig.json', /"baseUrl": ".\/",/, `
"baseUrl": "./",
"paths": {
"my-lib": [
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/src/karma/works_spec.ts
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@ describe('Karma Builder', () => {
});

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

const run = await architect.scheduleTarget(karmaTargetSpec);

Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/src/test-utils.ts
View file
Open in desktop
Expand Up @@ -55,7 +55,7 @@ export async function createArchitect(workspaceRoot: Path) {

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

return {
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/test/hello-world-app/e2e/tsconfig.e2e.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "../tsconfig.base.json",
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/test/hello-world-app/src/tsconfig.app.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "../tsconfig.base.json",
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"types": []
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/test/hello-world-app/src/tsconfig.spec.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "../tsconfig.base.json",
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/spec",
"types": [
Expand Down
25 changes: 0 additions & 25 deletions packages/angular_devkit/build_angular/test/hello-world-app/tsconfig.base.json
View file
Open in desktop

This file was deleted.

40 changes: 23 additions & 17 deletions packages/angular_devkit/build_angular/test/hello-world-app/tsconfig.json
View file
Open in desktop
@@ -1,19 +1,25 @@
// This tsConfig file is used by editors and TypeScript’s language server to improve development experience.
// Note: This should not be used to perform a compilation.
{
"files": [],
"references": [
{
"path": "./src/tsconfig.app.json"
},
{
"path": "./src/tsconfig.spec.json"
},
{
"path": "./src/tsconfig.server.json"
},
{
"path": "./e2e/tsconfig.e2e.json"
}
]
"compileOnSave": false,
"compilerOptions": {
"baseUrl": "./",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es2015",
"module": "es2020",
"typeRoots": [
"node_modules/@types"
],
"lib": [
"es2017",
"dom"
]
},
"angularCompilerOptions": {
"enableIvy": true,
"disableTypeScriptVersionCheck": true
}
}
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_ng_packagr/src/build/index_spec.ts
View file
Open in desktop
Expand Up @@ -50,7 +50,7 @@ describe('NgPackagr Builder', () => {

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

Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_ng_packagr/test/ng-packaged/projects/lib/tsconfig.lib.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"target": "es2015",
"declaration": true,
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_ng_packagr/test/ng-packaged/projects/lib/tsconfig.spec.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/spec",
"types": [
Expand Down
24 changes: 0 additions & 24 deletions packages/angular_devkit/build_ng_packagr/test/ng-packaged/tsconfig.base.json
View file
Open in desktop

This file was deleted.