Skip to content

Commit

Permalink
Merge pull request #73 from sebgroup/next-major
Browse files Browse the repository at this point in the history
Next major
  • Loading branch information
hjalmers authored Jun 1, 2021
2 parents 350133a + 70284d9 commit 51f21db
Show file tree
Hide file tree
Showing 119 changed files with 18,163 additions and 12,458 deletions.
10 changes: 9 additions & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
{
"extends": "stylelint-config-recommended-scss"
"extends": "stylelint-config-recommended-scss",
"rules": {
"selector-pseudo-class-no-unknown": [true, {
"ignorePseudoClasses": ["ng-deep"]
}],
"selector-pseudo-element-no-unknown": [true, {
"ignorePseudoElements": ["ng-deep"]
}]
}
}
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ language: node_js
node_js: lts/*

install:
- npm ci
- npm run add-fa-config
- npm ci
cache:
directories:
- $HOME/.npm
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Write the markup for your template.

```Html
<wiz-wizard [hideNavigation]="false"
wizardTitle="Wizard title"
title="Wizard title"
[steps]="steps"
(navigate)="onStep($event)"
(close)="onClose($event)">
Expand Down
93 changes: 48 additions & 45 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,36 +33,44 @@
}
}
},
"seb-ng-wizard-demo": {
"root": "projects/seb-ng-wizard-demo/",
"sourceRoot": "projects/seb-ng-wizard-demo/src",
"seb-ng-wizard-lazy-demo": {
"projectType": "application",
"prefix": "demo",
"schematics": {
"@schematics/angular:component": {
"inlineTemplate": true,
"style": "scss"
}
},
"root": "projects/seb-ng-wizard-lazy-demo",
"sourceRoot": "projects/seb-ng-wizard-lazy-demo/src",
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/ng-wizard-demo",
"index": "projects/seb-ng-wizard-demo/src/index.html",
"main": "projects/seb-ng-wizard-demo/src/main.ts",
"polyfills": "projects/seb-ng-wizard-demo/src/polyfills.ts",
"tsConfig": "projects/seb-ng-wizard-demo/tsconfig.app.json",
"assets": ["projects/seb-ng-wizard-demo/src/favicon.ico", "projects/seb-ng-wizard-demo/src/assets"],
"styles": ["projects/seb-ng-wizard-demo/src/styles.scss"],
"scripts": []
"outputPath": "dist/seb-ng-wizard-lazy-demo",
"index": "projects/seb-ng-wizard-lazy-demo/src/index.html",
"main": "projects/seb-ng-wizard-lazy-demo/src/main.ts",
"polyfills": "projects/seb-ng-wizard-lazy-demo/src/polyfills.ts",
"tsConfig": "projects/seb-ng-wizard-lazy-demo/tsconfig.app.json",
"aot": false,
"assets": [
"projects/seb-ng-wizard-lazy-demo/src/favicon.ico",
"projects/seb-ng-wizard-lazy-demo/src/assets"
],
"styles": ["projects/seb-ng-wizard-lazy-demo/src/styles.scss"],
"scripts": [
"node_modules/marked/lib/marked.js",
"node_modules/prismjs/prism.js",
"node_modules/prismjs/components/prism-typescript.min.js",
"node_modules/prismjs/components/prism-markup.min.js"
]
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "projects/seb-ng-wizard-demo/src/environments/environment.ts",
"with": "projects/seb-ng-wizard-demo/src/environments/environment.prod.ts"
"replace": "projects/seb-ng-wizard-lazy-demo/src/environments/environment.ts",
"with": "projects/seb-ng-wizard-lazy-demo/src/environments/environment.prod.ts"
}
],
"optimization": true,
Expand All @@ -79,6 +87,11 @@
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb",
"maximumError": "10kb"
}
]
}
Expand All @@ -87,67 +100,57 @@
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "seb-ng-wizard-demo:build"
"browserTarget": "seb-ng-wizard-lazy-demo:build"
},
"configurations": {
"production": {
"browserTarget": "seb-ng-wizard-demo:build:production"
"browserTarget": "seb-ng-wizard-lazy-demo:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "seb-ng-wizard-demo:build"
"browserTarget": "seb-ng-wizard-lazy-demo:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/seb-ng-wizard-demo/src/test.ts",
"polyfills": "projects/seb-ng-wizard-demo/src/polyfills.ts",
"tsConfig": "projects/seb-ng-wizard-demo/tsconfig.spec.json",
"karmaConfig": "projects/seb-ng-wizard-demo/karma.conf.js",
"styles": ["projects/seb-ng-wizard-demo/src/styles.scss"],
"scripts": [],
"assets": ["projects/seb-ng-wizard-demo/src/favicon.ico", "projects/seb-ng-wizard-demo/src/assets"]
"main": "projects/seb-ng-wizard-lazy-demo/src/test.ts",
"polyfills": "projects/seb-ng-wizard-lazy-demo/src/polyfills.ts",
"tsConfig": "projects/seb-ng-wizard-lazy-demo/tsconfig.spec.json",
"karmaConfig": "projects/seb-ng-wizard-lazy-demo/karma.conf.js",
"assets": [
"projects/seb-ng-wizard-lazy-demo/src/favicon.ico",
"projects/seb-ng-wizard-lazy-demo/src/assets"
],
"styles": ["projects/seb-ng-wizard-lazy-demo/src/styles.scss"],
"scripts": []
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/seb-ng-wizard-demo/tsconfig.app.json",
"projects/seb-ng-wizard-demo/tsconfig.spec.json"
"projects/seb-ng-wizard-lazy-demo/tsconfig.app.json",
"projects/seb-ng-wizard-lazy-demo/tsconfig.spec.json",
"projects/seb-ng-wizard-lazy-demo/e2e/tsconfig.json"
],
"exclude": ["**/node_modules/**"]
}
}
}
},
"seb-ng-wizard-demo-e2e": {
"root": "projects/seb-ng-wizard-demo-e2e/",
"projectType": "application",
"prefix": "",
"architect": {
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "projects/seb-ng-wizard-demo-e2e/protractor.conf.js",
"devServerTarget": "seb-ng-wizard-demo:serve"
"protractorConfig": "projects/seb-ng-wizard-lazy-demo/e2e/protractor.conf.js",
"devServerTarget": "seb-ng-wizard-lazy-demo:serve"
},
"configurations": {
"production": {
"devServerTarget": "seb-ng-wizard-demo:serve:production"
"devServerTarget": "seb-ng-wizard-lazy-demo:serve:production"
}
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "projects/seb-ng-wizard-demo-e2e/tsconfig.e2e.json",
"exclude": ["**/node_modules/**"]
}
}
}
}
Expand Down
Loading

0 comments on commit 51f21db

Please sign in to comment.