Skip to content
This repository was archived by the owner on Jan 6, 2025. It is now read-only.

Commit 99dfbf5

Browse files
committed
chore: update to 15.0.0-beta.42 with changelog
1 parent dda0649 commit 99dfbf5

18 files changed

+2500
-2387
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# [15.0.0-beta.42](https://github.com/angular/flex-layout/compare/14.0.0-beta.41...15.0.0-beta.42) (2022-11-18)
2+
3+
This release unpins the dependency on Angular and CDK to allow flexibility with future releases.
4+
15
# [14.0.0-beta.41](https://github.com/angular/flex-layout/compare/14.0.0-beta.40...14.0.0-beta.41) (2022-10-11)
26

37
This release fixes incompatibilities with Node v18 typings.

package.json

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "flex-layout-srcs",
33
"description": "Angular Flex Layout",
4-
"version": "14.0.0-beta.41",
4+
"version": "15.0.0-beta.42",
55
"homepage": "https://github.com/angular/flex-layout",
66
"bugs": "https://github.com/angular/flex-layout/issues",
77
"repository": {
@@ -10,7 +10,7 @@
1010
},
1111
"license": "MIT",
1212
"engines": {
13-
"node": "^14.15.0 || >=16.10.0",
13+
"node": "^14.20.0 || ^16.13.0 || >=18.10.0",
1414
"yarn": ">=1.22.4 <2",
1515
"npm": "Please use yarn instead of NPM to install dependencies"
1616
},
@@ -29,56 +29,56 @@
2929
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s"
3030
},
3131
"private": true,
32-
"requiredAngularVersion": "^14.0.0",
32+
"requiredAngularVersion": ">=15.0.2",
3333
"dependencies": {
34-
"@angular/animations": "~14.0.0",
35-
"@angular/common": "~14.0.0",
36-
"@angular/compiler": "~14.0.0",
37-
"@angular/core": "~14.0.0",
38-
"@angular/forms": "~14.0.0",
39-
"@angular/material": "~14.0.0",
40-
"@angular/platform-browser": "~14.0.0",
41-
"@angular/platform-browser-dynamic": "~14.0.0",
42-
"@angular/platform-server": "~14.0.0",
43-
"@angular/router": "~14.0.0",
44-
"@nguniversal/builders": "~14.0.0",
45-
"@nguniversal/express-engine": "~14.0.0",
34+
"@angular/animations": "~15.0.2",
35+
"@angular/common": "~15.0.2",
36+
"@angular/compiler": "~15.0.2",
37+
"@angular/core": "~15.0.2",
38+
"@angular/forms": "~15.0.2",
39+
"@angular/material": "~15.0.0",
40+
"@angular/platform-browser": "~15.0.2",
41+
"@angular/platform-browser-dynamic": "~15.0.2",
42+
"@angular/platform-server": "~15.0.2",
43+
"@angular/router": "~15.0.2",
44+
"@nguniversal/builders": "~15.0.0",
45+
"@nguniversal/express-engine": "~15.0.0",
4646
"express": "^4.17.1",
4747
"rxjs": "~7.4.0",
4848
"tslib": "^2.3.0",
49-
"zone.js": "~0.11.4"
49+
"zone.js": "~0.12.0"
5050
},
5151
"devDependencies": {
52-
"@angular-devkit/build-angular": "~14.0.0",
53-
"@angular/cdk": "~14.0.0",
54-
"@angular/cli": "~14.0.0",
55-
"@angular/compiler-cli": "~14.0.0",
56-
"@ngtools/webpack": "~14.0.0",
57-
"@nguniversal/builders": "~14.0.0",
52+
"@angular-devkit/build-angular": "~15.0.1",
53+
"@angular/cdk": "~15.0.1",
54+
"@angular/cli": "~15.0.0",
55+
"@angular/compiler-cli": "~15.0.2",
56+
"@ngtools/webpack": "~15.0.1",
57+
"@nguniversal/builders": "~15.0.0",
5858
"@types/express": "^4.17.0",
5959
"@types/jasmine": "~3.10.0",
6060
"@types/minimatch": "^3.0.5",
6161
"@types/node": "^14.18.21",
6262
"conventional-changelog-cli": "^2.1.1",
6363
"jasmine-core": "~3.10.0",
64-
"karma": "~6.3.0",
64+
"karma": "~6.4.0",
6565
"karma-browserstack-launcher": "^1.6.0",
6666
"karma-chrome-launcher": "~3.1.0",
6767
"karma-coverage": "~2.0.3",
6868
"karma-firefox-launcher": "^2.1.2",
69-
"karma-jasmine": "~4.0.0",
69+
"karma-jasmine": "~5.0.0",
7070
"karma-jasmine-html-reporter": "~1.7.0",
7171
"karma-parallel": "^0.3.1",
7272
"karma-sauce-launcher": "^2.0.2",
7373
"minimatch": "^3.0.4",
74-
"ng-packagr": "~14.0.0",
74+
"ng-packagr": "~15.0.1",
7575
"postcss": "^8.3.3",
7676
"postcss-scss": "^4.0.2",
7777
"protractor": "^7.0.0",
7878
"stylelint": "^14.1.0",
7979
"ts-node": "^10.4.0",
8080
"tslint": "^6.1.3",
81-
"typescript": "~4.7.3",
81+
"typescript": "~4.8.2",
8282
"webpack": "^5.64.1",
8383
"webpack-cli": "^4.9.1"
8484
},

projects/apps/demo-app/.browserslistrc

-16
This file was deleted.

projects/apps/demo-app/src/test.ts

-12
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,8 @@ import {
77
platformBrowserDynamicTesting
88
} from '@angular/platform-browser-dynamic/testing';
99

10-
declare const require: {
11-
context(path: string, deep?: boolean, filter?: RegExp): {
12-
keys(): string[];
13-
<T>(id: string): T;
14-
};
15-
};
16-
1710
// First, initialize the Angular testing environment.
1811
getTestBed().initTestEnvironment(
1912
BrowserDynamicTestingModule,
2013
platformBrowserDynamicTesting(),
2114
);
22-
23-
// Then we find all the tests.
24-
const context = require.context('./', true, /\.spec\.ts$/);
25-
// And load the modules.
26-
context.keys().map(context);

projects/apps/universal-demo-app/.browserslistrc

-16
This file was deleted.

projects/apps/universal-demo-app/src/test.ts

-6
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,10 @@ import {
77
platformBrowserDynamicTesting
88
} from '@angular/platform-browser-dynamic/testing';
99

10-
declare const require: any;
11-
1210
// First, initialize the Angular testing environment.
1311
getTestBed().initTestEnvironment(
1412
BrowserDynamicTestingModule,
1513
platformBrowserDynamicTesting(), {
1614
teardown: { destroyAfterEach: false }
1715
}
1816
);
19-
// Then we find all the tests.
20-
const context = require.context('./', true, /\.spec\.ts$/);
21-
// And load the modules.
22-
context.keys().map(context);

projects/apps/universal-demo-app/tsconfig.server.json

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"extends": "./tsconfig.app.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/app-server",
5-
"target": "es2019",
65
"types": [
76
"node"
87
]

projects/libs/flex-layout/.browserslistrc

-16
This file was deleted.

projects/libs/flex-layout/extended/class/class.spec.ts

+7-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import {
1515
ɵMockMatchMedia as MockMatchMedia,
1616
ɵMockMatchMediaProvider as MockMatchMediaProvider,
1717
} from '@angular/flex-layout/core';
18+
import {DefaultClassDirective} from '@angular/flex-layout/extended';
1819

1920
import {customMatchers, expect} from '@angular/flex-layout/_private-utils/testing';
2021
import {makeCreateTestComponent, expectNativeEl, queryFor} from '@angular/flex-layout/_private-utils/testing';
21-
import {DefaultClassDirective} from './class';
2222

2323

2424
describe('class directive', () => {
@@ -262,7 +262,9 @@ describe('class directive', () => {
262262
let button = queryFor(fixture, '[mat-raised-button]')[0].nativeElement;
263263

264264
if (!isPlatformServer(platformId)) {
265-
expect(button).toHaveCssClass('mat-raised-button');
265+
expect(button).toHaveAttributes({
266+
'mat-raised-button': '',
267+
});
266268
}
267269
expect(button).toHaveCssClass('btn-xs');
268270
expect(button).toHaveCssClass('mat-primary');
@@ -272,7 +274,9 @@ describe('class directive', () => {
272274
button = queryFor(fixture, '[mat-raised-button]')[0].nativeElement;
273275

274276
if (!isPlatformServer(platformId)) {
275-
expect(button).toHaveCssClass('mat-raised-button');
277+
expect(button).toHaveAttributes({
278+
'mat-raised-button': '',
279+
});
276280
}
277281
expect(button).not.toHaveCssClass('btn-xs');
278282
expect(button).toHaveCssClass('mat-primary');

projects/libs/flex-layout/grid/auto/auto.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ describe('grid auto parent directive', () => {
174174

175175
expectNativeEl(fixture).toHaveStyle({
176176
'display': 'grid',
177-
'grid-auto-flow': (platform.FIREFOX || platform.BLINK) ? 'dense' : 'row dense',
177+
'grid-auto-flow': (platform.IOS || !platform.isBrowser) ? 'row dense' : 'dense',
178178
}, styler);
179179
});
180180

@@ -190,7 +190,7 @@ describe('grid auto parent directive', () => {
190190

191191
expectNativeEl(fixture).toHaveStyle({
192192
'display': 'grid',
193-
'grid-auto-flow': (platform.FIREFOX || platform.BLINK) ? 'dense' : 'row dense'
193+
'grid-auto-flow': (platform.IOS || !platform.isBrowser) ? 'row dense' : 'dense',
194194
}, styler);
195195
});
196196

projects/libs/flex-layout/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"tslib": "^2.3.0"
3030
},
3131
"peerDependencies": {
32-
"@angular/cdk": "^14.0.0",
32+
"@angular/cdk": ">=15.0.0",
3333
"@angular/core": "0.0.0-NG",
3434
"@angular/common": "0.0.0-NG",
3535
"@angular/platform-browser": "0.0.0-NG",

projects/libs/flex-layout/test.ts

-12
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,8 @@ import {
88
platformBrowserDynamicTesting
99
} from '@angular/platform-browser-dynamic/testing';
1010

11-
declare const require: {
12-
context(path: string, deep?: boolean, filter?: RegExp): {
13-
keys(): string[];
14-
<T>(id: string): T;
15-
};
16-
};
17-
1811
// First, initialize the Angular testing environment.
1912
getTestBed().initTestEnvironment(
2013
BrowserDynamicTestingModule,
2114
platformBrowserDynamicTesting(),
2215
);
23-
24-
// Then we find all the tests.
25-
const context = require.context('./', true, /\.spec\.ts$/);
26-
// And load the modules.
27-
context.keys().map(context);

projects/libs/flex-layout/tsconfig.spec.ssr.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"outDir": "../../../out-tsc/spec",
66
"types": [
77
"jasmine"
8-
]
8+
],
9+
"target": "ES2015"
910
},
1011
"files": [
1112
"test.ssr.ts"

test/browser-providers.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
const browserConfig = {
1111
'ChromeHeadlessCI': { unitTest: {target: 'local', }},
1212
'FirefoxHeadless': { unitTest: {target: 'local', }},
13-
'iOS14': {unitTest: {target: 'saucelabs'}},
14-
'Safari13': {unitTest: {target: 'browserstack'}}
13+
'iOS15': {unitTest: {target: 'saucelabs'}},
14+
'Safari15': {unitTest: {target: 'browserstack'}}
1515
};
1616

1717
/** Exports all available custom Karma browsers. */

test/karma-browsers.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@
1111
"base": "Firefox",
1212
"flags": ["-headless"]
1313
},
14-
"SAUCELABS_IOS14": {
14+
"SAUCELABS_IOS15": {
1515
"base": "SauceLabs",
16-
"appiumVersion": "1.20.1",
16+
"appiumVersion": "1.22.0",
1717
"deviceOrientation": "portrait",
1818
"browserName": "Safari",
19-
"platformVersion": "14.3",
19+
"platformVersion": "15.0",
2020
"platformName": "iOS",
21-
"deviceName": "iPhone 12 Pro Simulator"
21+
"deviceName": "iPhone 13 Pro Max Simulator"
2222
},
23-
"BROWSERSTACK_SAFARI13": {
23+
"BROWSERSTACK_SAFARI15": {
2424
"base": "BrowserStack",
2525
"browser": "Safari",
26-
"browser_version": "13.1",
26+
"browser_version": "15.0",
2727
"os": "OS X",
28-
"os_version": "Catalina"
28+
"os_version": "Monterey"
2929
}
3030
}

tools/tslint-rules/validateDecoratorsRule.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ class Walker extends RuleWalker {
4646
}
4747

4848
visitClassDeclaration(node: ts.ClassDeclaration) {
49-
if (this._enabled && node.decorators) {
50-
node.decorators
49+
if (this._enabled && ts.canHaveDecorators(node)) {
50+
ts.getDecorators(node)!
5151
.map(decorator => decorator.expression as any)
5252
.filter(expression => expression.arguments.length && expression.arguments[0].properties)
5353
.forEach(expression => this._validatedDecorator(expression));

tsconfig.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"@angular/flex-layout/*": [
1111
"dist/releases/flex-layout/angular-flex-layout-*",
1212
"dist/releases/flex-layout/*"
13-
],
13+
]
1414
},
1515
"baseUrl": "./",
1616
"outDir": "./dist/out-tsc",
@@ -26,12 +26,13 @@
2626
"experimentalDecorators": true,
2727
"moduleResolution": "node",
2828
"importHelpers": true,
29-
"target": "es2020",
29+
"target": "ES2022",
3030
"module": "es2020",
3131
"lib": [
3232
"es2020",
3333
"dom"
34-
]
34+
],
35+
"useDefineForClassFields": false
3536
},
3637
"angularCompilerOptions": {
3738
"enableI18nLegacyMessageIdFormat": false,

0 commit comments

Comments
 (0)