Skip to content

Commit deb91f2

Browse files
authored
Merge pull request #64 from notiz-dev/feature/tabs
Feature/tabs
2 parents d73502b + bac5cd5 commit deb91f2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+2656
-2854
lines changed

angular.json

Lines changed: 18 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@
1515
"prefix": "app",
1616
"architect": {
1717
"build": {
18-
"builder": "@angular-devkit/build-angular:browser",
18+
"builder": "@angular-builders/custom-webpack:browser",
1919
"options": {
20+
"customWebpackConfig": {
21+
"path": "./webpack.config.dev.js"
22+
},
2023
"outputPath": "dist/notiz",
2124
"index": "src/index.html",
2225
"main": "src/main.ts",
@@ -33,43 +36,14 @@
3336
},
3437
"src/manifest.webmanifest"
3538
],
36-
"styles": [
37-
{
38-
"input": "node_modules/@ionic/angular/css/normalize.css"
39-
},
40-
{
41-
"input": "node_modules/@ionic/angular/css/structure.css"
42-
},
43-
{
44-
"input": "node_modules/@ionic/angular/css/typography.css"
45-
},
46-
{
47-
"input": "node_modules/@ionic/angular/css/core.css"
48-
},
49-
{
50-
"input": "node_modules/@ionic/angular/css/padding.css"
51-
},
52-
{
53-
"input": "node_modules/@ionic/angular/css/float-elements.css"
54-
},
55-
{
56-
"input": "node_modules/@ionic/angular/css/text-alignment.css"
57-
},
58-
{
59-
"input": "node_modules/@ionic/angular/css/text-transformation.css"
60-
},
61-
{
62-
"input": "node_modules/@ionic/angular/css/flex-utils.css"
63-
},
64-
{
65-
"input": "src/theme/variables.scss"
66-
},
67-
"src/styles.scss"
68-
],
39+
"styles": ["src/styles.scss", "src/theme/variables.scss"],
6940
"scripts": ["node_modules/marked/lib/marked.js"]
7041
},
7142
"configurations": {
7243
"production": {
44+
"customWebpackConfig": {
45+
"path": "./webpack.config.prod.js"
46+
},
7347
"fileReplacements": [
7448
{
7549
"replace": "src/environments/environment.ts",
@@ -102,12 +76,18 @@
10276
}
10377
},
10478
"serve": {
105-
"builder": "@angular-devkit/build-angular:dev-server",
79+
"builder": "@angular-builders/custom-webpack:dev-server",
10680
"options": {
81+
"customWebpackConfig": {
82+
"path": "./webpack.config.dev.js"
83+
},
10784
"browserTarget": "notiz:build"
10885
},
10986
"configurations": {
11087
"production": {
88+
"customWebpackConfig": {
89+
"path": "./webpack.config.prod.js"
90+
},
11191
"browserTarget": "notiz:build:production"
11292
}
11393
}
@@ -207,9 +187,7 @@
207187
"projects/image-template/src/favicon.ico",
208188
"projects/image-template/src/assets"
209189
],
210-
"styles": [
211-
"projects/image-template/src/styles.scss"
212-
],
190+
"styles": ["projects/image-template/src/styles.scss"],
213191
"scripts": []
214192
},
215193
"configurations": {
@@ -271,9 +249,7 @@
271249
"projects/image-template/src/favicon.ico",
272250
"projects/image-template/src/assets"
273251
],
274-
"styles": [
275-
"projects/image-template/src/styles.scss"
276-
],
252+
"styles": ["projects/image-template/src/styles.scss"],
277253
"scripts": []
278254
}
279255
},
@@ -285,9 +261,7 @@
285261
"projects/image-template/tsconfig.spec.json",
286262
"projects/image-template/e2e/tsconfig.json"
287263
],
288-
"exclude": [
289-
"**/node_modules/**"
290-
]
264+
"exclude": ["**/node_modules/**"]
291265
}
292266
},
293267
"e2e": {

0 commit comments

Comments
 (0)