Skip to content

Commit 2f6abd5

Browse files
ju4n97ju4n97
committed
Merge branch 'release/2.0.0'
2 parents 36ed6d3 + 29a5ed9 commit 2f6abd5

22 files changed

+1594
-2146
lines changed

‎.browserslistrc

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@
22
# For additional information regarding the format and rule options, please see:
33
# https://github.com/browserslist/browserslist#queries
44

5+
# For the full list of supported browsers by the Angular framework, please see:
6+
# https://angular.io/guide/browser-support
7+
58
# You can see what browsers were selected by your queries by running:
69
# npx browserslist
710

8-
> 0.5%
9-
last 2 versions
11+
last 1 Chrome version
12+
last 1 Firefox version
13+
last 2 Edge major versions
14+
last 2 Safari major versions
15+
last 2 iOS major versions
1016
Firefox ESR
11-
not dead
12-
not IE 9-11 # For IE 9-11 support, remove 'not'.
17+
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.

‎README.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -287,14 +287,15 @@ yarn remove tailwindcss autoprefixer postcss
287287

288288
## 🧙‍♂️ Commands
289289

290-
| Command | Description | NPM | Yarn | Background command |
291-
| ------------- | ------------------------------------------------- | --------------------- | ------------------ | ----------------------------------------------------------- |
292-
| ng | See available commands | npm run ng | yarn ng | ng |
293-
| start | Run your app in development mode | npm start | yarn start | ng serve |
294-
| build | Build your app | npm run build | yarn build | ng build |
295-
| build:prod | Build your app ready for production | npm run build:prod | yarn build:prod | ng build --prod --build-optimizer --aot --stats-json |
296-
| test:unit | Run your unit tests | npm run test | yarn test | ng test |
297-
| test:e2e | Run your e2e tests | npm run e2e | yarn e2e | ng e2e |
298-
| test:coverage | Run your unit tests & generates a coverage report | npm run test:coverage | yarn test:coverage | ng test --coverage |
299-
| lint | Use ESLint to lint your app | npm run lint | yarn lint | ng lint |
300-
| analyze | Open webpack-bundle-analyzer | npm run analyze | yarn analyze | webpack-bundle-analyzer dist/angular-boilerplate/stats.json |
290+
| Command | Description | NPM | Yarn | Background command |
291+
| ------------- | -------------------------------------------------------------- | --------------------- | ------------------ | ----------------------------------------------------------- |
292+
| ng | See available commands | npm run ng | yarn ng | ng |
293+
| start | Run your app in development mode | npm start | yarn start | ng serve |
294+
| build | Build your app for production | npm run build | yarn build | ng build |
295+
| build:stats | Build your app for production and generate a "stats.json" file | npm run build:stats | yarn build:stats | ng build --stats-json |
296+
| watch | Run build when files change. | npm run watch | yarn watch | ng build --watch --configuration development |
297+
| test:unit | Run your unit tests | npm run test | yarn test | ng test |
298+
| test:e2e | Run your e2e tests | npm run e2e | yarn e2e | ng e2e |
299+
| test:coverage | Run your unit tests & generates a coverage report | npm run test:coverage | yarn test:coverage | ng test --coverage |
300+
| lint | Use ESLint to lint your app | npm run lint | yarn lint | ng lint |
301+
| analyze | Open webpack-bundle-analyzer | npm run analyze | yarn analyze | webpack-bundle-analyzer dist/angular-boilerplate/stats.json |

‎angular.json

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -28,30 +28,13 @@
2828
"main": "src/main.ts",
2929
"polyfills": "src/polyfills.ts",
3030
"tsConfig": "tsconfig.app.json",
31-
"aot": true,
32-
"assets": [
33-
"src/favicon.ico",
34-
"src/assets",
35-
"src/manifest.webmanifest"
36-
],
31+
"inlineStyleLanguage": "scss",
32+
"assets": ["src/favicon.ico", "src/assets"],
3733
"styles": ["src/theme/styles.scss"],
3834
"scripts": []
3935
},
4036
"configurations": {
4137
"production": {
42-
"fileReplacements": [
43-
{
44-
"replace": "src/environments/environment.ts",
45-
"with": "src/environments/environment.prod.ts"
46-
}
47-
],
48-
"optimization": true,
49-
"outputHashing": "all",
50-
"sourceMap": false,
51-
"namedChunks": false,
52-
"extractLicenses": true,
53-
"vendorChunk": false,
54-
"buildOptimizer": true,
5538
"budgets": [
5639
{
5740
"type": "initial",
@@ -64,33 +47,44 @@
6447
"maximumError": "4kb"
6548
}
6649
],
67-
"serviceWorker": true,
68-
"ngswConfigPath": "ngsw-config.json"
50+
"fileReplacements": [
51+
{
52+
"replace": "src/environments/environment.ts",
53+
"with": "src/environments/environment.prod.ts"
54+
}
55+
],
56+
"outputHashing": "all"
57+
},
58+
"development": {
59+
"buildOptimizer": false,
60+
"optimization": false,
61+
"vendorChunk": true,
62+
"extractLicenses": false,
63+
"sourceMap": true,
64+
"namedChunks": true
6965
}
70-
}
66+
},
67+
"defaultConfiguration": "production"
7168
},
7269
"serve": {
7370
"builder": "@angular-devkit/build-angular:dev-server",
74-
"options": {
75-
"browserTarget": "angular-boilerplate:build"
76-
},
7771
"configurations": {
7872
"production": {
79-
"browserTarget": "angular-boilerplate:build:production"
73+
"browserTarget": "test:build:production"
74+
},
75+
"development": {
76+
"browserTarget": "angular-boilerplate:build:development"
8077
}
81-
}
78+
},
79+
"defaultConfiguration": "development"
8280
},
8381
"test": {
8482
"builder": "@angular-builders/jest:run",
8583
"options": {
8684
"polyfills": "src/polyfills.ts",
8785
"tsConfig": "tsconfig.spec.json",
88-
"assets": [
89-
"src/favicon.ico",
90-
"src/assets",
91-
"src/manifest.webmanifest"
92-
],
93-
"styles": ["src/theme/styles.scss"],
86+
"assets": ["src/favicon.ico", "src/assets"],
87+
"styles": [],
9488
"scripts": []
9589
}
9690
},

‎ngsw-config.json

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎package.json

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,52 @@
11
{
22
"name": "angular-boilerplate",
33
"version": "0.0.0",
4-
"sideEffects": false,
54
"private": true,
65
"scripts": {
76
"ng": "ng",
87
"start": "ng serve",
98
"build": "ng build",
10-
"build:prod": "cross-env NODE_ENV=production ng build --prod --build-optimizer --aot --stats-json",
9+
"build:stats": "ng build --stats-json",
10+
"watch": "ng build --watch --configuration development",
1111
"test:unit": "ng test",
1212
"test:e2e": "ng e2e",
1313
"test:coverage": "ng test --coverage",
1414
"lint": "ng lint",
1515
"analyze": "webpack-bundle-analyzer dist/angular-boilerplate/stats.json"
1616
},
1717
"dependencies": {
18-
"@angular/animations": "11.2.13",
19-
"@angular/common": "11.2.13",
20-
"@angular/compiler": "11.2.13",
21-
"@angular/core": "11.2.13",
22-
"@angular/forms": "11.2.13",
23-
"@angular/platform-browser": "11.2.13",
24-
"@angular/platform-browser-dynamic": "11.2.13",
25-
"@angular/router": "11.2.13",
26-
"@angular/service-worker": "11.2.13",
27-
"rxjs": "6.6.7",
18+
"@angular/animations": "~12.0.1",
19+
"@angular/common": "~12.0.1",
20+
"@angular/compiler": "~12.0.1",
21+
"@angular/core": "~12.0.1",
22+
"@angular/forms": "~12.0.1",
23+
"@angular/platform-browser": "~12.0.1",
24+
"@angular/platform-browser-dynamic": "~12.0.1",
25+
"@angular/router": "~12.0.1",
26+
"rxjs": "^7.1.0",
2827
"tslib": "2.2.0",
29-
"zone.js": "0.11.4"
28+
"zone.js": "~0.11.4"
3029
},
3130
"devDependencies": {
3231
"@angular-builders/jest": "12.0.0",
33-
"@angular-devkit/build-angular": "0.1102.13",
32+
"@angular-devkit/build-angular": "~12.0.1",
3433
"@angular-eslint/builder": "12.0.0",
3534
"@angular-eslint/eslint-plugin": "12.0.0",
3635
"@angular-eslint/eslint-plugin-template": "12.0.0",
3736
"@angular-eslint/schematics": "12.0.0",
3837
"@angular-eslint/template-parser": "12.0.0",
39-
"@angular/cli": "11.2.13",
40-
"@angular/compiler-cli": "11.2.13",
38+
"@angular/cli": "~12.0.1",
39+
"@angular/compiler-cli": "~12.0.1",
4140
"@briebug/cypress-schematic": "5.0.0",
4241
"@commitlint/cli": "12.1.4",
4342
"@commitlint/config-conventional": "12.1.4",
4443
"@cypress/webpack-preprocessor": "5.8.0",
4544
"@types/jasmine": "3.7.4",
4645
"@types/jest": "26.0.23",
47-
"@types/node": "15.3.1",
46+
"@types/node": "^15.6.0",
4847
"@typescript-eslint/eslint-plugin": "4.24.0",
4948
"@typescript-eslint/parser": "4.24.0",
5049
"autoprefixer": "10.2.5",
51-
"cross-env": "7.0.3",
5250
"cypress": "7.3.0",
5351
"eslint": "7.27.0",
5452
"eslint-config-prettier": "8.3.0",
@@ -67,7 +65,7 @@
6765
"tailwindcss": "2.1.2",
6866
"ts-loader": "9.2.2",
6967
"ts-node": "10.0.0",
70-
"typescript": "4.1.5",
68+
"typescript": "4.2.4",
7169
"webpack-bundle-analyzer": "4.4.2"
7270
}
7371
}

‎src/app/@core/core.module.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
import { CommonModule } from '@angular/common';
22
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
33
import { NgModule } from '@angular/core';
4-
import { ServiceWorkerModule } from '@angular/service-worker';
5-
import { environment } from '@environments/environment';
64
import { JwtInterceptor, ServerErrorInterceptor } from './interceptors';
75

86
@NgModule({
97
declarations: [],
10-
imports: [
11-
CommonModule,
12-
HttpClientModule,
13-
ServiceWorkerModule.register('ngsw-worker.js', {
14-
enabled: environment.production,
15-
}),
16-
],
8+
imports: [CommonModule, HttpClientModule],
179
providers: [
1810
{
1911
provide: HTTP_INTERCEPTORS,

‎src/assets/icons/icon-128x128.png

-1.22 KB
Binary file not shown.

‎src/assets/icons/icon-144x144.png

-1.36 KB
Binary file not shown.

‎src/assets/icons/icon-152x152.png

-1.39 KB
Binary file not shown.

‎src/assets/icons/icon-192x192.png

-1.75 KB
Binary file not shown.

0 commit comments

Comments
 (0)