skills/angular__angular
1
0
Fork 0
mirror of https://github.com/angular/angular.git synced 2026-09-14 13:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "refactor(core): remove version placeholder workaround" (#16246)

Browse Source 
This reverts commit 2b375151f7.
This commit is contained in:
mmalerba
2019-06-10 10:41:14 -07:00
committed by GitHub
parent c1e07ad670
commit 7f742114d3
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/material/core/common-behaviors/common-module.ts
+12 -6
View File
@@ -6,11 +6,17 @@
* found in the LICENSE file at https://angular.io/license
*/
import {VERSION as CDK_VERSION} from '@angular/cdk';
import {NgModule, InjectionToken, Optional, Inject, isDevMode, Version} from '@angular/core';
import {HammerLoader, HAMMER_LOADER} from '@angular/platform-browser';
import {BidiModule} from '@angular/cdk/bidi';
import {Inject, InjectionToken, isDevMode, NgModule, Optional} from '@angular/core';
import {HAMMER_LOADER, HammerLoader} from '@angular/platform-browser';
import {VERSION as MAT_VERSION} from '../version';
import {VERSION as CDK_VERSION} from '@angular/cdk';
// Private version constant to circumvent test/build issues,
// i.e. avoid core to depend on the @angular/material primary entry-point
// Can be removed once the Material primary entry-point no longer
// re-exports all secondary entry-points
const VERSION = new Version('0.0.0-PLACEHOLDER');
/** Injection token that configures whether the Material sanity checks are enabled. */
export const MATERIAL_SANITY_CHECKS = new InjectionToken<boolean>('mat-sanity-checks', {
@@ -108,9 +114,9 @@ export class MatCommonModule {
/** Checks whether the material version matches the cdk version */
private _checkCdkVersionMatch(): void {
if (MAT_VERSION.full !== CDK_VERSION.full) {
if (VERSION.full !== CDK_VERSION.full) {
console.warn(
'The Angular Material version (' + MAT_VERSION.full + ') does not match ' +
'The Angular Material version (' + VERSION.full + ') does not match ' +
'the Angular CDK version (' + CDK_VERSION.full + ').\n' +
'Please ensure the versions of these two packages exactly match.'
);