feat(@angular/cli): Update generate & new to use schematics #7090

Brocco · 2017-07-21T20:30:55Z

This feature is related to #6593

filipesilva · 2017-07-21T21:08:02Z

packages/@angular/cli/commands/generate.ts

    }
  ],

  anonymousOptions: [
-    '<blueprint>'
+    '<schemtatic>'


schemtatic -> schematic

Please fix.

filipesilva · 2017-07-21T21:08:29Z

packages/@angular/cli/commands/generate.ts

@@ -34,117 +60,109 @@ export default Command.extend({
      description: 'Run through without making any changes.'
    },
    {
-      name: 'lint-fix',


--lint-fix still needs to exist as an option.

This is in and working

filipesilva · 2017-07-21T21:09:26Z

packages/@angular/cli/commands/generate.ts

+  },
+
+  beforeRun: function(rawArgs: string[]) {
+    const collection = getCollection(this.getCollectionName(rawArgs));

    const isHelp = ['--help', '-h'].includes(rawArgs[0]);


Are you printing schematic description on --help?

Possibly, I want to get it all working first before worrying about tweaking the help output.

We definitely want this.

filipesilva · 2017-07-21T21:15:31Z

tests/e2e/tests/build/platform-server.ts

@@ -58,7 +58,7 @@ export default function () {
    `))
    .then(() => silentExec(normalize('node'), 'index.js'))
    .then(() => expectFileToMatch('dist/index.html',
-      new RegExp('<h2 _ngcontent-c0="">Here are some links to help you start: </h2>')))
+      new RegExp('<h2>Here are some links to help you start: </h2>')))


I looked at this with @Brocco and as far as I could tell, _ngcontent-c0="" wasn't in the output of prerendering for the versions I tested. Prerendering was still happening correctly though.

zeiv · 2017-07-22T01:07:28Z

I've been following this feature and addon support for a while now. This looks fantastic! Can't wait to try this out. 👍 👍

hansl

early comments.

hansl · 2017-08-08T18:57:22Z

packages/@angular/cli/models/config.ts

@@ -32,7 +32,7 @@ export class CliConfig extends CliConfigBase<ConfigInterface> {
    const projectConfig = CliConfig.fromProject();
    if (projectConfig) {
      value = projectConfig.get(jsonPath);
-    } else if (CliConfig.globalConfigFilePath() !== CliConfig.configFilePath()) {
+    } else {


Curious about this change. Why is this different now?

This should be in a new PR... it breaks the way we pull config values.

hansl · 2017-08-08T18:57:43Z

packages/@angular/cli/commands/generate.ts

    }
  ],

  anonymousOptions: [
-    '<blueprint>'
+    '<schemtatic>'


Please fix.

hansl · 2017-08-08T19:16:40Z

packages/@angular/cli/commands/generate.ts

-import * as fs from 'fs';
-import * as os from 'os';
-import * as path from 'path';
+import { cyan, yellow } from 'chalk';


It seems like this should be a task, rather than changing the build command directly, and that the new commands should reuse the task and pass in the different name for the schematics from the config.

hansl · 2017-08-08T21:55:30Z

packages/@angular/cli/utilities/schematics.ts

+  let error = false;
+  const loggingQueue: string[] = [];
+
+  dryRunSink.reporter.subscribe((event: DryRunEvent) => {


We should stick to the current format for logging:

hansl · 2017-08-08T22:01:30Z

I'm going to have to add comments about schematics themselves here, unfortunately.

New e2e are generated with MyProjectPage instead of AppPage. We want to at least document that change in the commit and the release notes.

@Brocco Any reason the baseUrl value in tsconfig.app.json and tsconfig.spec.json changed? This can have a real impact on the development workflow for apps.

hansl · 2017-08-08T22:04:58Z

And help remains a big factor. We need to support help right away.

cyrilletuzi · 2017-08-09T07:31:01Z

@hansl I don't see any baseUrl change in this commit, but maybe you mean some relative changes. And as you mention this, I would like to point your attention to this : baseUrl has already been changed twice. Each time, issues emerged (see #5875 for the first change, and #7135).

baseUrl can't change everytime, it should be stable.

intellix · 2017-08-15T12:05:32Z

packages/@angular/cli/tasks/schematic-run.ts

@@ -92,6 +92,7 @@ export default Task.extend({
    });

    return new Promise((resolve, reject) => {
+      console.log(opts);


debugging info?

filipesilva

Minor non-blocking comments, other than that LGTM.

filipesilva · 2017-08-16T13:24:02Z

packages/@angular/cli/tasks/schematic-run.ts

+  };
+  preppedOptions = {
+    ...preppedOptions,
+    ...normalizeOptions(schematic.description.name, keys, options)


Shouldn't this be part of the previous declaration?

no, because the options may have been updated from one statement to the next.

filipesilva · 2017-08-16T13:25:11Z

packages/@angular/cli/tasks/init.ts

+        if (!commandOptions.dryRun) {
+          process.chdir(commandOptions.directory);
+        }
+      })
      .then(function () {
        if (!commandOptions.skipInstall) {


It looks like a lapse that install still happens on a dry run. If only schematicRunTask.run is meant to happen on dry runs, it sounds better to wholly skip the promise chain after that when dry run is on.

hansl · 2017-08-16T17:24:14Z

tests/e2e/tests/generate/component/component-duplicate.ts

      }
    })
    .then(() => ng('generate', 'component', 'test-component'))
    .then((output) => {
-      if (!output.stdout.match(/identical src[\\|\/]app[\\|\/]app.module.ts/)) {
+      if (!output.stdout.match(/ERROR! src[\\|\/]app[\\|\/]test-component[\\|\/]test-component.component.ts already exists./)) {


This could be a merge strategy problem in Schematics itself.

The merge strategy is being passed in via the CLI... the only change to force (pun intended) this behavior is to change --force's default to be true.

This feature is related to angular#6593

hansl

LGTM

angular-automatic-lock-bot · 2019-09-12T09:42:36Z

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

_{This action has been performed automatically by a bot.}

Brocco added the state: WIP label Jul 21, 2017

Brocco requested review from hansl and filipesilva July 21, 2017 20:30

googlebot added the cla: yes label Jul 21, 2017

filipesilva reviewed Jul 21, 2017

View reviewed changes

Brocco force-pushed the schematics branch 2 times, most recently from 925c57e to f46caf2 Compare July 25, 2017 15:43

This was referenced Jul 28, 2017

[Discussion] Socializing ng blueprint changes (changes to files generated by ng new in newer versions of the CLI) #7128

Closed

Include VERSION.full in initial scaffolding of app #7103

Closed

Brocco force-pushed the schematics branch 11 times, most recently from 62836b7 to df6011e Compare August 8, 2017 17:42

hansl suggested changes Aug 8, 2017

View reviewed changes

Brocco force-pushed the schematics branch 2 times, most recently from 1d38827 to 276f73d Compare August 8, 2017 21:45

hansl reviewed Aug 8, 2017

View reviewed changes

Brocco force-pushed the schematics branch 2 times, most recently from 83eba07 to f1e5b13 Compare August 9, 2017 20:08

Brocco force-pushed the schematics branch from 037194b to 3e3c588 Compare August 11, 2017 19:09

This was referenced Aug 14, 2017

Incorrect path on generating new module in app.module #7380

Closed

Ng Generator does not always save components in correct directory #7377

Closed

Brocco force-pushed the schematics branch from 950d898 to b3ad7e9 Compare August 14, 2017 16:45

intellix reviewed Aug 15, 2017

View reviewed changes

Brocco force-pushed the schematics branch 6 times, most recently from 32f4ec1 to d314b8a Compare August 16, 2017 12:37

Brocco removed the state: WIP label Aug 16, 2017

Brocco force-pushed the schematics branch from d314b8a to f9d3cea Compare August 16, 2017 13:18

filipesilva approved these changes Aug 16, 2017

View reviewed changes

filipesilva previously approved these changes Aug 16, 2017

View reviewed changes

hansl reviewed Aug 16, 2017

View reviewed changes

Brocco dismissed filipesilva’s stale review via 6e30b29 August 16, 2017 18:44

Brocco force-pushed the schematics branch from f9d3cea to 6e30b29 Compare August 16, 2017 18:44

feat(@angular/cli): Update generate & new to use schematics

3c3892f

This feature is related to angular#6593

Brocco force-pushed the schematics branch from 6e30b29 to 3c3892f Compare August 16, 2017 18:52

hansl approved these changes Aug 16, 2017

View reviewed changes

Brocco merged commit 128187e into angular:master Aug 16, 2017

This was referenced Aug 21, 2017

Support for third-party generator blueprints #2618

Closed

Angular cli Generates Wrong Directory Path in app.module.ts #7135

Closed

angular-cli: Extensibility #2906

Closed

Brocco mentioned this pull request Aug 29, 2017

feature request: add a cleaner skip test option #7495

Closed

filipesilva mentioned this pull request Aug 30, 2017

Feature Request: Custom Blueprints #2377

Closed

Brocco deleted the schematics branch April 3, 2018 13:13

angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 12, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(@angular/cli): Update generate & new to use schematics #7090

feat(@angular/cli): Update generate & new to use schematics #7090

Brocco commented Jul 21, 2017

filipesilva Jul 21, 2017

hansl Aug 8, 2017

filipesilva Jul 21, 2017

Brocco Aug 16, 2017

filipesilva Jul 21, 2017

Brocco Jul 26, 2017

hansl Aug 8, 2017

filipesilva Jul 21, 2017

zeiv commented Jul 22, 2017

hansl left a comment

hansl Aug 8, 2017

Brocco Aug 8, 2017

hansl Aug 8, 2017

hansl Aug 8, 2017

hansl Aug 8, 2017

hansl commented Aug 8, 2017 •

edited

Loading

hansl commented Aug 8, 2017

cyrilletuzi commented Aug 9, 2017

intellix Aug 15, 2017

filipesilva left a comment

filipesilva Aug 16, 2017

Brocco Aug 16, 2017

filipesilva Aug 16, 2017

hansl Aug 16, 2017

Brocco Aug 16, 2017

hansl left a comment

angular-automatic-lock-bot bot commented Sep 12, 2019

feat(@angular/cli): Update generate & new to use schematics #7090

feat(@angular/cli): Update generate & new to use schematics #7090

Conversation

Brocco commented Jul 21, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zeiv commented Jul 22, 2017

hansl left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hansl commented Aug 8, 2017 • edited Loading

hansl commented Aug 8, 2017

cyrilletuzi commented Aug 9, 2017

Choose a reason for hiding this comment

filipesilva left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hansl left a comment

Choose a reason for hiding this comment

angular-automatic-lock-bot bot commented Sep 12, 2019

hansl commented Aug 8, 2017 •

edited

Loading