Skip to content

Commit

Permalink
chore: update to 15.0.0-beta.42 with changelog (#1431)
Browse files Browse the repository at this point in the history
  • Loading branch information
CaerusKaru authored Jan 24, 2023
1 parent dda0649 commit 6e4d346
Show file tree
Hide file tree
Showing 18 changed files with 2,500 additions and 2,387 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# [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)

This release unpins the dependency on Angular and CDK to allow flexibility with future releases.

# [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)

This release fixes incompatibilities with Node v18 typings.
Expand Down
52 changes: 26 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "flex-layout-srcs",
"description": "Angular Flex Layout",
"version": "14.0.0-beta.41",
"version": "15.0.0-beta.42",
"homepage": "https://github.com/angular/flex-layout",
"bugs": "https://github.com/angular/flex-layout/issues",
"repository": {
Expand All @@ -10,7 +10,7 @@
},
"license": "MIT",
"engines": {
"node": "^14.15.0 || >=16.10.0",
"node": "^14.20.0 || ^16.13.0 || >=18.10.0",
"yarn": ">=1.22.4 <2",
"npm": "Please use yarn instead of NPM to install dependencies"
},
Expand All @@ -29,56 +29,56 @@
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s"
},
"private": true,
"requiredAngularVersion": "^14.0.0",
"requiredAngularVersion": ">=15.0.2",
"dependencies": {
"@angular/animations": "~14.0.0",
"@angular/common": "~14.0.0",
"@angular/compiler": "~14.0.0",
"@angular/core": "~14.0.0",
"@angular/forms": "~14.0.0",
"@angular/material": "~14.0.0",
"@angular/platform-browser": "~14.0.0",
"@angular/platform-browser-dynamic": "~14.0.0",
"@angular/platform-server": "~14.0.0",
"@angular/router": "~14.0.0",
"@nguniversal/builders": "~14.0.0",
"@nguniversal/express-engine": "~14.0.0",
"@angular/animations": "~15.0.2",
"@angular/common": "~15.0.2",
"@angular/compiler": "~15.0.2",
"@angular/core": "~15.0.2",
"@angular/forms": "~15.0.2",
"@angular/material": "~15.0.0",
"@angular/platform-browser": "~15.0.2",
"@angular/platform-browser-dynamic": "~15.0.2",
"@angular/platform-server": "~15.0.2",
"@angular/router": "~15.0.2",
"@nguniversal/builders": "~15.0.0",
"@nguniversal/express-engine": "~15.0.0",
"express": "^4.17.1",
"rxjs": "~7.4.0",
"tslib": "^2.3.0",
"zone.js": "~0.11.4"
"zone.js": "~0.12.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "~14.0.0",
"@angular/cdk": "~14.0.0",
"@angular/cli": "~14.0.0",
"@angular/compiler-cli": "~14.0.0",
"@ngtools/webpack": "~14.0.0",
"@nguniversal/builders": "~14.0.0",
"@angular-devkit/build-angular": "~15.0.1",
"@angular/cdk": "~15.0.1",
"@angular/cli": "~15.0.0",
"@angular/compiler-cli": "~15.0.2",
"@ngtools/webpack": "~15.0.1",
"@nguniversal/builders": "~15.0.0",
"@types/express": "^4.17.0",
"@types/jasmine": "~3.10.0",
"@types/minimatch": "^3.0.5",
"@types/node": "^14.18.21",
"conventional-changelog-cli": "^2.1.1",
"jasmine-core": "~3.10.0",
"karma": "~6.3.0",
"karma": "~6.4.0",
"karma-browserstack-launcher": "^1.6.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage": "~2.0.3",
"karma-firefox-launcher": "^2.1.2",
"karma-jasmine": "~4.0.0",
"karma-jasmine": "~5.0.0",
"karma-jasmine-html-reporter": "~1.7.0",
"karma-parallel": "^0.3.1",
"karma-sauce-launcher": "^2.0.2",
"minimatch": "^3.0.4",
"ng-packagr": "~14.0.0",
"ng-packagr": "~15.0.1",
"postcss": "^8.3.3",
"postcss-scss": "^4.0.2",
"protractor": "^7.0.0",
"stylelint": "^14.1.0",
"ts-node": "^10.4.0",
"tslint": "^6.1.3",
"typescript": "~4.7.3",
"typescript": "~4.8.2",
"webpack": "^5.64.1",
"webpack-cli": "^4.9.1"
},
Expand Down
16 changes: 0 additions & 16 deletions projects/apps/demo-app/.browserslistrc

This file was deleted.

12 changes: 0 additions & 12 deletions projects/apps/demo-app/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,8 @@ import {
platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing';

declare const require: {
context(path: string, deep?: boolean, filter?: RegExp): {
keys(): string[];
<T>(id: string): T;
};
};

// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(),
);

// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);
16 changes: 0 additions & 16 deletions projects/apps/universal-demo-app/.browserslistrc

This file was deleted.

6 changes: 0 additions & 6 deletions projects/apps/universal-demo-app/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,10 @@ import {
platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing';

declare const require: any;

// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false }
}
);
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);
1 change: 0 additions & 1 deletion projects/apps/universal-demo-app/tsconfig.server.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"extends": "./tsconfig.app.json",
"compilerOptions": {
"outDir": "../out-tsc/app-server",
"target": "es2019",
"types": [
"node"
]
Expand Down
16 changes: 0 additions & 16 deletions projects/libs/flex-layout/.browserslistrc

This file was deleted.

10 changes: 7 additions & 3 deletions projects/libs/flex-layout/extended/class/class.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import {
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
} from '@angular/flex-layout/core';
import {DefaultClassDirective} from '@angular/flex-layout/extended';

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


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

if (!isPlatformServer(platformId)) {
expect(button).toHaveCssClass('mat-raised-button');
expect(button).toHaveAttributes({
'mat-raised-button': '',
});
}
expect(button).toHaveCssClass('btn-xs');
expect(button).toHaveCssClass('mat-primary');
Expand All @@ -272,7 +274,9 @@ describe('class directive', () => {
button = queryFor(fixture, '[mat-raised-button]')[0].nativeElement;

if (!isPlatformServer(platformId)) {
expect(button).toHaveCssClass('mat-raised-button');
expect(button).toHaveAttributes({
'mat-raised-button': '',
});
}
expect(button).not.toHaveCssClass('btn-xs');
expect(button).toHaveCssClass('mat-primary');
Expand Down
4 changes: 2 additions & 2 deletions projects/libs/flex-layout/grid/auto/auto.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ describe('grid auto parent directive', () => {

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

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

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

Expand Down
2 changes: 1 addition & 1 deletion projects/libs/flex-layout/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"tslib": "^2.3.0"
},
"peerDependencies": {
"@angular/cdk": "^14.0.0",
"@angular/cdk": ">=15.0.0",
"@angular/core": "0.0.0-NG",
"@angular/common": "0.0.0-NG",
"@angular/platform-browser": "0.0.0-NG",
Expand Down
12 changes: 0 additions & 12 deletions projects/libs/flex-layout/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,8 @@ import {
platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing';

declare const require: {
context(path: string, deep?: boolean, filter?: RegExp): {
keys(): string[];
<T>(id: string): T;
};
};

// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(),
);

// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);
3 changes: 2 additions & 1 deletion projects/libs/flex-layout/tsconfig.spec.ssr.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"outDir": "../../../out-tsc/spec",
"types": [
"jasmine"
]
],
"target": "ES2015"
},
"files": [
"test.ssr.ts"
Expand Down
4 changes: 2 additions & 2 deletions test/browser-providers.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
const browserConfig = {
'ChromeHeadlessCI': { unitTest: {target: 'local', }},
'FirefoxHeadless': { unitTest: {target: 'local', }},
'iOS14': {unitTest: {target: 'saucelabs'}},
'Safari13': {unitTest: {target: 'browserstack'}}
'iOS15': {unitTest: {target: 'saucelabs'}},
'Safari15': {unitTest: {target: 'browserstack'}}
};

/** Exports all available custom Karma browsers. */
Expand Down
14 changes: 7 additions & 7 deletions test/karma-browsers.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@
"base": "Firefox",
"flags": ["-headless"]
},
"SAUCELABS_IOS14": {
"SAUCELABS_IOS15": {
"base": "SauceLabs",
"appiumVersion": "1.20.1",
"appiumVersion": "1.22.0",
"deviceOrientation": "portrait",
"browserName": "Safari",
"platformVersion": "14.3",
"platformVersion": "15.0",
"platformName": "iOS",
"deviceName": "iPhone 12 Pro Simulator"
"deviceName": "iPhone 13 Pro Max Simulator"
},
"BROWSERSTACK_SAFARI13": {
"BROWSERSTACK_SAFARI15": {
"base": "BrowserStack",
"browser": "Safari",
"browser_version": "13.1",
"browser_version": "15.0",
"os": "OS X",
"os_version": "Catalina"
"os_version": "Monterey"
}
}
4 changes: 2 additions & 2 deletions tools/tslint-rules/validateDecoratorsRule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ class Walker extends RuleWalker {
}

visitClassDeclaration(node: ts.ClassDeclaration) {
if (this._enabled && node.decorators) {
node.decorators
if (this._enabled && ts.canHaveDecorators(node)) {
ts.getDecorators(node)!
.map(decorator => decorator.expression as any)
.filter(expression => expression.arguments.length && expression.arguments[0].properties)
.forEach(expression => this._validatedDecorator(expression));
Expand Down
7 changes: 4 additions & 3 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@angular/flex-layout/*": [
"dist/releases/flex-layout/angular-flex-layout-*",
"dist/releases/flex-layout/*"
],
]
},
"baseUrl": "./",
"outDir": "./dist/out-tsc",
Expand All @@ -26,12 +26,13 @@
"experimentalDecorators": true,
"moduleResolution": "node",
"importHelpers": true,
"target": "es2020",
"target": "ES2022",
"module": "es2020",
"lib": [
"es2020",
"dom"
]
],
"useDefineForClassFields": false
},
"angularCompilerOptions": {
"enableI18nLegacyMessageIdFormat": false,
Expand Down
Loading

0 comments on commit 6e4d346

Please sign in to comment.