Skip to content
This repository has been archived by the owner on Feb 2, 2023. It is now read-only.

Commit

Permalink
Merge a35abb6 into 28db12d
Browse files Browse the repository at this point in the history
  • Loading branch information
klemenoslaj authored May 13, 2020
2 parents 28db12d + a35abb6 commit 99f3df0
Show file tree
Hide file tree
Showing 11 changed files with 3,486 additions and 2,175 deletions.
23 changes: 19 additions & 4 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
"tsConfig": "projects/core/tsconfig.lib.json",
"project": "projects/core/ng-package.json"
}
},
, "configurations": {
"production": {
"tsConfig": "projects/core/tsconfig.lib.prod.json"
}
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
Expand Down Expand Up @@ -68,6 +73,12 @@
},
"configurations": {
"production": {
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"fileReplacements": [
{
"replace": "projects/playground/src/environments/environment.ts",
Expand All @@ -79,7 +90,6 @@
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
Expand Down Expand Up @@ -153,7 +163,12 @@
"tsConfig": "projects/material/tsconfig.lib.json",
"project": "projects/material/ng-package.json"
}
},
, "configurations": {
"production": {
"tsConfig": "projects/material/tsconfig.lib.prod.json"
}
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
Expand Down Expand Up @@ -183,7 +198,7 @@
},
"schematics": {
"@schematics/angular:component": {
"styleext": "scss"
"style": "scss"
}
}
}
50 changes: 25 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
},
"scripts": {
"build": "ng build core && ng build material",
"build:prod": "ng build core --prod && ng build material --prod",
"test:once": "ng test core --watch false --browsers ChromeHeadless --code-coverage",
"docs:coverage": "compodoc -p ./tsconfig.docs.json --disableLifeCycleHooks --disableInternal --coverageMinimumPerFile 100",
"docs:build.prod": "yarn docs:coverage && compodoc -p ./tsconfig.docs.json --disableLifeCycleHooks --disableInternal --disablePrivate --disableProtected --name NgActionOutlet --output docs",
Expand All @@ -16,35 +17,35 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^8.2.14",
"@angular/cdk": "^8.2.3",
"@angular/common": "^8.2.14",
"@angular/compiler": "^8.2.14",
"@angular/core": "^8.2.14",
"@angular/forms": "^8.2.14",
"@angular/material": "^8.2.3",
"@angular/platform-browser": "^8.2.14",
"@angular/platform-browser-dynamic": "^8.2.14",
"@angular/router": "^8.2.14",
"hammerjs": "^2.0.8",
"rxjs": "^6.5.4",
"@angular/animations": "^9.1.6",
"@angular/cdk": "^9.2.3",
"@angular/common": "^10.0.0-next.6",
"@angular/compiler": "^9.1.6",
"@angular/core": "^9.1.6",
"@angular/forms": "^9.1.6",
"@angular/material": "^9.2.3",
"@angular/platform-browser": "^9.1.6",
"@angular/platform-browser-dynamic": "^9.1.6",
"@angular/router": "^9.1.6",
"rxjs": "^6.5.5",
"travis-deploy-once": "^5.0.11",
"zone.js": "~0.9.1"
"tslib": "^1.10.0",
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.803.21",
"@angular-devkit/build-ng-packagr": "~0.803.21",
"@angular/cli": "^8.3.21",
"@angular/compiler-cli": "^8.2.14",
"@angular/language-service": "^8.2.14",
"@angular-devkit/build-angular": "~0.901.5",
"@angular-devkit/build-ng-packagr": "~0.901.5",
"@angular/cli": "^9.1.5",
"@angular/compiler-cli": "^9.1.6",
"@angular/language-service": "^9.1.6",
"@commitlint/cli": "^8.1.0",
"@commitlint/config-conventional": "^8.1.0",
"@commitlint/travis-cli": "^8.1.0",
"@compodoc/compodoc": "^1.1.5",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^10.12.0",
"codelyzer": "^5.0.1",
"@types/node": "^12.11.1",
"codelyzer": "^5.1.2",
"coveralls": "^3.0.2",
"cz-conventional-changelog": "^3.0.2",
"husky": "^3.0.0",
Expand All @@ -55,20 +56,19 @@
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~1.1.2",
"karma-jasmine-html-reporter": "^0.2.2",
"ng-packagr": "^5.7.1",
"ng-packagr": "^9.0.0",
"protractor": "~5.4.0",
"remark-cli": "^7.0.0",
"remark-preset-lint-recommended": "^3.0.2",
"semantic-release": "^15.10.5",
"shelljs": "^0.8.3",
"ts-node": "~7.0.0",
"tsickle": ">=0.29.0",
"tslib": "^1.10.0",
"tslint": "^5.13.0",
"typescript": "~3.5.3"
"typescript": "~3.8.3"
},
"resolutions": {
"handlebars": "4.5.3"
"handlebars": "4.5.3",
"dot-prop": "^5.1.1"
},
"release": {
"packages": "dist",
Expand Down
2 changes: 1 addition & 1 deletion projects/core/src/lib/action-outlet.directive.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ interface TestContext {
})
class TestComponent {
@ViewChild(ActionOutletDirective, { static: true }) outlet!: ActionOutletDirective;
@ViewChild('el', { static: false }) element!: ElementRef;
@ViewChild('el') element!: ElementRef;
@Input() group?: ActionGroup | null;
@Input() destroy = true;

Expand Down
1 change: 0 additions & 1 deletion projects/core/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
]
},
"angularCompilerOptions": {
"annotateForClosureCompiler": true,
"skipTemplateCodegen": true,
"strictMetadataEmit": true,
"fullTemplateTypeCheck": true,
Expand Down
6 changes: 6 additions & 0 deletions projects/core/tsconfig.lib.prod.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": "./tsconfig.lib.json",
"angularCompilerOptions": {
"enableIvy": false
}
}
2 changes: 1 addition & 1 deletion projects/material/src/lib/action-mat.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import { ActionMatButtonDirective } from './action-mat-button.directive';
}]
})
export class ActionMatModule {
static forRoot(iconType: ICON_TYPE): ModuleWithProviders {
static forRoot(iconType: ICON_TYPE): ModuleWithProviders<ActionMatModule> {
return {
ngModule: ActionMatModule,
providers: [
Expand Down
1 change: 0 additions & 1 deletion projects/material/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
]
},
"angularCompilerOptions": {
"annotateForClosureCompiler": true,
"skipTemplateCodegen": true,
"strictMetadataEmit": true,
"fullTemplateTypeCheck": true,
Expand Down
6 changes: 6 additions & 0 deletions projects/material/tsconfig.lib.prod.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": "./tsconfig.lib.json",
"angularCompilerOptions": {
"enableIvy": false
}
}
2 changes: 1 addition & 1 deletion projects/playground/src/main.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'hammerjs';

import { enableProdMode } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';

Expand Down
9 changes: 6 additions & 3 deletions projects/playground/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
"outDir": "../../out-tsc/app",
"types": []
},
"exclude": [
"test.ts",
"**/*.spec.ts"
"files": [
"src/main.ts",
"src/polyfills.ts"
],
"include": [
"projects/playground/src/**/*.d.ts"
]
}
Loading

0 comments on commit 99f3df0

Please sign in to comment.