Skip to content

Commit 901cff1

Browse files
authored
Update to Angular 13 (angular-split#313)
* chore: update Angular to latest v11 * chore: update Angular to latest v12 * chore: update Angular to latest v13 * chore: update husky * test: adjust e2e pixel dimensions to work with Bootstrap 5 * chore: release 13.0.0
1 parent 1610bfe commit 901cff1

22 files changed

Lines changed: 3878 additions & 5249 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
!.vscode/extensions.json
2828

2929
# misc
30+
/.angular/cache
3031
/.sass-cache
3132
/connect.lock
3233
/coverage

.husky/pre-commit

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
lint-staged

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22

33
/dist
44
/coverage
5+
.angular/cache

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
<a name="13.0.0"></a>
2+
3+
# 13.0.0 (2021-11-20)
4+
5+
- **Chore** add support for Angular 13
6+
17
<a name="5.0.0"></a>
28

39
# 5.0.0 (2020-12-18)

angular.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,14 @@
2424
"tsConfig": "src/tsconfig.app.json",
2525
"assets": ["src/favicon.ico", "src/assets"],
2626
"styles": ["./node_modules/bootstrap/dist/css/bootstrap.min.css", "src/styles.scss"],
27-
"scripts": []
27+
"scripts": [],
28+
"aot": false,
29+
"vendorChunk": true,
30+
"extractLicenses": false,
31+
"buildOptimizer": false,
32+
"sourceMap": true,
33+
"optimization": false,
34+
"namedChunks": true
2835
},
2936
"configurations": {
3037
"production": {
@@ -50,7 +57,8 @@
5057
}
5158
]
5259
}
53-
}
60+
},
61+
"defaultConfiguration": ""
5462
},
5563
"serve": {
5664
"builder": "@angular-devkit/build-angular:dev-server",

cypress/integration/1.simple.spec.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { moveGutter, checkSplitDirAndSizes } from '../support/splitUtils'
44

55
context('Simple split example page tests', () => {
6-
const W = 1070
6+
const W = 1076
77
const H = 300
88
const GUTTER = 11
99

@@ -12,8 +12,8 @@ context('Simple split example page tests', () => {
1212
})
1313

1414
it('Display initial state', () => {
15-
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [317.6875, 741.296875])
16-
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [120, 768, 160])
15+
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [319.5, 745.5])
16+
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [120, 774, 160])
1717
})
1818

1919
it('Change direction', () => {
@@ -25,10 +25,10 @@ context('Simple split example page tests', () => {
2525

2626
it('Move gutter horizontally', () => {
2727
moveGutter('.ex-percent .as-split-gutter', 0, 280, 0)
28-
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [597.703125, 461.28125])
28+
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [599.5, 465.5])
2929

3030
moveGutter('.ex-pixel .as-split-gutter', 0, 280, 0)
31-
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [400, 488, 160])
31+
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [400, 494, 160])
3232
})
3333

3434
it('Change direction & move gutter vertically', () => {
@@ -43,24 +43,24 @@ context('Simple split example page tests', () => {
4343

4444
it('Move gutter horizontally and move it back', () => {
4545
moveGutter('.ex-percent .as-split-gutter', 0, 280, 0)
46-
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [597.703125, 461.28125])
46+
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [599.5, 465.5])
4747

4848
moveGutter('.ex-percent .as-split-gutter', 0, -280, 0)
49-
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [317.71875, 741.265625])
49+
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [319.5, 745.5])
5050

5151
moveGutter('.ex-pixel .as-split-gutter', 0, 280, 0)
52-
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [400, 488, 160])
52+
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [400, 494, 160])
5353

5454
moveGutter('.ex-pixel .as-split-gutter', 0, -280, 0)
55-
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [120, 768, 160])
55+
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [120, 774, 160])
5656
})
5757

5858
it('Move gutter horizontally to max, change direction', () => {
5959
moveGutter('.ex-percent .as-split-gutter', 0, -1000, 0)
60-
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [0, 1059])
60+
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [0, 1065])
6161

6262
moveGutter('.ex-pixel .as-split-gutter', 0, -1000, 0)
63-
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [0, 888, 160])
63+
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [0, 894, 160])
6464

6565
cy.get('.btns > .btn').click()
6666

@@ -72,7 +72,7 @@ context('Simple split example page tests', () => {
7272

7373
cy.get('.btns > .btn').click()
7474

75-
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [1059, 0])
76-
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [278, 770, 0])
75+
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [1065, 0])
76+
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [278, 776, 0])
7777
})
7878
})

cypress/integration/2.minmax.spec.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ context('Min & max splits example page tests', () => {
1212
})
1313

1414
it('Display initial state', () => {
15-
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [303, 404, 303])
15+
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [304.796875, 406.390625, 304.796875])
1616

1717
checkAreasClasses('.ex-percent > as-split > .as-split-area', [
1818
{ haveTo: ['as-max'], notHaveTo: ['as-min'] },
1919
{ haveTo: [], notHaveTo: ['as-min', 'as-max'] },
2020
{ haveTo: [], notHaveTo: ['as-min', 'as-max'] },
2121
])
2222

23-
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [200, 380, 150, 250])
23+
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [200, 386, 150, 250])
2424

2525
checkAreasClasses('.ex-pixel > as-split > .as-split-area', [
2626
{ haveTo: ['as-max'], notHaveTo: ['as-min'] },
@@ -32,7 +32,7 @@ context('Min & max splits example page tests', () => {
3232

3333
it('Move gutters having restrictMove off [PERCENT MODE]', () => {
3434
moveGutter('.ex-percent > as-split > .as-split-gutter', 0, 200, 0)
35-
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [303, 404, 303])
35+
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [304.796875, 406.390625, 304.796875])
3636

3737
checkAreasClasses('.ex-percent > as-split > .as-split-area', [
3838
{ haveTo: ['as-max'], notHaveTo: ['as-min'] },
@@ -41,7 +41,7 @@ context('Min & max splits example page tests', () => {
4141
])
4242

4343
moveGutter('.ex-percent > as-split > .as-split-gutter', 0, -100, 0)
44-
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [203, 504, 303])
44+
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [204.796875, 506.390625, 304.796875])
4545

4646
checkAreasClasses('.ex-percent > as-split > .as-split-area', [
4747
{ haveTo: [], notHaveTo: ['as-min', 'as-max'] },
@@ -50,7 +50,7 @@ context('Min & max splits example page tests', () => {
5050
])
5151

5252
moveGutter('.ex-percent > as-split > .as-split-gutter', 0, -100, 0)
53-
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [202, 505, 303])
53+
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [203.1875, 508, 304.796875])
5454

5555
checkAreasClasses('.ex-percent > as-split > .as-split-area', [
5656
{ haveTo: ['as-min'], notHaveTo: ['as-max'] },
@@ -59,7 +59,7 @@ context('Min & max splits example page tests', () => {
5959
])
6060

6161
moveGutter('.ex-percent > as-split > .as-split-gutter', 1, 100, 0)
62-
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [302, 505, 203])
62+
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [303.203125, 508, 204.796875])
6363

6464
checkAreasClasses('.ex-percent > as-split > .as-split-area', [
6565
{ haveTo: [], notHaveTo: ['as-min', 'as-max'] },
@@ -68,7 +68,7 @@ context('Min & max splits example page tests', () => {
6868
])
6969

7070
moveGutter('.ex-percent > as-split > .as-split-gutter', 1, -100, 0)
71-
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [302, 405, 303])
71+
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [303.203125, 408, 304.796875])
7272

7373
checkAreasClasses('.ex-percent > as-split > .as-split-area', [
7474
{ haveTo: [], notHaveTo: ['as-min', 'as-max'] },
@@ -77,7 +77,7 @@ context('Min & max splits example page tests', () => {
7777
])
7878

7979
moveGutter('.ex-percent > as-split > .as-split-gutter', 1, -100, 0)
80-
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [302, 305, 403])
80+
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [303.203125, 308, 404.796875])
8181

8282
checkAreasClasses('.ex-percent > as-split > .as-split-area', [
8383
{ haveTo: [], notHaveTo: ['as-min', 'as-max'] },
@@ -86,7 +86,7 @@ context('Min & max splits example page tests', () => {
8686
])
8787

8888
moveGutter('.ex-percent > as-split > .as-split-gutter', 1, -100, 0)
89-
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [204, 303, 502.984375])
89+
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [206.390625, 304.796875, 504.796875])
9090

9191
checkAreasClasses('.ex-percent > as-split > .as-split-area', [
9292
{ haveTo: [], notHaveTo: ['as-min', 'as-max'] },
@@ -95,7 +95,7 @@ context('Min & max splits example page tests', () => {
9595
])
9696

9797
moveGutter('.ex-percent > as-split > .as-split-gutter', 1, -100, 0)
98-
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [202, 303, 505])
98+
checkSplitDirAndSizes('.ex-percent > as-split', 'horizontal', W, H, GUTTER, [203.1875, 304.796875, 508])
9999

100100
checkAreasClasses('.ex-percent > as-split > .as-split-area', [
101101
{ haveTo: ['as-min'], notHaveTo: ['as-max'] },
@@ -106,7 +106,7 @@ context('Min & max splits example page tests', () => {
106106

107107
it('Move gutters having restrictMove off [PIXEL MODE]', () => {
108108
moveGutter('.ex-pixel > as-split > .as-split-gutter', 0, 200, 0)
109-
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [200, 380, 150, 250])
109+
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [200, 386, 150, 250])
110110

111111
checkAreasClasses('.ex-pixel > as-split > .as-split-area', [
112112
{ haveTo: ['as-max'], notHaveTo: ['as-min'] },
@@ -116,7 +116,7 @@ context('Min & max splits example page tests', () => {
116116
])
117117

118118
moveGutter('.ex-pixel > as-split > .as-split-gutter', 0, -100, 0)
119-
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [100, 480, 150, 250])
119+
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [100, 486, 150, 250])
120120

121121
checkAreasClasses('.ex-pixel > as-split > .as-split-area', [
122122
{ haveTo: ['as-min'], notHaveTo: ['as-max'] },
@@ -126,7 +126,7 @@ context('Min & max splits example page tests', () => {
126126
])
127127

128128
moveGutter('.ex-pixel > as-split > .as-split-gutter', 1, 100, 0)
129-
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [100, 480, 150, 250])
129+
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [100, 486, 150, 250])
130130

131131
checkAreasClasses('.ex-pixel > as-split > .as-split-area', [
132132
{ haveTo: ['as-min'], notHaveTo: ['as-max'] },
@@ -136,7 +136,7 @@ context('Min & max splits example page tests', () => {
136136
])
137137

138138
moveGutter('.ex-pixel > as-split > .as-split-gutter', 1, -100, 0)
139-
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [100, 380, 150, 350])
139+
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [100, 386, 150, 350])
140140

141141
checkAreasClasses('.ex-pixel > as-split > .as-split-area', [
142142
{ haveTo: ['as-min'], notHaveTo: ['as-max'] },
@@ -146,7 +146,7 @@ context('Min & max splits example page tests', () => {
146146
])
147147

148148
moveGutter('.ex-pixel > as-split > .as-split-gutter', 2, -100, 0)
149-
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [100, 330, 150, 400])
149+
checkSplitDirAndSizes('.ex-pixel > as-split', 'horizontal', W, H, GUTTER, [100, 336, 150, 400])
150150

151151
checkAreasClasses('.ex-pixel > as-split > .as-split-area', [
152152
{ haveTo: ['as-min'], notHaveTo: ['as-max'] },

cypress/integration/3.nested.spec.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@ context('Nested splits example page tests', () => {
1212
})
1313

1414
it('Display initial state', () => {
15-
checkSplitDirAndSizes('.split-example > as-split', 'horizontal', W, H, GUTTER, [423.59375, 635.390625])
15+
checkSplitDirAndSizes('.split-example > as-split', 'horizontal', W, H, GUTTER, [426, 639])
1616

1717
checkSplitDirAndSizes(
1818
'.split-example > as-split > .as-split-area:nth-child(1) > as-split',
1919
'vertical',
20-
423.59375,
20+
426,
2121
H,
2222
GUTTER,
2323
[125.984375, 125.984375, 125.984375],
2424
)
2525
checkSplitDirAndSizes(
2626
'.split-example > as-split > .as-split-area:nth-child(2) > as-split',
2727
'vertical',
28-
635.390625,
28+
639,
2929
H,
3030
GUTTER,
3131
[97.25, 291.75],
@@ -35,23 +35,23 @@ context('Nested splits example page tests', () => {
3535
it('Move gutter horizontally 3 times and until maximum', () => {
3636
moveGutter('.split-example > as-split > .as-split-gutter', 0, 280, 0)
3737

38-
checkSplitDirAndSizes('.split-example > as-split', 'horizontal', W, H, GUTTER, [703.609375, 355.390625])
38+
checkSplitDirAndSizes('.split-example > as-split', 'horizontal', W, H, GUTTER, [706, 358.984375])
3939

4040
moveGutter('.split-example > as-split > .as-split-gutter', 0, -80, 0)
4141

42-
checkSplitDirAndSizes('.split-example > as-split', 'horizontal', W, H, GUTTER, [623.609375, 435.390625])
42+
checkSplitDirAndSizes('.split-example > as-split', 'horizontal', W, H, GUTTER, [626.015625, 438.984375])
4343

4444
moveGutter('.split-example > as-split > .as-split-gutter', 0, 700, 0)
4545

46-
checkSplitDirAndSizes('.split-example > as-split', 'horizontal', W, H, GUTTER, [1059, 0])
46+
checkSplitDirAndSizes('.split-example > as-split', 'horizontal', W, H, GUTTER, [1065, 0])
4747
})
4848

4949
it('Move nested split 1 multiple times', () => {
5050
moveGutter('.split-example > as-split > .as-split-area:nth-child(1) > as-split > .as-split-gutter', 0, 0, 60)
5151
checkSplitDirAndSizes(
5252
'.split-example > as-split > .as-split-area:nth-child(1) > as-split',
5353
'vertical',
54-
423.59375,
54+
426,
5555
H,
5656
GUTTER,
5757
[186.015625, 65.984375, 125.984375],
@@ -61,7 +61,7 @@ context('Nested splits example page tests', () => {
6161
checkSplitDirAndSizes(
6262
'.split-example > as-split > .as-split-area:nth-child(1) > as-split',
6363
'vertical',
64-
423.59375,
64+
426,
6565
H,
6666
GUTTER,
6767
[186.015625, 0, 191.984375],
@@ -72,7 +72,7 @@ context('Nested splits example page tests', () => {
7272
checkSplitDirAndSizes(
7373
'.split-example > as-split > .as-split-area:nth-child(1) > as-split',
7474
'vertical',
75-
423.59375,
75+
426,
7676
H,
7777
GUTTER,
7878
[176.015625, 10, 191.984375],
@@ -83,7 +83,7 @@ context('Nested splits example page tests', () => {
8383
checkSplitDirAndSizes(
8484
'.split-example > as-split > .as-split-area:nth-child(1) > as-split',
8585
'vertical',
86-
423.59375,
86+
426,
8787
H,
8888
GUTTER,
8989
[165.015625, 21, 191.984375],
@@ -94,7 +94,7 @@ context('Nested splits example page tests', () => {
9494
checkSplitDirAndSizes(
9595
'.split-example > as-split > .as-split-area:nth-child(1) > as-split',
9696
'vertical',
97-
423.59375,
97+
426,
9898
H,
9999
GUTTER,
100100
[145.015625, 41, 191.984375],
@@ -106,7 +106,7 @@ context('Nested splits example page tests', () => {
106106
checkSplitDirAndSizes(
107107
'.split-example > as-split > .as-split-area:nth-child(2) > as-split',
108108
'vertical',
109-
635.390625,
109+
639,
110110
H,
111111
GUTTER,
112112
[389, 0],
@@ -116,7 +116,7 @@ context('Nested splits example page tests', () => {
116116
checkSplitDirAndSizes(
117117
'.split-example > as-split > .as-split-area:nth-child(2) > as-split',
118118
'vertical',
119-
635.390625,
119+
639,
120120
H,
121121
GUTTER,
122122
[0, 389],

0 commit comments

Comments
 (0)