diff --git a/gulpfile.js b/gulpfile.js index c374d95368..bf9a0f280a 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -40,9 +40,9 @@ if (cliArgs.projects) { cliArgs.projects.split(',').sort().join(','); } -// --projects=angular2,angular2_material => {angular2: true, angular2_material: true} +// --projects=angular2 => {angular2: true} var allProjects = - 'angular1_router,angular2,angular2_material,benchmarks,benchmarks_external,benchpress,playground,payload_tests,bundle_deps'; + 'angular1_router,angular2,benchmarks,benchmarks_external,benchpress,playground,payload_tests,bundle_deps'; var cliArgsProjects = (cliArgs.projects || allProjects) .split(',') .reduce((map, projectName) => { @@ -57,7 +57,7 @@ function printModulesWarning() { console.warn( "Pro Tip: Did you know that you can speed up your build by specifying project name(s)?"); console.warn(" It's like pressing the turbo button in the old days, but better!"); - console.warn(" Examples: --project=angular2 or --project=angular2,angular2_material"); + console.warn(" Examples: --project=angular2 or --project=angular2"); } } @@ -391,21 +391,19 @@ gulp.task('serve.js.dev', ['build.js.dev', 'build.js.cjs'], function(neverDone) gulp.task('serve.js.prod', jsServeProd); -gulp.task('serve.e2e.dev', ['build.js.dev', 'build.js.cjs', 'build.css.material'], - function(neverDone) { - var watch = require('./tools/build/watch'); +gulp.task('serve.e2e.dev', ['build.js.dev', 'build.js.cjs'], function(neverDone) { + var watch = require('./tools/build/watch'); - watch('modules/**', {ignoreInitial: true}, ['!broccoli.js.dev', '!build.js.cjs']); - jsServeDev(); - }); + watch('modules/**', {ignoreInitial: true}, ['!broccoli.js.dev', '!build.js.cjs']); + jsServeDev(); +}); -gulp.task('serve.e2e.prod', ['build.js.prod', 'build.js.cjs', 'build.css.material'], - function(neverDone) { - var watch = require('./tools/build/watch'); +gulp.task('serve.e2e.prod', ['build.js.prod', 'build.js.cjs'], function(neverDone) { + var watch = require('./tools/build/watch'); - watch('modules/**', {ignoreInitial: true}, ['!broccoli.js.prod', '!build.js.cjs']); - jsServeProd(); - }); + watch('modules/**', {ignoreInitial: true}, ['!broccoli.js.prod', '!build.js.cjs']); + jsServeProd(); +}); gulp.task('serve.js.dart2js', jsServeDartJs); @@ -440,7 +438,7 @@ gulp.task('serve.e2e.dart', ['build.js.cjs'], function(neverDone) { // Note: we are not using build.dart as the dart analyzer takes too long... watch('modules/**', {ignoreInitial: true}, ['!build/tree.dart', '!build.js.cjs']); - runSequence('build/packages.dart', 'build/pubspec.dart', 'build.dart.material.css', 'serve.dart'); + runSequence('build/packages.dart', 'build/pubspec.dart', 'serve.dart'); }); @@ -774,8 +772,7 @@ gulp.task('!checkAndReport.payload.js', function() { gulp.task('watch.dart.dev', function(done) { runSequence('build/tree.dart', 'build/pure-packages.dart', '!build/pubget.angular2.dart', - '!build/change_detect.dart', '!build/remove-pub-symlinks', 'build.dart.material.css', - function(error) { + '!build/change_detect.dart', '!build/remove-pub-symlinks', function(error) { var watch = require('./tools/build/watch'); // if initial build failed (likely due to build or formatting step) then exit @@ -1053,7 +1050,7 @@ gulp.task('build/packages.dart', function(done) { // Builds and compiles all Dart packages gulp.task('build.dart', function(done) { runSequence('build/packages.dart', 'build/pubspec.dart', 'build/analyze.dart', - 'build/check.apidocs.dart', 'build.dart.material.css', sequenceComplete(done)); + 'build/check.apidocs.dart', sequenceComplete(done)); }); @@ -1112,9 +1109,8 @@ gulp.task('!broccoli.js.prod', () => angularBuilder.rebuildBrowserProdTree({ useBundles: cliArgs.useBundles })); -gulp.task('build.js.dev', ['build/clean.js'], function(done) { - runSequence('broccoli.js.dev', 'build.css.material', sequenceComplete(done)); -}); +gulp.task('build.js.dev', ['build/clean.js'], + function(done) { runSequence('broccoli.js.dev', sequenceComplete(done)); }); gulp.task('build.js.prod', ['build.tools'], function(done) { runSequence('!broccoli.js.prod', sequenceComplete(done)); }); @@ -1471,41 +1467,6 @@ gulp.task('!build/change_detect.dart', function(done) { }); // ------------ -// angular material testing rules -gulp.task('build.css.material', function() { - var autoprefixer = require('gulp-autoprefixer'); - var sass = require('gulp-sass'); - - return gulp.src('modules/*/src/**/*.scss') - .pipe(sass()) - .pipe(autoprefixer()) - .pipe(gulp.dest(CONFIG.dest.js.prod.es5)) - .pipe(gulp.dest(CONFIG.dest.js.dev.es5)) - .pipe(gulp.dest(CONFIG.dest.js.dart2js + '/examples/packages')); -}); - - -gulp.task('build.js.material', function(done) { - runSequence('build.js.dev', 'build.css.material', sequenceComplete(done)); -}); - -gulp.task('build.dart2js.material', function(done) { - runSequence('build.dart', 'build.css.material', sequenceComplete(done)); -}); - -gulp.task('build.dart.material.css', function() { - var autoprefixer = require('gulp-autoprefixer'); - var sass = require('gulp-sass'); - - return gulp.src('dist/dart/angular2_material/src/**/*.scss') - .pipe(sass()) - .pipe(autoprefixer()) - .pipe(gulp.dest('dist/dart/angular2_material/lib/src')); -}); - -gulp.task('build.dart.material', ['build/packages.dart'], function(done) { - runSequence('build/packages.dart', 'build.dart.material.css', sequenceComplete(done)); -}); gulp.task('cleanup.builder', function() { return angularBuilder.cleanup(); }); diff --git a/modules/angular2_material/.clang-format b/modules/angular2_material/.clang-format deleted file mode 100644 index e60fec7357..0000000000 --- a/modules/angular2_material/.clang-format +++ /dev/null @@ -1,12 +0,0 @@ -Language: JavaScript -BasedOnStyle: Google -ColumnLimit: 100 - -TabWidth: 2 -ContinuationIndentWidth: 4 -MaxEmptyLinesToKeep : 2 - -AllowShortBlocksOnASingleLine: false -AllowShortIfStatementsOnASingleLine: false -AllowShortLoopsOnASingleLine: false -AllowShortFunctionsOnASingleLine: Empty diff --git a/modules/angular2_material/README.md b/modules/angular2_material/README.md deleted file mode 100644 index 0e0d3515a3..0000000000 --- a/modules/angular2_material/README.md +++ /dev/null @@ -1 +0,0 @@ -Temporary home of Material Design components for Angular 2. \ No newline at end of file diff --git a/modules/angular2_material/package.json b/modules/angular2_material/package.json deleted file mode 100644 index 09aceaa676..0000000000 --- a/modules/angular2_material/package.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "angular2_material", - "version": "<%= packageJson.version %>", - "description": "Google material design components for Angular 2", - "homepage": "<%= packageJson.homepage %>", - "bugs": "<%= packageJson.bugs %>", - "contributors": <%= JSON.stringify(packageJson.contributors) %>, - "license": "<%= packageJson.license %>", - "repository": <%= JSON.stringify(packageJson.repository) %>, - "dependencies": { - "es6-promise": "<%= packageJson.dependencies['es6-promise'] %>", - "es6-shim": "<%= packageJson.dependencies['es6-shim'] %>", - "reflect-metadata": "<%= packageJson.dependencies['reflect-metadata'] %>", - "rxjs": "<%= packageJson.dependencies['rxjs'] %>", - "zone.js": "<%= packageJson.dependencies['zone.js'] %>" - }, - "devDependencies": <%= JSON.stringify(packageJson.defaultDevDependencies) %> - "peerDependencies": { - "angular2": "<%= packageJson.version %>" - } -} diff --git a/modules/angular2_material/pubspec.yaml b/modules/angular2_material/pubspec.yaml deleted file mode 100644 index 68df1ad244..0000000000 --- a/modules/angular2_material/pubspec.yaml +++ /dev/null @@ -1,20 +0,0 @@ -name: angular2_material -version: <%= packageJson.version %> -authors: -<%= Object.keys(packageJson.contributors).map(function(name) { - return '- '+name+' <'+packageJson.contributors[name]+'>'; -}).join('\n') %> -description: Google material design components for Angular 2 -homepage: <%= packageJson.homepage %> -environment: - sdk: '>=1.10.0 <2.0.0' -dependencies: - angular2: '^<%= packageJson.version %>' - browser: '^0.10.0' -dependency_overrides: - angular2: - path: ../angular2 -dev_dependencies: - guinness2: '0.0.4' -transformers: -- angular2/transform/codegen diff --git a/modules/angular2_material/src/components/button/button.html b/modules/angular2_material/src/components/button/button.html deleted file mode 100644 index 4e3df0e226..0000000000 --- a/modules/angular2_material/src/components/button/button.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/modules/angular2_material/src/components/button/button.scss b/modules/angular2_material/src/components/button/button.scss deleted file mode 100644 index 89cf698dd4..0000000000 --- a/modules/angular2_material/src/components/button/button.scss +++ /dev/null @@ -1,195 +0,0 @@ -@import "../../core/style/variables"; -@import "../../core/style/shadows"; - -// TODO(jelbourn): This goes away. -@import "../../core/style/default-theme"; - -// TODO(jelbourn): Move variables and mixins into a partial file. -// TODO(jelbourn): Measure perf benefits for translate3d and will-change. -// TODO(jelbourn): Figure out if anchor hover underline actually happens in any browser. - - -// Standard button sizing. -$md-button-padding: 0 rem(0.600) !default; -$md-button-min-width: rem(8.800) !default; -$md-button-margin: rem(0.600) rem(0.800) !default; -$md-button-line-height: rem(3.60) !default; -$md-button-border-radius: 3px !default; - -// FAB sizing. -$md-fab-size: rem(5.600) !default; -$md-fab-line-height: rem(5.600) !default; -$md-fab-padding: rem(1.60) !default; -$md-fab-mini-size: rem(4.00) !default; -$md-fab-mini-line-height: rem(4.00) !default; - -/** Mixin to create distinct classes for fab positions, e.g. ".md-fab-position-bottom-right". */ -@mixin md-fab-position($spot, $top: auto, $right: auto, $bottom: auto, $left: auto) { - .md-fab-position-#{$spot} { - top: $top; - right: $right; - bottom: $bottom; - left: $left; - position: absolute; - } -} - -/** Styles for all disabled buttons. */ -@mixin md-button-disabled() { - color: md-color($md-foreground, disabled); - background-color: transparent; - cursor: default; -} - -/** Base styles for all buttons. */ -@mixin md-button-base() { - box-sizing: border-box; - position: relative; - - // Reset browser - - diff --git a/modules/playground/src/material/progress-linear/index.html b/modules/playground/src/material/progress-linear/index.html deleted file mode 100644 index 8cce9b6cc6..0000000000 --- a/modules/playground/src/material/progress-linear/index.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - ng-material progress-linear demo - - - - - - Loading... - - $SCRIPTS$ - - diff --git a/modules/playground/src/material/progress-linear/index.ts b/modules/playground/src/material/progress-linear/index.ts deleted file mode 100644 index 88e91af3bc..0000000000 --- a/modules/playground/src/material/progress-linear/index.ts +++ /dev/null @@ -1,28 +0,0 @@ -import {bootstrap} from 'angular2/bootstrap'; -import {bind, provide, Component, ViewEncapsulation} from 'angular2/core'; -import {MdProgressLinear} from 'angular2_material/src/components/progress-linear/progress_linear'; -import {UrlResolver} from 'angular2/src/compiler/url_resolver'; -import {commonDemoSetup, DemoUrlResolver} from '../demo_common'; - -@Component({ - selector: 'demo-app', - templateUrl: './demo_app.html', - directives: [MdProgressLinear], - encapsulation: ViewEncapsulation.None, -}) -class DemoApp { - progress: number; - - constructor() { - this.progress = 40; - } - - step(s: number) { - this.progress += s; - } -} - -export function main() { - commonDemoSetup(); - bootstrap(DemoApp, [provide(UrlResolver, {useValue: new DemoUrlResolver()})]); -} diff --git a/modules/playground/src/material/radio/demo_app.html b/modules/playground/src/material/radio/demo_app.html deleted file mode 100644 index 89ade0e93f..0000000000 --- a/modules/playground/src/material/radio/demo_app.html +++ /dev/null @@ -1,41 +0,0 @@ - - -
-

Radio buttons

-

Inside of a radiogroup

- - - Star Wars - Star Trek - Battlestar Galactica - Dr. Who - - -

Your selection: {{scifi.value}}

-

radio group value change count: {{groupValueChangeCount}}

- -
-

Standalone

- - Earth - Fire - Wind (disabled) - Heart - -

individual radio value change count: {{individualValueChanges}}

- -
-

Disabled radio group

-

Chosen: {{pokemon}}

- - Charmander - Bulbasaur - Squirtle - - - -
diff --git a/modules/playground/src/material/radio/index.html b/modules/playground/src/material/radio/index.html deleted file mode 100644 index 58ae038491..0000000000 --- a/modules/playground/src/material/radio/index.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - ng-material radio demo - - - - - - Loading... - - $SCRIPTS$ - - diff --git a/modules/playground/src/material/radio/index.ts b/modules/playground/src/material/radio/index.ts deleted file mode 100644 index 171f0b4dfa..0000000000 --- a/modules/playground/src/material/radio/index.ts +++ /dev/null @@ -1,46 +0,0 @@ -import {bootstrap} from 'angular2/bootstrap'; -import {bind, provide, Component, ViewEncapsulation} from 'angular2/core'; -import {UrlResolver} from 'angular2/compiler'; -import {MdRadioButton, MdRadioGroup} from 'angular2_material/src/components/radio/radio_button'; -import {MdRadioDispatcher} from 'angular2_material/src/components/radio/radio_dispatcher'; -import {commonDemoSetup, DemoUrlResolver} from '../demo_common'; - -@Component({ - selector: 'demo-app', - viewProviders: [MdRadioDispatcher], - templateUrl: './demo_app.html', - directives: [MdRadioGroup, MdRadioButton], - encapsulation: ViewEncapsulation.None, -}) -class DemoApp { - thirdValue; - groupValueChangeCount; - individualValueChanges; - pokemon; - someTabindex; - - constructor() { - this.thirdValue = 'dr-who'; - this.groupValueChangeCount = 0; - this.individualValueChanges = 0; - this.pokemon = ''; - this.someTabindex = 888; - } - - chooseCharmander() { - this.pokemon = 'fire'; - } - - onGroupChange() { - this.groupValueChangeCount++; - } - - onIndividualClick() { - this.individualValueChanges++; - } -} - -export function main() { - commonDemoSetup(); - bootstrap(DemoApp, [provide(UrlResolver, {useValue: new DemoUrlResolver()})]); -} diff --git a/modules/playground/src/material/switcher/demo_app.html b/modules/playground/src/material/switcher/demo_app.html deleted file mode 100644 index 1dae5ce030..0000000000 --- a/modules/playground/src/material/switcher/demo_app.html +++ /dev/null @@ -1,9 +0,0 @@ -
-

NgSwitch demo

- - Normal switch - Primary switch - Disabled switch - -

Toggle count: {{toggleCount}}

-
diff --git a/modules/playground/src/material/switcher/index.html b/modules/playground/src/material/switcher/index.html deleted file mode 100644 index 766ad9284e..0000000000 --- a/modules/playground/src/material/switcher/index.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - ng-material switch demo - - - - - - Loading... - - $SCRIPTS$ - - diff --git a/modules/playground/src/material/switcher/index.ts b/modules/playground/src/material/switcher/index.ts deleted file mode 100644 index f4d254c7ec..0000000000 --- a/modules/playground/src/material/switcher/index.ts +++ /dev/null @@ -1,28 +0,0 @@ -import {bootstrap} from 'angular2/bootstrap'; -import {bind, provide, Component, ViewEncapsulation} from 'angular2/core'; -import {MdSwitch} from 'angular2_material/src/components/switcher/switch'; -import {UrlResolver} from 'angular2/src/compiler/url_resolver'; -import {commonDemoSetup, DemoUrlResolver} from '../demo_common'; - -@Component({ - selector: 'demo-app', - templateUrl: './demo_app.html', - directives: [MdSwitch], - encapsulation: ViewEncapsulation.None, -}) -class DemoApp { - toggleCount: number; - - constructor() { - this.toggleCount = 0; - } - - increment() { - this.toggleCount++; - } -} - -export function main() { - commonDemoSetup(); - bootstrap(DemoApp, [provide(UrlResolver, {useValue: new DemoUrlResolver()})]); -} diff --git a/scripts/ci/build_dart_ddc.sh b/scripts/ci/build_dart_ddc.sh index c62a2aa500..b94f9a4c7c 100755 --- a/scripts/ci/build_dart_ddc.sh +++ b/scripts/ci/build_dart_ddc.sh @@ -26,7 +26,6 @@ git clone https://github.com/dart-lang/dev_compiler.git tmp/dev_compiler # Convert TypeScript to Dart ./node_modules/.bin/gulp build/packages.dart -./node_modules/.bin/gulp build.dart.material.css ./node_modules/.bin/gulp build/pubspec.dart node ./scripts/ci/dart_ddc/pubspec_for_ddc.js \ --pubspec-file=dist/dart/playground/pubspec.yaml @@ -45,14 +44,6 @@ $DART_SDK/bin/dart $DDC_DIR/bin/dartdevc.dart \ src/hash_routing/index.dart \ src/hello_world/index.dart \ src/key_events/index.dart \ - src/material/button/index.dart \ - src/material/checkbox/index.dart \ - src/material/dialog/index.dart \ - src/material/grid_list/index.dart \ - src/material/input/index.dart \ - src/material/progress-linear/index.dart \ - src/material/radio/index.dart \ - src/material/switcher/index.dart \ src/model_driven_forms/index.dart \ src/observable_models/index.dart \ src/order_management/index.dart \ diff --git a/scripts/ci/test_e2e_dart.sh b/scripts/ci/test_e2e_dart.sh index 6e2c9ce1fd..e407b6f2b8 100755 --- a/scripts/ci/test_e2e_dart.sh +++ b/scripts/ci/test_e2e_dart.sh @@ -25,8 +25,6 @@ function killServer () { # serverPid=$! #fi -./node_modules/.bin/gulp build.css.material& - trap killServer EXIT # wait for server to come up! diff --git a/scripts/ci/test_e2e_js.sh b/scripts/ci/test_e2e_js.sh index 449a8a423f..b50c61c119 100755 --- a/scripts/ci/test_e2e_js.sh +++ b/scripts/ci/test_e2e_js.sh @@ -15,8 +15,6 @@ function killServer () { ./node_modules/.bin/gulp serve.js.prod& serverPid=$! -./node_modules/.bin/gulp build.css.material& - trap killServer EXIT # wait for server to come up! diff --git a/scripts/publish/pub_publish.sh b/scripts/publish/pub_publish.sh index 3a8b2ef1db..c67cc96706 100755 --- a/scripts/publish/pub_publish.sh +++ b/scripts/publish/pub_publish.sh @@ -17,7 +17,6 @@ gulp clean gulp build/packages.dart gulp build/pubspec.dart gulp build/analyze.dart -gulp build.dart.material PKG_DIR=$ROOT_DIR/dist/pub rm -fr $PKG_DIR @@ -36,5 +35,4 @@ function publishModule { publishModule angular2 publishModule benchpress publishModule benchmarks -publishModule angular2_material publishModule angular2_testing diff --git a/test-main.js b/test-main.js index 9ea1378280..c7e8f294fe 100644 --- a/test-main.js +++ b/test-main.js @@ -13,7 +13,6 @@ System.config({ paths: { 'benchpress/*': 'dist/js/dev/es5/benchpress/*.js', 'angular2/*': 'dist/js/dev/es5/angular2/*.js', - 'angular2_material/*': 'dist/js/dev/es5/angular2_material/*.js', 'rxjs/*': 'node_modules/rxjs/*.js' } }); diff --git a/tools/analytics/analytics.js b/tools/analytics/analytics.js index 836271001e..e9c4075852 100644 --- a/tools/analytics/analytics.js +++ b/tools/analytics/analytics.js @@ -66,7 +66,7 @@ let customParams = { cd8: `${os.cpus().length} x ${os.cpus()[0].model}`, // HW - Memory Info cd9: `${Math.round(os.totalmem()/1024/1024/1024)}GB`, - // gulp --projects (angular2,angular2_material) + // gulp --projects (angular2) cd13: minimist(process.argv.slice(2)).projects }; diff --git a/tools/broccoli/html-replace/SCRIPTS.html b/tools/broccoli/html-replace/SCRIPTS.html index 9bacb6fcbd..7af85f50ea 100644 --- a/tools/broccoli/html-replace/SCRIPTS.html +++ b/tools/broccoli/html-replace/SCRIPTS.html @@ -3,7 +3,6 @@