Skip to content

Commit

Permalink
chore: update to 12.0.0-beta.34 with changelog (#1344)
Browse files Browse the repository at this point in the history
  • Loading branch information
CaerusKaru authored May 18, 2021
1 parent be5cdd4 commit 7e94fe3
Show file tree
Hide file tree
Showing 23 changed files with 230 additions and 176 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# To validate changes, use an online parser, eg.
# http://yaml-online-parser.appspot.com/

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

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

# Attaches the release output which has been stored in the workspace to the current job.
# https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
<a name="12.0.0-beta.34"></a>
# [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)


### Bug Fixes

* **ssr:** check null _document.defaultView ([#1337](https://github.com/angular/flex-layout/issues/1337)) ([b43681c](https://github.com/angular/flex-layout/commit/b43681c))



<a name="11.0.0-beta.33"></a>
# [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)

Expand Down
39 changes: 20 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
},
"license": "MIT",
"engines": {
"node": "^12.0.0",
"yarn": ">= 1.19.1"
"node": ">=12.0.0 <16.0.0",
"yarn": ">= 1.0.0",
"npm": "Please use Yarn instead of NPM to install dependencies. See: https://yarnpkg.com/lang/en/docs/install/"
},
"scripts": {
"demo:serve": "gulp serve:devapp",
Expand All @@ -27,30 +28,30 @@
"universal:serve": "gulp universal:serve",
"postinstall": "ngcc --properties es2015 browser module main --no-async --create-ivy-entry-points"
},
"version": "11.0.0-beta.33",
"requiredAngularVersion": ">=11.0.0",
"version": "12.0.0-beta.34",
"requiredAngularVersion": ">=12.0.0",
"dependencies": {
"@angular/cdk": "^11.0.0",
"@angular/common": "^11.0.0",
"@angular/compiler": "^11.0.0",
"@angular/core": "^11.0.0",
"@angular/platform-browser": "^11.0.0",
"@angular/cdk": "^12.0.0",
"@angular/common": "^12.0.0",
"@angular/compiler": "^12.0.0",
"@angular/core": "^12.0.0",
"@angular/platform-browser": "^12.0.0",
"core-js": "^2.5.7",
"karma-parallel": "^0.3.1",
"rxjs": "^6.5.1",
"systemjs": "0.19.43",
"tsickle": "^0.39.1",
"tslib": "^2.0.0",
"zone.js": "~0.11.3"
"tslib": "^2.1.0",
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular/animations": "^11.0.0",
"@angular/compiler-cli": "^11.0.0",
"@angular/forms": "^11.0.0",
"@angular/material": "^11.0.0",
"@angular/platform-browser-dynamic": "^11.0.0",
"@angular/platform-server": "^11.0.0",
"@angular/router": "^11.0.0",
"@angular/animations": "^12.0.0",
"@angular/compiler-cli": "^12.0.0",
"@angular/forms": "^12.0.0",
"@angular/material": "^12.0.0",
"@angular/platform-browser-dynamic": "^12.0.0",
"@angular/platform-server": "^12.0.0",
"@angular/router": "^12.0.0",
"@firebase/app-types": "^0.3.2",
"@types/chalk": "^0.4.31",
"@types/fs-extra": "^4.0.5",
Expand Down Expand Up @@ -120,7 +121,7 @@
"ts-node": "^3.0.4",
"tsconfig-paths": "^2.3.0",
"tslint": "^5.11.0",
"typescript": "~4.0.5",
"typescript": "~4.2.3",
"uglify-js": "^2.8.14"
},
"// 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",
Expand Down
14 changes: 10 additions & 4 deletions src/apps/demo-app/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"preserveSymlinks": true,
"outputPath": "dist/browser",
"index": "src/index.html",
Expand All @@ -25,7 +24,13 @@
"styles": [
"src/styles.scss"
],
"scripts": []
"scripts": [],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
Expand All @@ -40,7 +45,6 @@
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
Expand Down Expand Up @@ -105,7 +109,9 @@
"outputPath": "dist/server",
"main": "src/main.server.ts",
"tsConfig": "tsconfig.server.json",
"preserveSymlinks": true
"preserveSymlinks": true,
"sourceMap": true,
"optimization": false
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions src/apps/demo-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,27 @@
"core-js": "file:../../../node_modules/core-js",
"rxjs": "file:../../../node_modules/rxjs",
"tslib": "file:../../../node_modules/tslib",
"zone.js": "file:../../../node_modules/zone.js"
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1100.0",
"@angular/cli": "^11.0.0",
"@angular-devkit/build-angular": "~12.0.0",
"@angular/cli": "^12.0.0",
"@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli",
"@angular/language-service": "^11.0.0",
"@angular/language-service": "^12.0.0",
"@types/jasmine": "~2.8.3",
"@types/jasminewd2": "~2.0.2",
"@types/node": "^12.12.11",
"codelyzer": "^5.1.2",
"jasmine-core": "~2.8.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~2.0.0",
"karma": "~6.3.2",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "^1.2.1",
"karma-jasmine": "~1.1.0",
"karma-jasmine-html-reporter": "^0.2.2",
"protractor": "~5.1.2",
"protractor": "~7.0.0",
"ts-node": "~4.1.0",
"tslint": "~5.9.1",
"tslint": "~6.1.3",
"typescript": "file:../../../node_modules/typescript"
}
}
2 changes: 1 addition & 1 deletion src/apps/demo-app/src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ import 'core-js/es6/set';
/***************************************************************************************************
* Zone JS is required by default for Angular itself.
*/
import 'zone.js/dist/zone'; // Included with Angular CLI.
import 'zone.js'; // Included with Angular CLI.



Expand Down
2 changes: 1 addition & 1 deletion src/apps/demo-app/src/test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files

import 'zone.js/dist/zone-testing';
import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
Expand Down
1 change: 0 additions & 1 deletion src/apps/demo-app/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"sourceMap": true,
"declaration": false,
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"strictNullChecks": true,
"target": "es2015",
Expand Down
10 changes: 7 additions & 3 deletions src/apps/hello-world/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"preserveSymlinks": true,
"outputPath": "dist",
"index": "src/index.html",
Expand All @@ -25,7 +24,13 @@
"styles": [
"src/styles.scss"
],
"scripts": []
"scripts": [],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
Expand All @@ -40,7 +45,6 @@
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
Expand Down
6 changes: 3 additions & 3 deletions src/apps/hello-world/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
"zone.js": "file:../../../node_modules/zone.js"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1100.0",
"@angular/cli": "^11.0.0",
"@angular-devkit/build-angular": "~12.0.0",
"@angular/cli": "^12.0.0",
"@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli",
"@angular/language-service": "^11.0.0",
"@angular/language-service": "^12.0.0",
"typescript": "file:../../../node_modules/typescript"
}
}
2 changes: 1 addition & 1 deletion src/apps/hello-world/src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
/***************************************************************************************************
* Zone JS is required by default for Angular itself.
*/
import 'zone.js/dist/zone'; // Included with Angular CLI.
import 'zone.js'; // Included with Angular CLI.



Expand Down
1 change: 0 additions & 1 deletion src/apps/hello-world/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"sourceMap": true,
"declaration": false,
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es2015",
"typeRoots": [
Expand Down
14 changes: 10 additions & 4 deletions src/apps/universal-app/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"preserveSymlinks": true,
"outputPath": "dist/browser",
"index": "src/index.html",
Expand All @@ -31,7 +30,13 @@
"styles": [
"src/styles.scss"
],
"scripts": []
"scripts": [],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
Expand All @@ -46,7 +51,6 @@
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
Expand Down Expand Up @@ -116,7 +120,9 @@
"outputPath": "dist/server",
"main": "server.ts",
"tsConfig": "src/tsconfig.server.json",
"preserveSymlinks": true
"preserveSymlinks": true,
"sourceMap": true,
"optimization": false
},
"configurations": {
"production": {
Expand Down
16 changes: 8 additions & 8 deletions src/apps/universal-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,33 +24,33 @@
"@angular/platform-browser-dynamic": "file:../../../node_modules/@angular/platform-browser-dynamic",
"@angular/platform-server": "file:../../../node_modules/@angular/platform-server",
"@angular/router": "file:../../../node_modules/@angular/router",
"@nguniversal/express-engine": "^11.0.0",
"@nguniversal/express-engine": "^12.0.0",
"express": "^4.16.2",
"rxjs": "file:../../../node_modules/rxjs",
"tslib": "file:../../../node_modules/tslib",
"zone.js": "file:../../../node_modules/zone.js"
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1100.0",
"@angular/cli": "~11.0.0",
"@angular-devkit/build-angular": "~12.0.0",
"@angular/cli": "~12.0.0",
"@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli",
"@angular/language-service": "~11.0.0",
"@angular/language-service": "~12.0.0",
"@types/express": "^4.17.0",
"@types/node": "file:../../../node_modules/@types/node",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.3",
"codelyzer": "~5.1.2",
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~3.1.1",
"karma": "~6.3.2",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~1.1.2",
"karma-jasmine-html-reporter": "^0.2.2",
"protractor": "~5.4.0",
"protractor": "~7.0.0",
"ts-loader": "^5.2.1",
"ts-node": "~7.0.0",
"tslint": "~5.11.0",
"tslint": "~6.1.3",
"typescript": "file:../../../node_modules/typescript"
}
}
2 changes: 1 addition & 1 deletion src/apps/universal-app/server.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'zone.js/dist/zone-node';
import 'zone.js/node';

import { ngExpressEngine } from '@nguniversal/express-engine';
import * as express from 'express';
Expand Down
2 changes: 1 addition & 1 deletion src/apps/universal-app/src/environments/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ export const environment = {
* This import should be commented out in production mode because it will have a negative impact
* on performance if an error is thrown.
*/
// import 'zone.js/dist/zone-error'; // Included with Angular CLI.
// import 'zone.js/plugins/zone-error'; // Included with Angular CLI.
2 changes: 1 addition & 1 deletion src/apps/universal-app/src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
/***************************************************************************************************
* Zone JS is required by default for Angular itself.
*/
import 'zone.js/dist/zone'; // Included with Angular CLI.
import 'zone.js'; // Included with Angular CLI.


/***************************************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/apps/universal-app/src/test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files

import 'zone.js/dist/zone-testing';
import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
Expand Down
1 change: 0 additions & 1 deletion src/apps/universal-app/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"declaration": false,
"module": "esnext",
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"importHelpers": true,
"target": "es2015",
Expand Down
4 changes: 2 additions & 2 deletions src/lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
},
"homepage": "https://github.com/angular/flex-layout#readme",
"dependencies": {
"tslib": "^2.0.0"
"tslib": "^2.1.0"
},
"peerDependencies": {
"@angular/cdk": "^11.0.0",
"@angular/cdk": "^12.0.0",
"@angular/core": "0.0.0-NG",
"@angular/common": "0.0.0-NG",
"@angular/platform-browser": "0.0.0-NG",
Expand Down
Loading

0 comments on commit 7e94fe3

Please sign in to comment.