Skip to content

Commit

Permalink
fix(stack-blitz-tests): revert enabling Ivy as it broke harness examples
Browse files Browse the repository at this point in the history
- remove tslint and codelyzer from examples
- update jasmine dependencies
- remove unused material-module.ts from test assets
- add jasmine-core to package.json in stack-blitz-tests/
- disable `noImplicitAny` in stack-blitz-tests' tsconfig.spec.json since
  `jasmine-core/lib/jasmine-core/jasmine.js` imported in `test/jasemine-setup.ts`
   is not compatible

Fixes angular#997
  • Loading branch information
Splaktar committed Jul 19, 2021
1 parent 12834d8 commit 769a36c
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 373 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"@angular/cli": "^12.1.0",
"@angular/compiler-cli": "^12.1.0",
"@types/imagemin": "^7.0.0",
"@types/jasmine": "^3.6.6",
"@types/jasmine": "^3.7.7",
"@types/node": "^14.14.22",
"@types/shelljs": "~0.8.8",
"@typescript-eslint/eslint-plugin": "4.16.1",
Expand All @@ -81,7 +81,7 @@
"firebase-tools": "^9.10.2",
"imagemin": "^7.0.1",
"imagemin-pngquant": "^9.0.2",
"jasmine-core": "^3.6.0",
"jasmine-core": "^3.7.1",
"jasmine-spec-reporter": "^6.0.0",
"karma": "~6.3.2",
"karma-chrome-launcher": "^3.1.0",
Expand Down
8 changes: 3 additions & 5 deletions src/app/shared/stack-blitz/stack-blitz-writer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ const TEMPLATE_FILES = [
'tsconfig.json',
'tsconfig.app.json',
'tsconfig.spec.json',
'tslint.json',
'src/index.html',
'src/styles.scss',
'src/polyfills.ts',
Expand All @@ -50,12 +49,11 @@ const TEST_TEMPLATE_FILES = [
'tsconfig.json',
'tsconfig.app.json',
'tsconfig.spec.json',
'tslint.json',
'src/index.html',
'src/styles.scss',
'src/polyfills.ts',
'src/main.ts',
'src/test/jasmine-setup.ts',
'src/test/jasmine-setup.ts'
];

const TAGS: string[] = ['angular', 'material', 'example'];
Expand Down Expand Up @@ -91,8 +89,8 @@ const testDependencies = {
'@angular/platform-browser': angularVersion,
'@angular/platform-browser-dynamic': angularVersion,
'@angular/router': angularVersion,
'@types/jasmine': '^3.6.6',
'jasmine-core': '^3.6.0',
'@types/jasmine': '^3.7.7',
'jasmine-core': '^3.7.1',
'moment': '^2.29.1',
'rxjs': '^6.6.7',
'tslib': '^2.2.0',
Expand Down
5 changes: 2 additions & 3 deletions src/assets/stack-blitz-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,10 @@
"@angular/compiler-cli": "^12.0.0",
"@angular/language-service": "^12.0.0",
"@angular/localize": "^12.0.0",
"@types/jasmine": "^3.6.6",
"@types/jasmine": "^3.7.7",
"@types/node": "^14.14.22",
"codelyzer": "^6.0.1",
"jasmine-core": "^3.7.1",
"ts-node": "^8.10.2",
"tslint": "~6.1.2",
"typescript": "~4.2.3"
}
}
94 changes: 0 additions & 94 deletions src/assets/stack-blitz-tests/src/app/material-module.ts

This file was deleted.

2 changes: 1 addition & 1 deletion src/assets/stack-blitz-tests/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@
"strictInjectionParameters": true,
"strictInputAccessModifiers": true,
"strictTemplates": true,
"enableIvy": true
"enableIvy": false
}
}
1 change: 1 addition & 0 deletions src/assets/stack-blitz-tests/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./out-tsc/spec",
"noImplicitAny": false,
"types": [
"jasmine",
"node"
Expand Down
131 changes: 0 additions & 131 deletions src/assets/stack-blitz-tests/tslint.json

This file was deleted.

2 changes: 0 additions & 2 deletions src/assets/stack-blitz/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@
"@angular/language-service": "^12.0.0",
"@angular/localize": "^12.0.0",
"@types/node": "^14.14.22",
"codelyzer": "^6.0.1",
"ts-node": "^8.10.2",
"tslint": "~6.1.3",
"typescript": "~4.2.3"
}
}
Loading

0 comments on commit 769a36c

Please sign in to comment.