From 16a8d6a8692de5506547f10271a9a4b4f6aebf0f Mon Sep 17 00:00:00 2001 From: marc-sensenich Date: Mon, 6 Jun 2016 21:39:29 -0400 Subject: [PATCH 1/7] Update .travis.yml --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1483e447d760..3f4de4e1e4b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,9 @@ matrix: exclude: - os: osx env: NODE_VERSION=5 SCRIPT=lint - +branches: + only: + - e2e-exit-code script: - npm run-script $SCRIPT From c16c552ef6cb2bad8ad1b6ee54a82a7d1b158e15 Mon Sep 17 00:00:00 2001 From: marc-sensenich Date: Mon, 6 Jun 2016 22:33:45 -0400 Subject: [PATCH 2/7] Update .travis.yml --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3f4de4e1e4b5..c1d5e68a4720 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,7 @@ matrix: exclude: - os: osx env: NODE_VERSION=5 SCRIPT=lint -branches: - only: - - e2e-exit-code + script: - npm run-script $SCRIPT From ab049a7ad4d3d043ace21bf85dedf58e9cc6f16c Mon Sep 17 00:00:00 2001 From: Marc Sensenich Date: Tue, 7 Jun 2016 15:09:15 -0400 Subject: [PATCH 3/7] feat: Implementation of flag to install Angular Material on `new` or `init` This features adds a `--material` flag to the `new` and `init` options. This streamlines the process of the adding of Angular Material to a new project --- addon/ng2/blueprints/ng2/files/__path__/system-config.ts | 8 +++++++- addon/ng2/blueprints/ng2/files/angular-cli-build.js | 3 ++- addon/ng2/blueprints/ng2/files/package.json | 3 ++- addon/ng2/blueprints/ng2/index.js | 6 ++++-- addon/ng2/commands/init.js | 6 ++++-- addon/ng2/commands/new.ts | 3 ++- lib/config/schema.json | 3 ++- 7 files changed, 23 insertions(+), 9 deletions(-) diff --git a/addon/ng2/blueprints/ng2/files/__path__/system-config.ts b/addon/ng2/blueprints/ng2/files/__path__/system-config.ts index cc549606a2a4..8fcafd72a350 100644 --- a/addon/ng2/blueprints/ng2/files/__path__/system-config.ts +++ b/addon/ng2/blueprints/ng2/files/__path__/system-config.ts @@ -38,13 +38,19 @@ barrels.forEach((barrelName: string) => { cliSystemConfigPackages[barrelName] = { main: 'index' }; }); +<% if(isMaterial) { %> +cliSystemConfigPackages['@angular2-material/core'] + = { format: 'cjs', defaultExtenstion: 'js', main: 'core.js' }; +<% } %> + /** Type declaration for ambient System. */ declare var System: any; // Apply the CLI SystemJS configuration. System.config({ map: { - '@angular': 'vendor/@angular', + '@angular': 'vendor/@angular', <% if(isMaterial) { %> + '@angular2-material': 'vendor/@angular2-material', <% } %> 'rxjs': 'vendor/rxjs', 'main': 'main.js' }, diff --git a/addon/ng2/blueprints/ng2/files/angular-cli-build.js b/addon/ng2/blueprints/ng2/files/angular-cli-build.js index daa7a4b54124..2e2199ab671f 100644 --- a/addon/ng2/blueprints/ng2/files/angular-cli-build.js +++ b/addon/ng2/blueprints/ng2/files/angular-cli-build.js @@ -11,7 +11,8 @@ module.exports = function(defaults) { 'es6-shim/es6-shim.js', 'reflect-metadata/**/*.+(ts|js|js.map)', 'rxjs/**/*.+(js|js.map)', - '@angular/**/*.+(js|js.map)' + '@angular/**/*.+(js|js.map)'<% if(isMaterial) { %>, + '@angular2-material/**/*.js' <% } %> ] }); }; diff --git a/addon/ng2/blueprints/ng2/files/package.json b/addon/ng2/blueprints/ng2/files/package.json index f477c2e6d1f1..0e92c3f7c5ff 100644 --- a/addon/ng2/blueprints/ng2/files/package.json +++ b/addon/ng2/blueprints/ng2/files/package.json @@ -19,7 +19,8 @@ "@angular/http": "2.0.0-rc.1", "@angular/platform-browser": "2.0.0-rc.1", "@angular/platform-browser-dynamic": "2.0.0-rc.1", - "@angular/router": "2.0.0-rc.1", + "@angular/router": "2.0.0-rc.1",<% if(isMaterial) { %> + "@angular2-material/core": "2.0.0-alpha.5-2", <% } %> "es6-shim": "^0.35.0", "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", diff --git a/addon/ng2/blueprints/ng2/index.js b/addon/ng2/blueprints/ng2/index.js index 146ef7c50023..761fc83f449d 100644 --- a/addon/ng2/blueprints/ng2/index.js +++ b/addon/ng2/blueprints/ng2/index.js @@ -10,7 +10,8 @@ module.exports = { { name: 'source-dir', type: String, default: 'src', aliases: ['sd'] }, { name: 'prefix', type: String, default: 'app', aliases: ['p'] }, { name: 'style', type: String, default: 'css' }, - { name: 'mobile', type: Boolean, default: false } + { name: 'mobile', type: Boolean, default: false }, + { name: 'material', type: Boolean, default: false } ], afterInstall: function (options) { @@ -38,7 +39,8 @@ module.exports = { prefix: options.prefix, styleExt: this.styleExt, refToTypings: refToTypings, - isMobile: options.mobile + isMobile: options.mobile, + isMaterial: options.material }; }, diff --git a/addon/ng2/commands/init.js b/addon/ng2/commands/init.js index f77a1c2852b7..5f4f13e019c0 100644 --- a/addon/ng2/commands/init.js +++ b/addon/ng2/commands/init.js @@ -25,7 +25,8 @@ module.exports = Command.extend({ { name: 'source-dir', type: String, default: 'src', aliases: ['sd'] }, { name: 'style', type: String, default: 'css' }, { name: 'prefix', type: String, default: 'app', aliases: ['p'] }, - { name: 'mobile', type: Boolean, default: false } + { name: 'mobile', type: Boolean, default: false }, + { name: 'material', type: Boolean, default: false } ], anonymousOptions: [''], @@ -103,7 +104,8 @@ module.exports = Command.extend({ sourceDir: commandOptions.sourceDir, style: commandOptions.style, prefix: commandOptions.prefix, - mobile: commandOptions.mobile + mobile: commandOptions.mobile, + material: commandOptions.material }; if (!validProjectName(packageName)) { diff --git a/addon/ng2/commands/new.ts b/addon/ng2/commands/new.ts index 685e4e3e1124..fa7f194eccb7 100644 --- a/addon/ng2/commands/new.ts +++ b/addon/ng2/commands/new.ts @@ -24,7 +24,8 @@ const NewCommand = Command.extend({ { name: 'source-dir', type: String, default: 'src', aliases: ['sd'] }, { name: 'style', type: String, default: 'css' }, { name: 'prefix', type: String, default: 'app', aliases: ['p'] }, - { name: 'mobile', type: Boolean, default: false } + { name: 'mobile', type: Boolean, default: false }, + { name: 'material', type: Boolean, default: false } ], run: function (commandOptions, rawArgs) { diff --git a/lib/config/schema.json b/lib/config/schema.json index d8598052dd14..d14bd5d8c741 100644 --- a/lib/config/schema.json +++ b/lib/config/schema.json @@ -24,7 +24,8 @@ "properties": { "main": "string", "tsconfig": "string", - "mobile": "boolean" + "mobile": "boolean", + "material": "boolean" }, "additionalProperties": false }, From 6976eb05bcb3395121c60e2bd550156c9054c09b Mon Sep 17 00:00:00 2001 From: marc-sensenich Date: Tue, 7 Jun 2016 15:25:53 -0400 Subject: [PATCH 4/7] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c1d5e68a4720..54e1caeaaf58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ matrix: exclude: - os: osx env: NODE_VERSION=5 SCRIPT=lint - script: - npm run-script $SCRIPT From 44fc045b2cc81d4fd57e0087607ad6f23153f90d Mon Sep 17 00:00:00 2001 From: Marc Sensenich Date: Tue, 7 Jun 2016 15:29:17 -0400 Subject: [PATCH 5/7] Revert "Update .travis.yml" This reverts commit c16c552ef6cb2bad8ad1b6ee54a82a7d1b158e15. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c1d5e68a4720..3f4de4e1e4b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,9 @@ matrix: exclude: - os: osx env: NODE_VERSION=5 SCRIPT=lint - +branches: + only: + - e2e-exit-code script: - npm run-script $SCRIPT From 94321cb31dddc069139238211378114cb13be71d Mon Sep 17 00:00:00 2001 From: Marc Sensenich Date: Tue, 7 Jun 2016 15:29:25 -0400 Subject: [PATCH 6/7] Revert "Update .travis.yml" This reverts commit 16a8d6a8692de5506547f10271a9a4b4f6aebf0f. --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3f4de4e1e4b5..1483e447d760 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,7 @@ matrix: exclude: - os: osx env: NODE_VERSION=5 SCRIPT=lint -branches: - only: - - e2e-exit-code + script: - npm run-script $SCRIPT From d0c4bf0d6f2eb8aeb27752a39bef0edc0c78b3ac Mon Sep 17 00:00:00 2001 From: Marc Sensenich Date: Tue, 7 Jun 2016 15:09:15 -0400 Subject: [PATCH 7/7] feat: Implementation of flag to install Angular Material on `new` or `init` This features adds a `--material` flag to the `new` and `init` options. This streamlines the process of the adding of Angular Material to a new project --- addon/ng2/blueprints/ng2/files/__path__/system-config.ts | 8 +++++++- addon/ng2/blueprints/ng2/files/angular-cli-build.js | 3 ++- addon/ng2/blueprints/ng2/files/package.json | 3 ++- addon/ng2/blueprints/ng2/index.js | 6 ++++-- addon/ng2/commands/init.js | 6 ++++-- addon/ng2/commands/new.ts | 3 ++- lib/config/schema.json | 3 ++- 7 files changed, 23 insertions(+), 9 deletions(-) diff --git a/addon/ng2/blueprints/ng2/files/__path__/system-config.ts b/addon/ng2/blueprints/ng2/files/__path__/system-config.ts index cc549606a2a4..8fcafd72a350 100644 --- a/addon/ng2/blueprints/ng2/files/__path__/system-config.ts +++ b/addon/ng2/blueprints/ng2/files/__path__/system-config.ts @@ -38,13 +38,19 @@ barrels.forEach((barrelName: string) => { cliSystemConfigPackages[barrelName] = { main: 'index' }; }); +<% if(isMaterial) { %> +cliSystemConfigPackages['@angular2-material/core'] + = { format: 'cjs', defaultExtenstion: 'js', main: 'core.js' }; +<% } %> + /** Type declaration for ambient System. */ declare var System: any; // Apply the CLI SystemJS configuration. System.config({ map: { - '@angular': 'vendor/@angular', + '@angular': 'vendor/@angular', <% if(isMaterial) { %> + '@angular2-material': 'vendor/@angular2-material', <% } %> 'rxjs': 'vendor/rxjs', 'main': 'main.js' }, diff --git a/addon/ng2/blueprints/ng2/files/angular-cli-build.js b/addon/ng2/blueprints/ng2/files/angular-cli-build.js index daa7a4b54124..2e2199ab671f 100644 --- a/addon/ng2/blueprints/ng2/files/angular-cli-build.js +++ b/addon/ng2/blueprints/ng2/files/angular-cli-build.js @@ -11,7 +11,8 @@ module.exports = function(defaults) { 'es6-shim/es6-shim.js', 'reflect-metadata/**/*.+(ts|js|js.map)', 'rxjs/**/*.+(js|js.map)', - '@angular/**/*.+(js|js.map)' + '@angular/**/*.+(js|js.map)'<% if(isMaterial) { %>, + '@angular2-material/**/*.js' <% } %> ] }); }; diff --git a/addon/ng2/blueprints/ng2/files/package.json b/addon/ng2/blueprints/ng2/files/package.json index f477c2e6d1f1..0e92c3f7c5ff 100644 --- a/addon/ng2/blueprints/ng2/files/package.json +++ b/addon/ng2/blueprints/ng2/files/package.json @@ -19,7 +19,8 @@ "@angular/http": "2.0.0-rc.1", "@angular/platform-browser": "2.0.0-rc.1", "@angular/platform-browser-dynamic": "2.0.0-rc.1", - "@angular/router": "2.0.0-rc.1", + "@angular/router": "2.0.0-rc.1",<% if(isMaterial) { %> + "@angular2-material/core": "2.0.0-alpha.5-2", <% } %> "es6-shim": "^0.35.0", "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", diff --git a/addon/ng2/blueprints/ng2/index.js b/addon/ng2/blueprints/ng2/index.js index 146ef7c50023..761fc83f449d 100644 --- a/addon/ng2/blueprints/ng2/index.js +++ b/addon/ng2/blueprints/ng2/index.js @@ -10,7 +10,8 @@ module.exports = { { name: 'source-dir', type: String, default: 'src', aliases: ['sd'] }, { name: 'prefix', type: String, default: 'app', aliases: ['p'] }, { name: 'style', type: String, default: 'css' }, - { name: 'mobile', type: Boolean, default: false } + { name: 'mobile', type: Boolean, default: false }, + { name: 'material', type: Boolean, default: false } ], afterInstall: function (options) { @@ -38,7 +39,8 @@ module.exports = { prefix: options.prefix, styleExt: this.styleExt, refToTypings: refToTypings, - isMobile: options.mobile + isMobile: options.mobile, + isMaterial: options.material }; }, diff --git a/addon/ng2/commands/init.js b/addon/ng2/commands/init.js index f77a1c2852b7..5f4f13e019c0 100644 --- a/addon/ng2/commands/init.js +++ b/addon/ng2/commands/init.js @@ -25,7 +25,8 @@ module.exports = Command.extend({ { name: 'source-dir', type: String, default: 'src', aliases: ['sd'] }, { name: 'style', type: String, default: 'css' }, { name: 'prefix', type: String, default: 'app', aliases: ['p'] }, - { name: 'mobile', type: Boolean, default: false } + { name: 'mobile', type: Boolean, default: false }, + { name: 'material', type: Boolean, default: false } ], anonymousOptions: [''], @@ -103,7 +104,8 @@ module.exports = Command.extend({ sourceDir: commandOptions.sourceDir, style: commandOptions.style, prefix: commandOptions.prefix, - mobile: commandOptions.mobile + mobile: commandOptions.mobile, + material: commandOptions.material }; if (!validProjectName(packageName)) { diff --git a/addon/ng2/commands/new.ts b/addon/ng2/commands/new.ts index 685e4e3e1124..fa7f194eccb7 100644 --- a/addon/ng2/commands/new.ts +++ b/addon/ng2/commands/new.ts @@ -24,7 +24,8 @@ const NewCommand = Command.extend({ { name: 'source-dir', type: String, default: 'src', aliases: ['sd'] }, { name: 'style', type: String, default: 'css' }, { name: 'prefix', type: String, default: 'app', aliases: ['p'] }, - { name: 'mobile', type: Boolean, default: false } + { name: 'mobile', type: Boolean, default: false }, + { name: 'material', type: Boolean, default: false } ], run: function (commandOptions, rawArgs) { diff --git a/lib/config/schema.json b/lib/config/schema.json index d8598052dd14..d14bd5d8c741 100644 --- a/lib/config/schema.json +++ b/lib/config/schema.json @@ -24,7 +24,8 @@ "properties": { "main": "string", "tsconfig": "string", - "mobile": "boolean" + "mobile": "boolean", + "material": "boolean" }, "additionalProperties": false },