test: disable typescript version check

filipesilva · vikerman · commit fd49f2e2fcb4 · 2019-10-16T10:00:49.000-07:00
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ve/tsconfig.json b/tests/angular_devkit/build_angular/hello-world-app-ve/tsconfig.json
@@ -19,6 +19,7 @@
     ]
   },
   "angularCompilerOptions": {
-    "enableIvy": false
+    "enableIvy": false,
+    "disableTypeScriptVersionCheck": true
   }
 }
diff --git a/tests/angular_devkit/build_angular/hello-world-app/tsconfig.json b/tests/angular_devkit/build_angular/hello-world-app/tsconfig.json
@@ -17,5 +17,9 @@
       "es2017",
       "dom"
     ]
+  },
+  "angularCompilerOptions": {
+    "enableIvy": true,
+    "disableTypeScriptVersionCheck": true
   }
 }
diff --git a/tests/angular_devkit/build_ng_packagr/ng-packaged-ve/tsconfig.json b/tests/angular_devkit/build_ng_packagr/ng-packaged-ve/tsconfig.json
@@ -18,6 +18,7 @@
     ]
   },
   "angularCompilerOptions": {
-    "enableIvy": false
+    "enableIvy": false,
+    "disableTypeScriptVersionCheck": true
   }
 }
diff --git a/tests/angular_devkit/build_webpack/angular-app/tsconfig.json b/tests/angular_devkit/build_webpack/angular-app/tsconfig.json
@@ -18,6 +18,7 @@
     ]
   },
   "angularCompilerOptions": {
-    "enableIvy": false
+    "enableIvy": true,
+    "disableTypeScriptVersionCheck": true
   }
 }
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/tsconfig.json b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/tsconfig.json
@@ -17,6 +17,8 @@
     "rootDir": "."
   },
   "angularCompilerOptions": {
+    "enableIvy": true,
+    "disableTypeScriptVersionCheck": true
     "genDir": "app/generated/",
     "entryModule": "app/app.module#AppModule"
   }
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/package.json b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/package.json
@@ -2,14 +2,14 @@
   "name": "test",
   "license": "MIT",
   "dependencies": {
-    "@angular/common": "^8.0.0-rc.0",
-    "@angular/compiler": "^8.0.0-rc.0",
-    "@angular/compiler-cli": "^8.0.0-rc.0",
-    "@angular/core": "^8.0.0-rc.0",
-    "@angular/platform-browser": "^8.0.0-rc.0",
-    "@angular/platform-browser-dynamic": "^8.0.0-rc.0",
-    "@angular/platform-server": "^8.0.0-rc.0",
-    "@angular/router": "^8.0.0-rc.0",
+    "@angular/common": "9.0.0-next.11",
+    "@angular/compiler": "9.0.0-next.11",
+    "@angular/compiler-cli": "9.0.0-next.11",
+    "@angular/core": "9.0.0-next.11",
+    "@angular/platform-browser": "9.0.0-next.11",
+    "@angular/platform-browser-dynamic": "9.0.0-next.11",
+    "@angular/platform-server": "9.0.0-next.11",
+    "@angular/router": "9.0.0-next.11",
     "@ngtools/webpack": "0.0.0",
     "core-js": "^3.0.0",
     "rxjs": "^6.4.2",
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app/package.json b/tests/legacy-cli/e2e/assets/webpack/test-app/package.json
@@ -2,14 +2,14 @@
   "name": "test",
   "license": "MIT",
   "dependencies": {
-    "@angular/common": "9.0.0-next.7",
-    "@angular/compiler": "9.0.0-next.7",
-    "@angular/compiler-cli": "9.0.0-next.7",
-    "@angular/core": "9.0.0-next.7",
-    "@angular/platform-browser": "9.0.0-next.7",
-    "@angular/platform-browser-dynamic": "9.0.0-next.7",
-    "@angular/platform-server": "9.0.0-next.7",
-    "@angular/router": "9.0.0-next.7",
+    "@angular/common": "9.0.0-next.11",
+    "@angular/compiler": "9.0.0-next.11",
+    "@angular/compiler-cli": "9.0.0-next.11",
+    "@angular/core": "9.0.0-next.11",
+    "@angular/platform-browser": "9.0.0-next.11",
+    "@angular/platform-browser-dynamic": "9.0.0-next.11",
+    "@angular/platform-server": "9.0.0-next.11",
+    "@angular/router": "9.0.0-next.11",
     "@ngtools/webpack": "0.0.0",
     "core-js": "^3.0.0",
     "rxjs": "^6.4.0",
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app/tsconfig.json b/tests/legacy-cli/e2e/assets/webpack/test-app/tsconfig.json
@@ -18,6 +18,8 @@
     "rootDir": "."
   },
   "angularCompilerOptions": {
+    "enableIvy": true,
+    "disableTypeScriptVersionCheck": true,
     "genDir": "./app/ngfactory",
     "entryModule": "app/app.module#AppModule"
   }
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app/package.json b/tests/legacy-cli/e2e/assets/webpack/test-server-app/package.json
@@ -2,15 +2,15 @@
   "name": "test",
   "license": "MIT",
   "dependencies": {
-    "@angular/animations": "^8.0.0-rc.0",
-    "@angular/common": "^8.0.0-rc.0",
-    "@angular/compiler": "^8.0.0-rc.0",
-    "@angular/compiler-cli": "^8.0.0-rc.0",
-    "@angular/core": "^8.0.0-rc.0",
-    "@angular/platform-browser": "^8.0.0-rc.0",
-    "@angular/platform-browser-dynamic": "^8.0.0-rc.0",
-    "@angular/platform-server": "^8.0.0-rc.0",
-    "@angular/router": "^8.0.0-rc.0",
+    "@angular/animations": "9.0.0-next.11",
+    "@angular/common": "9.0.0-next.11",
+    "@angular/compiler": "9.0.0-next.11",
+    "@angular/compiler-cli": "9.0.0-next.11",
+    "@angular/core": "9.0.0-next.11",
+    "@angular/platform-browser": "9.0.0-next.11",
+    "@angular/platform-browser-dynamic": "9.0.0-next.11",
+    "@angular/platform-server": "9.0.0-next.11",
+    "@angular/router": "9.0.0-next.11",
     "@ngtools/webpack": "0.0.0",
     "core-js": "^3.0.0",
     "rxjs": "^6.4.2",
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app/tsconfig.json b/tests/legacy-cli/e2e/assets/webpack/test-server-app/tsconfig.json
@@ -18,6 +18,8 @@
     "rootDir": "."
   },
   "angularCompilerOptions": {
+    "enableIvy": false,
+    "disableTypeScriptVersionCheck": true,
     "genDir": "./app/ngfactory",
     "entryModule": "app/app.module#AppModule"
   }
diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
@@ -39,6 +39,14 @@ export async function createProject(name: string, ...args: string[]) {
   await ng('new', name, '--skip-install', ...extraArgs, ...args);
   process.chdir(name);
 
+  if (fs.existsSync('tsconfig.json')) {
+    // Disable the TS version check to make TS updates easier.
+    // Only VE does it, but on Ivy the i18n extraction uses VE.
+    await updateJsonFile('tsconfig.json', config => {
+      config.angularCompilerOptions.disableTypeScriptVersionCheck = true;
+    });
+  }
+
   await prepareProjectForE2e(name);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`]`
`20`	`20`	`},`
`21`	`21`	`"angularCompilerOptions": {`
`22`		`- "enableIvy": false`
	`22`	`+ "enableIvy": false,`
	`23`	`+ "disableTypeScriptVersionCheck": true`
`23`	`24`	`}`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,9 @@`
`17`	`17`	`"es2017",`
`18`	`18`	`"dom"`
`19`	`19`	`]`
	`20`	`+ },`
	`21`	`+ "angularCompilerOptions": {`
	`22`	`+ "enableIvy": true,`
	`23`	`+ "disableTypeScriptVersionCheck": true`
`20`	`24`	`}`
`21`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`]`
`19`	`19`	`},`
`20`	`20`	`"angularCompilerOptions": {`
`21`		`- "enableIvy": false`
	`21`	`+ "enableIvy": false,`
	`22`	`+ "disableTypeScriptVersionCheck": true`
`22`	`23`	`}`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`"rootDir": "."`
`18`	`18`	`},`
`19`	`19`	`"angularCompilerOptions": {`
	`20`	`+ "enableIvy": true,`
	`21`	`+ "disableTypeScriptVersionCheck": true`
`20`	`22`	`"genDir": "app/generated/",`
`21`	`23`	`"entryModule": "app/app.module#AppModule"`
`22`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@`
`18`	`18`	`"rootDir": "."`
`19`	`19`	`},`
`20`	`20`	`"angularCompilerOptions": {`
	`21`	`+ "enableIvy": true,`
	`22`	`+ "disableTypeScriptVersionCheck": true,`
`21`	`23`	`"genDir": "./app/ngfactory",`
`22`	`24`	`"entryModule": "app/app.module#AppModule"`
`23`	`25`	`}`