feat(core): move MatchMedia to internal scope

src/lib/core/match-media/index.ts

@@ -8,4 +8,3 @@
 
 export * from './match-media';
 export * from './mock/mock-match-media';
-export * from './server-match-media';

src/lib/core/public-api.ts

@@ -15,7 +15,11 @@ export * from './add-alias';
 
 export * from './base/index';
 export * from './breakpoints/index';
-export * from './match-media/index';
+export {
+  MatchMedia as ɵMatchMedia,
+  MockMatchMedia as ɵMockMatchMedia,
+  MockMatchMediaProvider as ɵMockMatchMediaProvider,
+} from './match-media/index';
 export * from './media-observer/index';
 export * from './utils/index';
 

src/lib/extended/class/class.spec.ts

@@ -10,10 +10,10 @@ import {CommonModule, isPlatformServer} from '@angular/common';
 import {ComponentFixture, TestBed, fakeAsync, flush, inject} from '@angular/core/testing';
 import {MatButtonModule} from '@angular/material/button';
 import {
-  MatchMedia,
+  ɵMatchMedia as MatchMedia,
   CoreModule,
-  MockMatchMedia,
-  MockMatchMediaProvider,
+  ɵMockMatchMedia as MockMatchMedia,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
 } from '@angular/flex-layout/core';
 
 import {customMatchers, expect} from '../../utils/testing/custom-matchers';

src/lib/extended/img-src/img-src.spec.ts

@@ -9,9 +9,9 @@ import {Component, PLATFORM_ID} from '@angular/core';
 import {CommonModule, isPlatformServer} from '@angular/common';
 import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
 import {
-  MatchMedia,
-  MockMatchMedia,
-  MockMatchMediaProvider,
+  ɵMatchMedia as MatchMedia,
+  ɵMockMatchMedia as MockMatchMedia,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
   SERVER_TOKEN,
   StyleUtils,
 } from '@angular/flex-layout/core';

src/lib/extended/show-hide/hide.spec.ts

@@ -9,9 +9,9 @@ import {Component, OnInit} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
 import {
-  MatchMedia,
-  MockMatchMedia,
-  MockMatchMediaProvider,
+  ɵMatchMedia as MatchMedia,
+  ɵMockMatchMedia as MockMatchMedia,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
   MediaObserver,
   SERVER_TOKEN,
   StyleUtils

src/lib/extended/show-hide/show.spec.ts

@@ -9,9 +9,9 @@ import {Component, Directive, OnInit, PLATFORM_ID} from '@angular/core';
 import {CommonModule, isPlatformBrowser} from '@angular/common';
 import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
 import {
-  MatchMedia,
-  MockMatchMedia,
-  MockMatchMediaProvider,
+  ɵMatchMedia as MatchMedia,
+  ɵMockMatchMedia as MockMatchMedia,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
   MediaObserver,
   SERVER_TOKEN,
   StyleUtils,

src/lib/extended/style/style.spec.ts

@@ -9,10 +9,10 @@ import {Component} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
 import {
-  MatchMedia,
+  ɵMatchMedia as MatchMedia,
   CoreModule,
-  MockMatchMedia,
-  MockMatchMediaProvider,
+  ɵMockMatchMedia as MockMatchMedia,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
   StyleUtils,
 } from '@angular/flex-layout/core';
 import {DefaultLayoutDirective} from '@angular/flex-layout/flex';

src/lib/flex/flex-offset/flex-offset.spec.ts

@@ -10,7 +10,7 @@ import {CommonModule, isPlatformServer} from '@angular/common';
 import {ComponentFixture, inject, TestBed} from '@angular/core/testing';
 import {DIR_DOCUMENT} from '@angular/cdk/bidi';
 import {
-  MockMatchMediaProvider,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
   SERVER_TOKEN,
   StyleBuilder,
   StyleUtils,

src/lib/flex/flex-order/flex-order.spec.ts

@@ -9,9 +9,9 @@ import {Component} from '@angular/core';
 import {ComponentFixture, inject, TestBed} from '@angular/core/testing';
 import {CommonModule} from '@angular/common';
 import {
-  MatchMedia,
-  MockMatchMedia,
-  MockMatchMediaProvider,
+  ɵMatchMedia as MatchMedia,
+  ɵMockMatchMedia as MockMatchMedia,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
   SERVER_TOKEN,
   StyleUtils,
 } from '@angular/flex-layout/core';

src/lib/flex/flex/flex.spec.ts

@@ -10,9 +10,9 @@ import {CommonModule, isPlatformServer} from '@angular/common';
 import {ComponentFixture, TestBed, inject, fakeAsync} from '@angular/core/testing';
 import {Platform} from '@angular/cdk/platform';
 import {
-  MatchMedia,
-  MockMatchMedia,
-  MockMatchMediaProvider,
+  ɵMatchMedia as MatchMedia,
+  ɵMockMatchMedia as MockMatchMedia,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
   StyleBuilder,
   StyleUtils,
 } from '@angular/flex-layout/core';

src/lib/flex/layout-align/layout-align.spec.ts

@@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
 import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
 import {Platform} from '@angular/cdk/platform';
 import {
-  MatchMedia,
-  MockMatchMedia,
-  MockMatchMediaProvider,
+  ɵMatchMedia as MatchMedia,
+  ɵMockMatchMedia as MockMatchMedia,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
   SERVER_TOKEN,
   StyleBuilder,
   StyleUtils,

src/lib/flex/layout-gap/layout-gap.spec.ts

@@ -10,9 +10,9 @@ import {CommonModule, isPlatformServer} from '@angular/common';
 import {TestBed, ComponentFixture, inject, async} from '@angular/core/testing';
 import {DIR_DOCUMENT} from '@angular/cdk/bidi';
 import {
-  MatchMedia,
-  MockMatchMedia,
-  MockMatchMediaProvider,
+  ɵMatchMedia as MatchMedia,
+  ɵMockMatchMedia as MockMatchMedia,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
   SERVER_TOKEN,
   StyleBuilder,
   StyleUtils,

src/lib/flex/layout/layout.spec.ts

@@ -9,9 +9,9 @@ import {Component, Injectable, OnInit} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
 import {
-  MatchMedia,
-  MockMatchMedia,
-  MockMatchMediaProvider,
+  ɵMatchMedia as MatchMedia,
+  ɵMockMatchMedia as MockMatchMedia,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
   SERVER_TOKEN,
   StyleBuilder,
   StyleUtils,

src/lib/grid/align-columns/align-columns.spec.ts

@@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
 import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
 import {Platform} from '@angular/cdk/platform';
 import {
-  MatchMedia,
-  MockMatchMedia,
-  MockMatchMediaProvider,
+  ɵMatchMedia as MatchMedia,
+  ɵMockMatchMedia as MockMatchMedia,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
   StyleUtils,
 } from '@angular/flex-layout/core';
 

src/lib/grid/align-rows/align-rows.spec.ts

@@ -9,9 +9,9 @@ import {Component, OnInit} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
 import {
-  MatchMedia,
-  MockMatchMedia,
-  MockMatchMediaProvider,
+  ɵMatchMedia as MatchMedia,
+  ɵMockMatchMedia as MockMatchMedia,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
   StyleUtils,
 } from '@angular/flex-layout/core';
 

src/lib/grid/area/area.spec.ts

@@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
 import {TestBed, ComponentFixture, inject} from '@angular/core/testing';
 import {Platform} from '@angular/cdk/platform';
 import {
-  MatchMedia,
-  MockMatchMedia,
-  MockMatchMediaProvider,
+  ɵMatchMedia as MatchMedia,
+  ɵMockMatchMedia as MockMatchMedia,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
   SERVER_TOKEN,
   StyleUtils,
 } from '@angular/flex-layout/core';

src/lib/grid/areas/areas.spec.ts

@@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
 import {TestBed, ComponentFixture, inject} from '@angular/core/testing';
 import {Platform} from '@angular/cdk/platform';
 import {
-  MatchMedia,
-  MockMatchMedia,
-  MockMatchMediaProvider,
+  ɵMatchMedia as MatchMedia,
+  ɵMockMatchMedia as MockMatchMedia,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
   SERVER_TOKEN,
   StyleUtils,
 } from '@angular/flex-layout/core';

src/lib/grid/auto/auto.spec.ts

@@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
 import {TestBed, ComponentFixture, inject} from '@angular/core/testing';
 import {Platform} from '@angular/cdk/platform';
 import {
-  MatchMedia,
-  MockMatchMedia,
-  MockMatchMediaProvider,
+  ɵMatchMedia as MatchMedia,
+  ɵMockMatchMedia as MockMatchMedia,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
   SERVER_TOKEN,
   StyleUtils,
 } from '@angular/flex-layout/core';

src/lib/grid/column/column.spec.ts

@@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
 import {TestBed, ComponentFixture, inject} from '@angular/core/testing';
 import {Platform} from '@angular/cdk/platform';
 import {
-  MatchMedia,
-  MockMatchMedia,
-  MockMatchMediaProvider,
+  ɵMatchMedia as MatchMedia,
+  ɵMockMatchMedia as MockMatchMedia,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
   SERVER_TOKEN,
   StyleUtils,
 } from '@angular/flex-layout/core';

src/lib/grid/columns/columns.spec.ts

@@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
 import {TestBed, ComponentFixture, inject} from '@angular/core/testing';
 import {Platform} from '@angular/cdk/platform';
 import {
-  MatchMedia,
-  MockMatchMedia,
-  MockMatchMediaProvider,
+  ɵMatchMedia as MatchMedia,
+  ɵMockMatchMedia as MockMatchMedia,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
   SERVER_TOKEN,
   StyleUtils,
 } from '@angular/flex-layout/core';

src/lib/grid/gap/gap.spec.ts

@@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
 import {TestBed, ComponentFixture, inject} from '@angular/core/testing';
 import {Platform} from '@angular/cdk/platform';
 import {
-  MatchMedia,
-  MockMatchMedia,
-  MockMatchMediaProvider,
+  ɵMatchMedia as MatchMedia,
+  ɵMockMatchMedia as MockMatchMedia,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
   SERVER_TOKEN,
   StyleUtils,
 } from '@angular/flex-layout/core';

src/lib/grid/grid-align/grid-align.spec.ts

@@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
 import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
 import {Platform} from '@angular/cdk/platform';
 import {
-  MatchMedia,
-  MockMatchMedia,
-  MockMatchMediaProvider,
+  ɵMatchMedia as MatchMedia,
+  ɵMockMatchMedia as MockMatchMedia,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
   SERVER_TOKEN,
   StyleUtils,
 } from '@angular/flex-layout/core';

src/lib/grid/row/row.spec.ts

@@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
 import {TestBed, ComponentFixture, inject} from '@angular/core/testing';
 import {Platform} from '@angular/cdk/platform';
 import {
-  MatchMedia,
-  MockMatchMedia,
-  MockMatchMediaProvider,
+  ɵMatchMedia as MatchMedia,
+  ɵMockMatchMedia as MockMatchMedia,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
   SERVER_TOKEN,
   StyleUtils,
 } from '@angular/flex-layout/core';

src/lib/grid/rows/rows.spec.ts

@@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
 import {TestBed, ComponentFixture, inject} from '@angular/core/testing';
 import {Platform} from '@angular/cdk/platform';
 import {
-  MatchMedia,
-  MockMatchMedia,
-  MockMatchMediaProvider,
+  ɵMatchMedia as MatchMedia,
+  ɵMockMatchMedia as MockMatchMedia,
+  ɵMockMatchMediaProvider as MockMatchMediaProvider,
   SERVER_TOKEN,
   StyleUtils,
 } from '@angular/flex-layout/core';

src/lib/core/match-media/server-match-media.ts → src/lib/server/server-match-media.ts

@@ -7,9 +7,7 @@
  */
 import {DOCUMENT} from '@angular/common';
 import {Inject, Injectable, NgZone, PLATFORM_ID} from '@angular/core';
-
-import {BreakPoint} from '../breakpoints/break-point';
-import {MatchMedia} from './match-media';
+import {BreakPoint, ɵMatchMedia as MatchMedia} from '@angular/flex-layout/core';
 
 /**
  * Special server-only class to simulate a MediaQueryList and

src/lib/server/server-provider.ts

@@ -13,12 +13,12 @@ import {
   CLASS_NAME,
   SERVER_TOKEN,
   BreakPoint,
-  MatchMedia,
+  ɵMatchMedia as MatchMedia,
   StylesheetMap,
-  ServerMatchMedia,
   sortAscendingPriority
 } from '@angular/flex-layout/core';
 
+import {ServerMatchMedia} from './server-match-media';
 
 /**
  * Activate all of the registered breakpoints in sequence, and then