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

Commit 7e94fe3

Browse files
CaerusKaruCaerusKaru
authored
chore: update to 12.0.0-beta.34 with changelog (#1344)
1 parent be5cdd4 commit 7e94fe3

23 files changed

+230
-176
lines changed

‎.circleci/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# To validate changes, use an online parser, eg.
1010
# http://yaml-online-parser.appspot.com/
1111

12-
var_1: &docker_image circleci/node:12.9.1
12+
var_1: &docker_image circleci/node:14.16.1
1313
var_2: &cache_key v2-ng-layout-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.7.0
1414

1515
# Settings common to each job
@@ -53,7 +53,7 @@ var_8: &docker-firefox-image
5353
# TODO(devversion): Temporarily use a image that includes Firefox 62 because the
5454
# ngcontainer image does include an old Firefox version that does not support headless.
5555
# See the PR that fixes this: https://github.com/angular/angular/pull/26435
56-
- image: circleci/node:12.9.1-browsers
56+
- image: circleci/node:14.16.1-browsers
5757

5858
# Attaches the release output which has been stored in the workspace to the current job.
5959
# https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs

‎CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
<a name="12.0.0-beta.34"></a>
2+
# [12.0.0-beta.34](https://github.com/angular/flex-layout/compare/11.0.0-beta.33...12.0.0-beta.34) (2021-05-18)
3+
4+
5+
### Bug Fixes
6+
7+
* **ssr:** check null _document.defaultView ([#1337](https://github.com/angular/flex-layout/issues/1337)) ([b43681c](https://github.com/angular/flex-layout/commit/b43681c))
8+
9+
10+
111
<a name="11.0.0-beta.33"></a>
212
# [11.0.0-beta.33](https://github.com/angular/flex-layout/compare/10.0.0-beta.32...11.0.0-beta.33) (2020-11-12)
313

‎package.json

+20-19
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
},
1111
"license": "MIT",
1212
"engines": {
13-
"node": "^12.0.0",
14-
"yarn": ">= 1.19.1"
13+
"node": ">=12.0.0 <16.0.0",
14+
"yarn": ">= 1.0.0",
15+
"npm": "Please use Yarn instead of NPM to install dependencies. See: https://yarnpkg.com/lang/en/docs/install/"
1516
},
1617
"scripts": {
1718
"demo:serve": "gulp serve:devapp",
@@ -27,30 +28,30 @@
2728
"universal:serve": "gulp universal:serve",
2829
"postinstall": "ngcc --properties es2015 browser module main --no-async --create-ivy-entry-points"
2930
},
30-
"version": "11.0.0-beta.33",
31-
"requiredAngularVersion": ">=11.0.0",
31+
"version": "12.0.0-beta.34",
32+
"requiredAngularVersion": ">=12.0.0",
3233
"dependencies": {
33-
"@angular/cdk": "^11.0.0",
34-
"@angular/common": "^11.0.0",
35-
"@angular/compiler": "^11.0.0",
36-
"@angular/core": "^11.0.0",
37-
"@angular/platform-browser": "^11.0.0",
34+
"@angular/cdk": "^12.0.0",
35+
"@angular/common": "^12.0.0",
36+
"@angular/compiler": "^12.0.0",
37+
"@angular/core": "^12.0.0",
38+
"@angular/platform-browser": "^12.0.0",
3839
"core-js": "^2.5.7",
3940
"karma-parallel": "^0.3.1",
4041
"rxjs": "^6.5.1",
4142
"systemjs": "0.19.43",
4243
"tsickle": "^0.39.1",
43-
"tslib": "^2.0.0",
44-
"zone.js": "~0.11.3"
44+
"tslib": "^2.1.0",
45+
"zone.js": "~0.11.4"
4546
},
4647
"devDependencies": {
47-
"@angular/animations": "^11.0.0",
48-
"@angular/compiler-cli": "^11.0.0",
49-
"@angular/forms": "^11.0.0",
50-
"@angular/material": "^11.0.0",
51-
"@angular/platform-browser-dynamic": "^11.0.0",
52-
"@angular/platform-server": "^11.0.0",
53-
"@angular/router": "^11.0.0",
48+
"@angular/animations": "^12.0.0",
49+
"@angular/compiler-cli": "^12.0.0",
50+
"@angular/forms": "^12.0.0",
51+
"@angular/material": "^12.0.0",
52+
"@angular/platform-browser-dynamic": "^12.0.0",
53+
"@angular/platform-server": "^12.0.0",
54+
"@angular/router": "^12.0.0",
5455
"@firebase/app-types": "^0.3.2",
5556
"@types/chalk": "^0.4.31",
5657
"@types/fs-extra": "^4.0.5",
@@ -120,7 +121,7 @@
120121
"ts-node": "^3.0.4",
121122
"tsconfig-paths": "^2.3.0",
122123
"tslint": "^5.11.0",
123-
"typescript": "~4.0.5",
124+
"typescript": "~4.2.3",
124125
"uglify-js": "^2.8.14"
125126
},
126127
"// Gulp": "Overwrite graceful-fs to a version that does not rely on the 'natives' package. This fixes gulp for >= 10.13, more information: angular/angular#28213",

‎src/apps/demo-app/angular.json

+10-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"build": {
1212
"builder": "@angular-devkit/build-angular:browser",
1313
"options": {
14-
"aot": true,
1514
"preserveSymlinks": true,
1615
"outputPath": "dist/browser",
1716
"index": "src/index.html",
@@ -25,7 +24,13 @@
2524
"styles": [
2625
"src/styles.scss"
2726
],
28-
"scripts": []
27+
"scripts": [],
28+
"vendorChunk": true,
29+
"extractLicenses": false,
30+
"buildOptimizer": false,
31+
"sourceMap": true,
32+
"optimization": false,
33+
"namedChunks": true
2934
},
3035
"configurations": {
3136
"production": {
@@ -40,7 +45,6 @@
4045
"sourceMap": false,
4146
"extractCss": true,
4247
"namedChunks": false,
43-
"aot": true,
4448
"extractLicenses": true,
4549
"vendorChunk": false,
4650
"buildOptimizer": true,
@@ -105,7 +109,9 @@
105109
"outputPath": "dist/server",
106110
"main": "src/main.server.ts",
107111
"tsConfig": "tsconfig.server.json",
108-
"preserveSymlinks": true
112+
"preserveSymlinks": true,
113+
"sourceMap": true,
114+
"optimization": false
109115
}
110116
}
111117
}

‎src/apps/demo-app/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,27 @@
2727
"core-js": "file:../../../node_modules/core-js",
2828
"rxjs": "file:../../../node_modules/rxjs",
2929
"tslib": "file:../../../node_modules/tslib",
30-
"zone.js": "file:../../../node_modules/zone.js"
30+
"zone.js": "~0.11.4"
3131
},
3232
"devDependencies": {
33-
"@angular-devkit/build-angular": "~0.1100.0",
34-
"@angular/cli": "^11.0.0",
33+
"@angular-devkit/build-angular": "~12.0.0",
34+
"@angular/cli": "^12.0.0",
3535
"@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli",
36-
"@angular/language-service": "^11.0.0",
36+
"@angular/language-service": "^12.0.0",
3737
"@types/jasmine": "~2.8.3",
3838
"@types/jasminewd2": "~2.0.2",
3939
"@types/node": "^12.12.11",
4040
"codelyzer": "^5.1.2",
4141
"jasmine-core": "~2.8.0",
4242
"jasmine-spec-reporter": "~4.2.1",
43-
"karma": "~2.0.0",
43+
"karma": "~6.3.2",
4444
"karma-chrome-launcher": "~2.2.0",
4545
"karma-coverage-istanbul-reporter": "^1.2.1",
4646
"karma-jasmine": "~1.1.0",
4747
"karma-jasmine-html-reporter": "^0.2.2",
48-
"protractor": "~5.1.2",
48+
"protractor": "~7.0.0",
4949
"ts-node": "~4.1.0",
50-
"tslint": "~5.9.1",
50+
"tslint": "~6.1.3",
5151
"typescript": "file:../../../node_modules/typescript"
5252
}
5353
}

‎src/apps/demo-app/src/polyfills.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ import 'core-js/es6/set';
5757
/***************************************************************************************************
5858
* Zone JS is required by default for Angular itself.
5959
*/
60-
import 'zone.js/dist/zone'; // Included with Angular CLI.
60+
import 'zone.js'; // Included with Angular CLI.
6161

6262

6363

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
22

3-
import 'zone.js/dist/zone-testing';
3+
import 'zone.js/testing';
44
import { getTestBed } from '@angular/core/testing';
55
import {
66
BrowserDynamicTestingModule,

‎src/apps/demo-app/tsconfig.json

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"sourceMap": true,
66
"declaration": false,
77
"moduleResolution": "node",
8-
"emitDecoratorMetadata": true,
98
"experimentalDecorators": true,
109
"strictNullChecks": true,
1110
"target": "es2015",

‎src/apps/hello-world/angular.json

+7-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"build": {
1212
"builder": "@angular-devkit/build-angular:browser",
1313
"options": {
14-
"aot": true,
1514
"preserveSymlinks": true,
1615
"outputPath": "dist",
1716
"index": "src/index.html",
@@ -25,7 +24,13 @@
2524
"styles": [
2625
"src/styles.scss"
2726
],
28-
"scripts": []
27+
"scripts": [],
28+
"vendorChunk": true,
29+
"extractLicenses": false,
30+
"buildOptimizer": false,
31+
"sourceMap": true,
32+
"optimization": false,
33+
"namedChunks": true
2934
},
3035
"configurations": {
3136
"production": {
@@ -40,7 +45,6 @@
4045
"sourceMap": false,
4146
"extractCss": true,
4247
"namedChunks": false,
43-
"aot": true,
4448
"extractLicenses": true,
4549
"vendorChunk": false,
4650
"buildOptimizer": true,

‎src/apps/hello-world/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
"zone.js": "file:../../../node_modules/zone.js"
2626
},
2727
"devDependencies": {
28-
"@angular-devkit/build-angular": "~0.1100.0",
29-
"@angular/cli": "^11.0.0",
28+
"@angular-devkit/build-angular": "~12.0.0",
29+
"@angular/cli": "^12.0.0",
3030
"@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli",
31-
"@angular/language-service": "^11.0.0",
31+
"@angular/language-service": "^12.0.0",
3232
"typescript": "file:../../../node_modules/typescript"
3333
}
3434
}

‎src/apps/hello-world/src/polyfills.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
/***************************************************************************************************
7272
* Zone JS is required by default for Angular itself.
7373
*/
74-
import 'zone.js/dist/zone'; // Included with Angular CLI.
74+
import 'zone.js'; // Included with Angular CLI.
7575

7676

7777

‎src/apps/hello-world/tsconfig.json

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"sourceMap": true,
66
"declaration": false,
77
"moduleResolution": "node",
8-
"emitDecoratorMetadata": true,
98
"experimentalDecorators": true,
109
"target": "es2015",
1110
"typeRoots": [

‎src/apps/universal-app/angular.json

+10-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"build": {
1818
"builder": "@angular-devkit/build-angular:browser",
1919
"options": {
20-
"aot": true,
2120
"preserveSymlinks": true,
2221
"outputPath": "dist/browser",
2322
"index": "src/index.html",
@@ -31,7 +30,13 @@
3130
"styles": [
3231
"src/styles.scss"
3332
],
34-
"scripts": []
33+
"scripts": [],
34+
"vendorChunk": true,
35+
"extractLicenses": false,
36+
"buildOptimizer": false,
37+
"sourceMap": true,
38+
"optimization": false,
39+
"namedChunks": true
3540
},
3641
"configurations": {
3742
"production": {
@@ -46,7 +51,6 @@
4651
"sourceMap": false,
4752
"extractCss": true,
4853
"namedChunks": false,
49-
"aot": true,
5054
"extractLicenses": true,
5155
"vendorChunk": false,
5256
"buildOptimizer": true,
@@ -116,7 +120,9 @@
116120
"outputPath": "dist/server",
117121
"main": "server.ts",
118122
"tsConfig": "src/tsconfig.server.json",
119-
"preserveSymlinks": true
123+
"preserveSymlinks": true,
124+
"sourceMap": true,
125+
"optimization": false
120126
},
121127
"configurations": {
122128
"production": {

‎src/apps/universal-app/package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,33 +24,33 @@
2424
"@angular/platform-browser-dynamic": "file:../../../node_modules/@angular/platform-browser-dynamic",
2525
"@angular/platform-server": "file:../../../node_modules/@angular/platform-server",
2626
"@angular/router": "file:../../../node_modules/@angular/router",
27-
"@nguniversal/express-engine": "^11.0.0",
27+
"@nguniversal/express-engine": "^12.0.0",
2828
"express": "^4.16.2",
2929
"rxjs": "file:../../../node_modules/rxjs",
3030
"tslib": "file:../../../node_modules/tslib",
31-
"zone.js": "file:../../../node_modules/zone.js"
31+
"zone.js": "~0.11.4"
3232
},
3333
"devDependencies": {
34-
"@angular-devkit/build-angular": "~0.1100.0",
35-
"@angular/cli": "~11.0.0",
34+
"@angular-devkit/build-angular": "~12.0.0",
35+
"@angular/cli": "~12.0.0",
3636
"@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli",
37-
"@angular/language-service": "~11.0.0",
37+
"@angular/language-service": "~12.0.0",
3838
"@types/express": "^4.17.0",
3939
"@types/node": "file:../../../node_modules/@types/node",
4040
"@types/jasmine": "~2.8.8",
4141
"@types/jasminewd2": "~2.0.3",
4242
"codelyzer": "~5.1.2",
4343
"jasmine-core": "~2.99.1",
4444
"jasmine-spec-reporter": "~4.2.1",
45-
"karma": "~3.1.1",
45+
"karma": "~6.3.2",
4646
"karma-chrome-launcher": "~2.2.0",
4747
"karma-coverage-istanbul-reporter": "~2.0.1",
4848
"karma-jasmine": "~1.1.2",
4949
"karma-jasmine-html-reporter": "^0.2.2",
50-
"protractor": "~5.4.0",
50+
"protractor": "~7.0.0",
5151
"ts-loader": "^5.2.1",
5252
"ts-node": "~7.0.0",
53-
"tslint": "~5.11.0",
53+
"tslint": "~6.1.3",
5454
"typescript": "file:../../../node_modules/typescript"
5555
}
5656
}

‎src/apps/universal-app/server.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'zone.js/dist/zone-node';
1+
import 'zone.js/node';
22

33
import { ngExpressEngine } from '@nguniversal/express-engine';
44
import * as express from 'express';

‎src/apps/universal-app/src/environments/environment.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ export const environment = {
1313
* This import should be commented out in production mode because it will have a negative impact
1414
* on performance if an error is thrown.
1515
*/
16-
// import 'zone.js/dist/zone-error'; // Included with Angular CLI.
16+
// import 'zone.js/plugins/zone-error'; // Included with Angular CLI.

‎src/apps/universal-app/src/polyfills.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
/***************************************************************************************************
6464
* Zone JS is required by default for Angular itself.
6565
*/
66-
import 'zone.js/dist/zone'; // Included with Angular CLI.
66+
import 'zone.js'; // Included with Angular CLI.
6767

6868

6969
/***************************************************************************************************

‎src/apps/universal-app/src/test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
22

3-
import 'zone.js/dist/zone-testing';
3+
import 'zone.js/testing';
44
import { getTestBed } from '@angular/core/testing';
55
import {
66
BrowserDynamicTestingModule,

‎src/apps/universal-app/tsconfig.json

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"declaration": false,
88
"module": "esnext",
99
"moduleResolution": "node",
10-
"emitDecoratorMetadata": true,
1110
"experimentalDecorators": true,
1211
"importHelpers": true,
1312
"target": "es2015",

‎src/lib/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
},
2424
"homepage": "https://github.com/angular/flex-layout#readme",
2525
"dependencies": {
26-
"tslib": "^2.0.0"
26+
"tslib": "^2.1.0"
2727
},
2828
"peerDependencies": {
29-
"@angular/cdk": "^11.0.0",
29+
"@angular/cdk": "^12.0.0",
3030
"@angular/core": "0.0.0-NG",
3131
"@angular/common": "0.0.0-NG",
3232
"@angular/platform-browser": "0.0.0-NG",

0 commit comments

Comments
 (0)