Skip to content

Commit 69ca864

Browse files
committed
WIP: trying to fix import paths for gulp
1 parent 2555abb commit 69ca864

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

src/cdk/testing/tests/testbed.spec.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {_supportsShadowDom} from '@angular/cdk/platform';
1+
import {_supportsShadowDom, Platform} from '@angular/cdk/platform';
22
import {
33
ComponentHarness,
44
ComponentHarnessConstructor,
@@ -495,7 +495,9 @@ describe('TestbedHarnessEnvironment', () => {
495495
});
496496
});
497497

498-
if (_supportsShadowDom()) {
498+
const platform = new Platform();
499+
// Safari only has parial shadow DOM support (https://caniuse.com/#feat=shadowdomv1)
500+
if (_supportsShadowDom() && !platform.SAFARI) {
499501
describe('shadow DOM interaction', () => {
500502
it('should not pierce shadow boundary by default', async () => {
501503
const harness = await TestbedHarnessEnvironment

src/e2e-app/devserver-configure.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
require.config({
44
paths: {
55
'moment': 'moment/min/moment.min',
6+
'kagekiri': 'kagekiri/dist/kagekiri.umd.min.js',
67

78
// MDC Web
89
'@material/animation': '@material/animation/dist/mdc.animation',

tools/system-config-tmpl.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ var nodeModulesPath = '$NODE_MODULES_BASE_PATH';
3131
var pathMapping = {
3232
'tslib': 'node:tslib/tslib.js',
3333
'moment': 'node:moment/min/moment-with-locales.min.js',
34+
'kagekiri': 'node:kagekiri/dist/kagekiri.umd.min.js',
3435

3536
'rxjs': 'node:rxjs/bundles/rxjs.umd.min.js',
3637
'rxjs/operators': 'tools/system-rxjs-operators.js',

0 commit comments

Comments
 (0)