Skip to content

Commit 17c1131

Browse files
committed
adding madge in gulp
1 parent a8cfa67 commit 17c1131

File tree

4 files changed

+9
-15
lines changed

4 files changed

+9
-15
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"test": "gulp test",
1414
"tslint": "gulp lint",
1515
"stylelint": "gulp lint",
16-
"check-circular-deps": "madge --circular ./dist",
1716
"e2e": "gulp e2e",
1817
"deploy": "firebase deploy",
1918
"webdriver-manager": "webdriver-manager"
@@ -44,6 +43,7 @@
4443
"@types/gulp": "^3.8.29",
4544
"@types/hammerjs": "^2.0.30",
4645
"@types/jasmine": "^2.2.31",
46+
"@types/merge2": "0.0.28",
4747
"@types/node": "^6.0.34",
4848
"@types/run-sequence": "0.0.27",
4949
"browserstacktunnel-wrapper": "^1.4.2",

scripts/ci/build-and-test.sh

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,13 @@ start_tunnel
1515
wait_for_tunnel
1616
if is_lint; then
1717
$(npm bin)/gulp ci:lint
18-
$(npm bin)/gulp ci:forbidden-identifiers
1918
elif is_circular_deps_check; then
20-
# Build first because madge needs the JavaScript output.
21-
$(npm bin)/gulp build
22-
npm run check-circular-deps
19+
$(npm bin)/gulp ci:check-circular-deps
2320
elif is_e2e; then
24-
# Run the e2e tests on the served e2e app.
25-
echo "Starting e2e tests"
2621
$(npm bin)/gulp ci:e2e
2722
elif is_extract_metadata; then
2823
$(npm bin)/gulp ci:extract-metadata
2924
else
30-
# Unit tests
3125
$(npm bin)/gulp ci:test
32-
# npm run build
33-
#
34-
# karma start test/karma.conf.js --single-run --no-auto-watch --reporters='dots'
3526
fi
3627
teardown_tunnel

src/lib/core/style/core.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// Core styles that can be used to apply material design treatments to any element.
2-
2+
@import '../a11y/live-announcer';
33
@import 'elevation';
4+
@import '../overlay/overlay';
5+
@import 'ripple';
46

57
// Provides external CSS classes for each elevation value. Each CSS class is formatted as
68
// `md-elevation-z$zValue` where `$zValue` corresponds to the z-space to which the element is
@@ -10,5 +12,3 @@
1012
@include md-elevation($zValue);
1113
}
1214
}
13-
14-
@import 'ripple';

tools/gulp/tasks/ci.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import gulp = require('gulp');
2+
import {execTask} from '../task_helpers';
23

34

4-
gulp.task('ci:lint', ['lint']);
5+
gulp.task('ci:lint', ['ci:forbidden-identifiers', 'lint']);
56
gulp.task('ci:test', ['test:single-run'], function() {
67
process.exit(0);
78
});
@@ -10,3 +11,5 @@ gulp.task('ci:extract-metadata', [':build:components:ngc']);
1011
gulp.task('ci:forbidden-identifiers', function() {
1112
require('../../../scripts/ci/forbidden-identifiers.js');
1213
});
14+
15+
gulp.task('ci:check-circular-deps', ['build:release'], execTask('madge', ['--circular', './dist']));

0 commit comments

Comments
 (0)