Skip to content

Commit

Permalink
Updated from generator v9.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
semantic-release-bot committed Sep 10, 2020
1 parent 6645476 commit 7a062a5
Show file tree
Hide file tree
Showing 31 changed files with 176 additions and 163 deletions.
18 changes: 18 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries

# For the full list of supported browsers by the Angular framework, please see:
# https://angular.io/guide/browser-support

# You can see what browsers were selected by your queries by running:
# npx browserslist

last 1 Chrome version
last 1 Firefox version
last 2 Edge major versions
last 2 Safari major versions
last 2 iOS major versions
Firefox ESR
not IE 9-10 # Angular support for IE 9-10 has been deprecated and will be removed as of Angular v11. To opt-in, remove the 'not' prefix on this line.
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Editor configuration, see http://editorconfig.org
# Editor configuration, see https://editorconfig.org
root = true

[*]
Expand Down
6 changes: 3 additions & 3 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"src/favicon.ico",
"src/apple-touch-icon.png",
"src/robots.txt",
"src/manifest.json",
"src/manifest.webmanifest",
"src/assets"
],
"styles": [
Expand All @@ -42,7 +42,6 @@
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
Expand All @@ -54,7 +53,8 @@
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
"maximumWarning": "6kb",
"maximumError": "10kb"
}
],
"serviceWorker": true,
Expand Down
6 changes: 3 additions & 3 deletions docs/i18n.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ Do no forget to edit the files in `src/environment` to add the supported languag
If strings are not directly passed to `translateService` or put in HTML templates, they may be missing from the
extraction process.

For these cases, you have to use the dummy `extract()` function:
For these cases, you have to use the dummy `marker()` function:
```typescript
import { extract } from './core/i18n.service';
import { marker } from '@biesbjerg/ngx-translate-extract-marker';

function toBeTranslatedLater() {
return extract('A string to be translated');
return marker('A string to be translated');
}
```

Expand Down
7 changes: 4 additions & 3 deletions e2e/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../tsconfig.json",
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"target": "es2018",
"types": [
"jasmine",
"jasminewd2",
"node"
]
}
}
}
10 changes: 4 additions & 6 deletions ngsw-config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "./node_modules/@angular/service-worker/config/schema.json",
"index": "/index.html",
"assetGroups": [
{
Expand All @@ -8,7 +9,7 @@
"files": [
"/favicon.ico",
"/index.html",
"/manifest.json",
"/manifest.webmanifest",
"/*.css",
"/*.js"
]
Expand All @@ -21,12 +22,9 @@
"resources": {
"files": [
"/assets/**",
"/*.woff",
"/*.woff2",
"/*.ttf",
"/*.eot"
"/*.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)"
]
}
}
]
}
}
91 changes: 46 additions & 45 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "npm run env -s && ng test",
"test:ci": "npm run env -s && npm run lint -s && ng test --configuration=ci",
"e2e": "npm run env -s && ng e2e",
"translations:extract": "ngx-translate-extract --input ./src --output ./src/translations/template.json --format=json --clean --sort --marker extract",
"translations:extract": "ngx-translate-extract --input ./src --output ./src/translations/template.json --format=json --clean --sort",
"docs": "hads ./docs -o",
"env": "ngx-scripts env npm_package_version",
"prettier": "prettier --write \"./{src,e2e}/**/*.{ts,js,html,scss}\"",
Expand All @@ -20,57 +20,58 @@
"generate": "ng generate"
},
"dependencies": {
"@angular/animations": "^9.1.9",
"@angular/common": "^9.1.9",
"@angular/compiler": "^9.1.9",
"@angular/core": "^9.1.9",
"@angular/forms": "^9.1.9",
"@angular/platform-browser": "^9.1.9",
"@angular/platform-browser-dynamic": "^9.1.9",
"@angular/router": "^9.1.9",
"@ngx-translate/core": "^12.0.0",
"@angular/service-worker": "^9.1.9",
"@ng-bootstrap/ng-bootstrap": "^6.0.2",
"bootstrap": "^4.1.1",
"@fortawesome/fontawesome-free": "^5.1.0",
"@angular/localize": "^9.1.0",
"rxjs": "^6.5.5",
"tslib": "^1.10.1",
"zone.js": "^0.10.3"
"@angular/animations": "^10.0.14",
"@angular/common": "^10.0.14",
"@angular/compiler": "^10.0.14",
"@angular/core": "^10.0.14",
"@angular/forms": "^10.0.14",
"@angular/localize": "^10.0.14",
"@angular/platform-browser": "^10.0.14",
"@angular/platform-browser-dynamic": "^10.0.14",
"@angular/router": "^10.0.14",
"@ngx-translate/core": "^13.0.0",
"@angular/service-worker": "^10.0.14",
"@ng-bootstrap/ng-bootstrap": "^7.0.0",
"bootstrap": "^4.5.2",
"@fortawesome/fontawesome-free": "^5.14.0",
"rxjs": "^6.6.2",
"tslib": "^2.0.1",
"zone.js": "~0.10.3"
},
"devDependencies": {
"@angular-builders/jest": "^8.3.2",
"@angular/cli": "~9.1.7",
"@angular/compiler-cli": "^9.1.9",
"@angular/language-service": "^9.1.9",
"@angular-devkit/build-angular": "^0.901.7",
"@angularclass/hmr": "^2.1.3",
"@biesbjerg/ngx-translate-extract": "^4.2.0",
"@angular-builders/jest": "^10.0.0",
"@angular/cli": "~10.0.8",
"@angular/compiler-cli": "^10.0.14",
"@angular/language-service": "^10.0.14",
"@angular-devkit/build-angular": "^0.1000.8",
"@angularclass/hmr": "^3.0.0",
"@biesbjerg/ngx-translate-extract": "^7.0.2",
"@biesbjerg/ngx-translate-extract-marker": "^1.0.0",
"@ngx-rocket/scripts": "^4.0.0",
"@types/jasmine": "^3.3.13",
"@types/jasminewd2": "^2.0.3",
"@types/jest": "^25.1.2",
"@types/node": "^12.11.1",
"codelyzer": "^5.1.2",
"hads": "^2.0.1",
"htmlhint": "^0.11.0",
"@types/jasmine": "^3.5.14",
"@types/jasminewd2": "^2.0.8",
"@types/jest": "^26.0.12",
"@types/node": "^12.12.54",
"codelyzer": "^6.0.0",
"hads": "^2.1.0",
"htmlhint": "^0.14.1",
"https-proxy-agent": "^5.0.0",
"jasmine-core": "~3.5.0",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.1",
"jest": "^25.1.0",
"prettier": "^2.0.2",
"tslint-config-prettier": "^1.14.0",
"stylelint-config-prettier": "^8.0.1",
"pretty-quick": "^2.0.1",
"husky": "^4.2.3",
"protractor": "~5.4.3",
"stylelint": "~13.2.1",
"jest": "^26.4.2",
"prettier": "^2.1.1",
"tslint-config-prettier": "^1.18.0",
"stylelint-config-prettier": "^8.0.2",
"pretty-quick": "^3.0.0",
"husky": "^4.2.5",
"protractor": "~7.0.0",
"stylelint": "~13.6.1",
"stylelint-config-recommended-scss": "~4.2.0",
"stylelint-config-standard": "~20.0.0",
"stylelint-scss": "~3.16.0",
"ts-node": "^8.8.1",
"tslint": "~5.20.1",
"typescript": "~3.8.3"
"stylelint-scss": "~3.18.0",
"ts-node": "^9.0.0",
"tslint": "~6.1.0",
"typescript": "~3.9.5"
},
"prettier": {
"singleQuote": true,
Expand Down
4 changes: 2 additions & 2 deletions src/app/@shared/loader/loader.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';

import { LoaderComponent } from './loader.component';

describe('LoaderComponent', () => {
let component: LoaderComponent;
let fixture: ComponentFixture<LoaderComponent>;

beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [LoaderComponent]
})
Expand Down
4 changes: 2 additions & 2 deletions src/app/about/about-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { marker } from '@biesbjerg/ngx-translate-extract-marker';

import { extract } from '@app/i18n';
import { Shell } from '@app/shell/shell.service';
import { AboutComponent } from './about.component';

const routes: Routes = [
Shell.childRoutes([
{ path: 'about', component: AboutComponent, data: { title: extract('About') } }
{ path: 'about', component: AboutComponent, data: { title: marker('About') } }
])
];

Expand Down
4 changes: 2 additions & 2 deletions src/app/about/about.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';

import { AboutComponent } from './about.component';

describe('AboutComponent', () => {
let component: AboutComponent;
let fixture: ComponentFixture<AboutComponent>;

beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [AboutComponent]
})
Expand Down
6 changes: 3 additions & 3 deletions src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { TestBed, async } from '@angular/core/testing';
import { TestBed, waitForAsync } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { TranslateModule } from '@ngx-translate/core';

import { CoreModule } from '@core';
import { AppComponent } from './app.component';

describe('AppComponent', () => {
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
RouterTestingModule,
Expand All @@ -18,7 +18,7 @@ describe('AppComponent', () => {
}).compileComponents();
}));

it('should create the app', async(() => {
it('should create the app', waitForAsync(() => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.debugElement.componentInstance;
expect(app).toBeTruthy();
Expand Down
4 changes: 2 additions & 2 deletions src/app/auth/auth-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { marker } from '@biesbjerg/ngx-translate-extract-marker';

import { extract } from '@app/i18n';
import { LoginComponent } from './login.component';

const routes: Routes = [
{ path: 'login', component: LoginComponent, data: { title: extract('Login') } }
{ path: 'login', component: LoginComponent, data: { title: marker('Login') } }
];

@NgModule({
Expand Down
4 changes: 2 additions & 2 deletions src/app/auth/login.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { TranslateModule } from '@ngx-translate/core';
import { RouterTestingModule } from '@angular/router/testing';
import { ReactiveFormsModule } from '@angular/forms';
Expand All @@ -15,7 +15,7 @@ describe('LoginComponent', () => {
let component: LoginComponent;
let fixture: ComponentFixture<LoginComponent>;

beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
NgbModule,
Expand Down
4 changes: 2 additions & 2 deletions src/app/home/home-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { marker } from '@biesbjerg/ngx-translate-extract-marker';

import { extract } from '@app/i18n';
import { HomeComponent } from './home.component';
import { Shell } from '@app/shell/shell.service';

const routes: Routes = [
Shell.childRoutes([
{ path: '', redirectTo: '/home', pathMatch: 'full' },
{ path: 'home', component: HomeComponent, data: { title: extract('Home') } }
{ path: 'home', component: HomeComponent, data: { title: marker('Home') } }
])
];

Expand Down
4 changes: 2 additions & 2 deletions src/app/home/home.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { HttpClientTestingModule } from '@angular/common/http/testing';

import { CoreModule } from '@core';
Expand All @@ -10,7 +10,7 @@ describe('HomeComponent', () => {
let component: HomeComponent;
let fixture: ComponentFixture<HomeComponent>;

beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
CoreModule,
Expand Down
3 changes: 0 additions & 3 deletions src/app/home/home.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,14 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { TranslateModule } from '@ngx-translate/core';

import { CoreModule } from '@core';
import { SharedModule } from '@shared';
import { HomeRoutingModule } from './home-routing.module';
import { HomeComponent } from './home.component';
import { QuoteService } from './quote.service';

@NgModule({
imports: [
CommonModule,
TranslateModule,
CoreModule,
SharedModule,
HomeRoutingModule
],
Expand Down
2 changes: 1 addition & 1 deletion src/app/home/quote.service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Type } from '@angular/core';
import { TestBed, async } from '@angular/core/testing';
import { TestBed } from '@angular/core/testing';
import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';

import { CoreModule } from '@core';
Expand Down
Loading

0 comments on commit 7a062a5

Please sign in to comment.