Skip to content

Commit 744dc11

Browse files
TomVanDenBroeckTomVanDenBroeck
committed
Merge branch 'master' into feature/examples_search-filter
# Conflicts: # package-lock.json # packages/forms/src/lib/mask/README.md # packages/forms/src/lib/range-slider/README.md # packages/forms/src/lib/timepicker/README.md # packages/forms/src/lib/wysiwyg/README.md
2 parents 6cc3e63 + 2e45026 commit 744dc11

File tree

373 files changed

+1670
-10109
lines changed

Some content is hidden

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

373 files changed

+1670
-10109
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ before_install:
1010
- google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
1111

1212
branches:
13-
only:
13+
only:
1414
- master
1515

1616
script:

‎CHANGELOG.md

+20-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/),
55
and this project adheres to [Semantic Versioning](https://semver.org/).
66

7-
## [Unreleased] - yyyy-mm-dd
7+
## Unreleased
8+
9+
10+
## [1.0.5] - 2018-11-13
11+
812
### Added
913
- `analytics` Added documentation.
1014
- `calendar` Added documentation.
@@ -26,14 +30,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
2630
- `utils/window` Added documentation.
2731

2832
### Changed
33+
- `core` Update angular-cli & ng-packagr
34+
- `core` Update package names & setup
35+
- `core` Update schematic
2936
- `context` The ContextModule is no longer dependent on the ContextStoreModule.
3037

3138
### Fixed
39+
- `core` Fixed AOT builds
40+
- `packages` Set package names to full import path -> fixes flatModuleId's used in metadata.json
41+
- `forms` Fix inputmask import
3242
- `upload` Updated the required styling to be in sync with the corresponding Core Branding classes.
3343
- `upload` Removed unnecessary module imports that caused build conflicts.
3444
- `layout/hero` Removed unnecessary module imports that caused build conflicts.
3545

46+
47+
## [1.0.4] - 2018-11-13 - BORKED
48+
49+
3650
## [1.0.3] - 2018-09-25
51+
3752
### Added
3853
- `avatar` Added documentation.
3954
- `code-snippet` Added documentation.
@@ -61,6 +76,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
6176

6277

6378
## [1.0.1] - 2018-07-02
79+
6480
### Changed
6581
- `core` Optimized build script.
6682

@@ -69,7 +85,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
6985
Initial release.
7086

7187

72-
[Unreleased]: https://github.com/digipolisantwerp/acpaas-ui_angular/compare/v1.0.3...HEAD
88+
[Unreleased]: https://github.com/digipolisantwerp/acpaas-ui_angular/compare/v1.0.5...HEAD
89+
[1.0.5]: https://github.com/digipolisantwerp/acpaas-ui_angular/compare/v1.0.4...v1.0.5
90+
[1.0.4]: https://github.com/digipolisantwerp/acpaas-ui_angular/compare/v1.0.3...v1.0.4
7391
[1.0.3]: https://github.com/digipolisantwerp/acpaas-ui_angular/compare/v1.0.2...v1.0.3
7492
[1.0.2]: https://github.com/digipolisantwerp/acpaas-ui_angular/compare/v1.0.1...v1.0.2
7593
[1.0.1]: https://github.com/digipolisantwerp/acpaas-ui_angular/compare/v1.0.0...v1.0.1

‎angular.json

+39-73
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@
8080
"tsConfig": "styleguide/tsconfig.spec.json",
8181
"karmaConfig": "styleguide/karma.conf.js",
8282
"styles": [
83-
"styleguide/styles.css"
83+
"styleguide/styles.scss",
84+
"node_modules/leaflet/dist/leaflet.css",
85+
"node_modules/leaflet-draw/dist/leaflet.draw.css"
8486
],
8587
"scripts": [],
8688
"assets": [
@@ -116,11 +118,9 @@
116118
"project": "packages/agenda/ng-package.json"
117119
},
118120
"configurations": {
119-
"production": {
120-
"project": "packages/agenda/ng-package.prod.json"
121-
},
122121
"examples": {
123-
"project": "packages/avatar/ng-package.examples.json"
122+
"project": "packages/agenda/ng-package.json",
123+
"tsConfig": "packages/agenda/tsconfig.json"
124124
}
125125
}
126126
},
@@ -159,11 +159,9 @@
159159
"project": "packages/analytics/ng-package.json"
160160
},
161161
"configurations": {
162-
"production": {
163-
"project": "packages/analytics/ng-package.prod.json"
164-
},
165162
"examples": {
166-
"project": "packages/analytics/ng-package.examples.json"
163+
"project": "packages/analytics/examples/ng-package.json",
164+
"tsConfig": "packages/analytics/examples/tsconfig.json"
167165
}
168166
}
169167
},
@@ -202,11 +200,9 @@
202200
"project": "packages/avatar/ng-package.json"
203201
},
204202
"configurations": {
205-
"production": {
206-
"project": "packages/avatar/ng-package.prod.json"
207-
},
208203
"examples": {
209-
"project": "packages/avatar/ng-package.examples.json"
204+
"project": "packages/avatar/examples/ng-package.json",
205+
"tsConfig": "packages/avatar/examples/tsconfig.json"
210206
}
211207
}
212208
},
@@ -245,11 +241,9 @@
245241
"project": "packages/calendar/ng-package.json"
246242
},
247243
"configurations": {
248-
"production": {
249-
"project": "packages/calendar/ng-package.prod.json"
250-
},
251244
"examples": {
252-
"project": "packages/calendar/ng-package.examples.json"
245+
"project": "packages/calendar/examples/ng-package.json",
246+
"tsConfig": "packages/calendar/examples/tsconfig.json"
253247
}
254248
}
255249
},
@@ -288,11 +282,9 @@
288282
"project": "packages/code-snippet/ng-package.json"
289283
},
290284
"configurations": {
291-
"production": {
292-
"project": "packages/code-snippet/ng-package.prod.json"
293-
},
294285
"examples": {
295-
"project": "packages/code-snippet/ng-package.examples.json"
286+
"project": "packages/code-snippet/examples/ng-package.json",
287+
"tsConfig": "packages/code-snippet/examples/tsconfig.json"
296288
}
297289
}
298290
},
@@ -331,11 +323,9 @@
331323
"project": "packages/context/ng-package.json"
332324
},
333325
"configurations": {
334-
"production": {
335-
"project": "packages/context/ng-package.prod.json"
336-
},
337326
"examples": {
338-
"project": "packages/context/ng-package.examples.json"
327+
"project": "packages/context/examples/ng-package.json",
328+
"tsConfig": "packages/context/examples/tsconfig.json"
339329
}
340330
}
341331
},
@@ -374,11 +364,9 @@
374364
"project": "packages/flyout/ng-package.json"
375365
},
376366
"configurations": {
377-
"production": {
378-
"project": "packages/flyout/ng-package.prod.json"
379-
},
380367
"examples": {
381-
"project": "packages/flyout/ng-package.examples.json"
368+
"project": "packages/flyout/examples/ng-package.json",
369+
"tsConfig": "packages/flyout/examples/tsconfig.json"
382370
}
383371
}
384372
},
@@ -417,11 +405,9 @@
417405
"project": "packages/forms/ng-package.json"
418406
},
419407
"configurations": {
420-
"production": {
421-
"project": "packages/forms/ng-package.prod.json"
422-
},
423408
"examples": {
424-
"project": "packages/forms/ng-package.examples.json"
409+
"project": "packages/forms/examples/ng-package.json",
410+
"tsConfig": "packages/forms/examples/tsconfig.json"
425411
}
426412
}
427413
},
@@ -460,11 +446,9 @@
460446
"project": "packages/layout/ng-package.json"
461447
},
462448
"configurations": {
463-
"production": {
464-
"project": "packages/layout/ng-package.prod.json"
465-
},
466449
"examples": {
467-
"project": "packages/layout/ng-package.examples.json"
450+
"project": "packages/layout/examples/ng-package.json",
451+
"tsConfig": "packages/layout/examples/tsconfig.json"
468452
}
469453
}
470454
},
@@ -503,11 +487,9 @@
503487
"project": "packages/map/ng-package.json"
504488
},
505489
"configurations": {
506-
"production": {
507-
"project": "packages/map/ng-package.prod.json"
508-
},
509490
"examples": {
510-
"project": "packages/map/ng-package.examples.json"
491+
"project": "packages/map/examples/ng-package.json",
492+
"tsConfig": "packages/map/examples/tsconfig.json"
511493
}
512494
}
513495
},
@@ -546,11 +528,9 @@
546528
"project": "packages/localstorage/ng-package.json"
547529
},
548530
"configurations": {
549-
"production": {
550-
"project": "packages/localstorage/ng-package.prod.json"
551-
},
552531
"examples": {
553-
"project": "packages/localstorage/ng-package.examples.json"
532+
"project": "packages/localstorage/examples/ng-package.json",
533+
"tsConfig": "packages/localstorage/examples/tsconfig.json"
554534
}
555535
}
556536
},
@@ -589,11 +569,9 @@
589569
"project": "packages/logo/ng-package.json"
590570
},
591571
"configurations": {
592-
"production": {
593-
"project": "packages/logo/ng-package.prod.json"
594-
},
595572
"examples": {
596-
"project": "packages/logo/ng-package.examples.json"
573+
"project": "packages/logo/examples/ng-package.json",
574+
"tsConfig": "packages/logo/examples/tsconfig.json"
597575
}
598576
}
599577
},
@@ -632,11 +610,9 @@
632610
"project": "packages/notifications/ng-package.json"
633611
},
634612
"configurations": {
635-
"production": {
636-
"project": "packages/notifications/ng-package.prod.json"
637-
},
638613
"examples": {
639-
"project": "packages/avatar/ng-package.examples.json"
614+
"project": "packages/avatar/examples/ng-package.json",
615+
"tsConfig": "packages/avatar/examples/tsconfig.json"
640616
}
641617
}
642618
},
@@ -675,11 +651,9 @@
675651
"project": "packages/pagination/ng-package.json"
676652
},
677653
"configurations": {
678-
"production": {
679-
"project": "packages/pagination/ng-package.prod.json"
680-
},
681654
"examples": {
682-
"project": "packages/pagination/ng-package.examples.json"
655+
"project": "packages/pagination/examples/ng-package.json",
656+
"tsConfig": "packages/pagination/examples/tsconfig.json"
683657
}
684658
}
685659
},
@@ -718,11 +692,9 @@
718692
"project": "packages/progress-bar/ng-package.json"
719693
},
720694
"configurations": {
721-
"production": {
722-
"project": "packages/progress-bar/ng-package.prod.json"
723-
},
724695
"examples": {
725-
"project": "packages/progress-bar/ng-package.examples.json"
696+
"project": "packages/progress-bar/examples/ng-package.json",
697+
"tsConfig": "packages/progress-bar/examples/tsconfig.json"
726698
}
727699
}
728700
},
@@ -761,11 +733,9 @@
761733
"project": "packages/utils/ng-package.json"
762734
},
763735
"configurations": {
764-
"production": {
765-
"project": "packages/utils/ng-package.prod.json"
766-
},
767736
"examples": {
768-
"project": "packages/utils/ng-package.examples.json"
737+
"project": "packages/utils/examples/ng-package.json",
738+
"tsConfig": "packages/utils/examples/tsconfig.json"
769739
}
770740
}
771741
},
@@ -804,11 +774,9 @@
804774
"project": "packages/selectable-list/ng-package.json"
805775
},
806776
"configurations": {
807-
"production": {
808-
"project": "packages/selectable-list/ng-package.prod.json"
809-
},
810777
"examples": {
811-
"project": "packages/selectable-list/ng-package.examples.json"
778+
"project": "packages/selectable-list/examples/ng-package.json",
779+
"tsConfig": "packages/selectable-list/examples/tsconfig.json"
812780
}
813781
}
814782
},
@@ -848,10 +816,8 @@
848816
},
849817
"configurations": {
850818
"examples": {
851-
"project": "packages/table/ng-package.examples.json"
852-
},
853-
"production": {
854-
"project": "packages/table/ng-package.prod.json"
819+
"project": "packages/table/examples/ng-package.json",
820+
"tsConfig": "packages/table/examples/tsconfig.json"
855821
}
856822
}
857823
},

0 commit comments

Comments
 (0)