From f7a987b89216833c4d24c3023a0025f962c9480e Mon Sep 17 00:00:00 2001 From: mrmeku Date: Wed, 7 Nov 2018 17:13:19 +0000 Subject: [PATCH] feat(formatting): Update prettier to 1.15 --- .../src/app/app.component.html | 29 +++- apps/angular-console/src/index.html | 28 ++- .../src/lib/action-bar.component.html | 163 ++++++++++++++---- .../lib/extension/extension.component.html | 28 ++- .../lib/extensions/extensions.component.html | 6 +- .../lib/schematic/schematic.component.html | 27 +-- .../lib/schematics/schematics.component.html | 6 +- .../src/lib/install-node-js.component.html | 106 ++++++++---- .../lib/npmscript/npmscript.component.html | 22 ++- .../src/lib/target/target.component.html | 23 ++- .../src/lib/targets/targets.component.html | 6 +- .../src/lib/settings/settings.component.html | 21 ++- .../new-workspace.component.html | 131 ++++++++++---- .../src/lib/projects/projects.component.html | 18 +- .../lib/workspace/workspace.component.html | 51 +++++- .../lib/workspaces/workspaces.component.html | 119 ++++++++++--- .../build-status/build-status.component.html | 67 ++++--- .../command-output.component.html | 99 ++++++++--- .../contextual-action-bar.component.html | 161 +++++++++++++---- .../data-collection.component.html | 3 +- libs/ui/src/lib/flags/flags.component.html | 137 ++++++++++----- .../task-runner/task-runner.component.html | 27 ++- .../task-selector.component.html | 62 +++++-- .../src/lib/terminal/terminal.component.html | 4 +- .../test-status/test-status.component.html | 63 ++++--- package-scripts.js | 6 +- package.json | 2 +- server/src/api/detailed-status-calculator.ts | 4 +- yarn.lock | 10 +- 29 files changed, 1049 insertions(+), 380 deletions(-) diff --git a/apps/angular-console/src/app/app.component.html b/apps/angular-console/src/app/app.component.html index 73fdf2459b..e6ade4deea 100644 --- a/apps/angular-console/src/app/app.component.html +++ b/apps/angular-console/src/app/app.component.html @@ -1,11 +1,20 @@ - + - +
- - {{ link.icon }} - + {{ link.icon }} {{ link.text }}
@@ -13,9 +22,15 @@
- + -
+
diff --git a/apps/angular-console/src/index.html b/apps/angular-console/src/index.html index 62c255e6e8..d16b5e5f5f 100644 --- a/apps/angular-console/src/index.html +++ b/apps/angular-console/src/index.html @@ -1,17 +1,15 @@ - + - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/libs/feature-action-bar/src/lib/action-bar.component.html b/libs/feature-action-bar/src/lib/action-bar.component.html index fa22902dff..091e14650a 100644 --- a/libs/feature-action-bar/src/lib/action-bar.component.html +++ b/libs/feature-action-bar/src/lib/action-bar.component.html @@ -1,82 +1,169 @@ -
- -
+
+
- -
+ +
- - {{ actions.length }} Tasks - -
- - - + + - - + + done error - + clear - + - - -

- {{ action.command }} -

+

{{ action.command }}

- - + + {{ action.workspace }}

- -
+
+ [commandResponse]="expandedAction?.command | async" + >
diff --git a/libs/feature-extensions/src/lib/extension/extension.component.html b/libs/feature-extensions/src/lib/extension/extension.component.html index 6ef855b6a5..250312883f 100644 --- a/libs/feature-extensions/src/lib/extension/extension.component.html +++ b/libs/feature-extensions/src/lib/extension/extension.component.html @@ -1,28 +1,24 @@ - + -
- -
- - +
+ +
+ + Click the Add button to install this extension. -
-
- {{ extension.name }} -
-
- {{ extension.description }} -
+
{{ extension.name }}
+
{{ extension.description }}
 diff --git a/libs/feature-extensions/src/lib/extensions/extensions.component.html b/libs/feature-extensions/src/lib/extensions/extensions.component.html index d504d9049c..4248feff82 100644 --- a/libs/feature-extensions/src/lib/extensions/extensions.component.html +++ b/libs/feature-extensions/src/lib/extensions/extensions.component.html @@ -1,3 +1,7 @@ - + diff --git a/libs/feature-generate/src/lib/schematic/schematic.component.html b/libs/feature-generate/src/lib/schematic/schematic.component.html index d1c6c5d2d3..99e54faeb1 100644 --- a/libs/feature-generate/src/lib/schematic/schematic.component.html +++ b/libs/feature-generate/src/lib/schematic/schematic.component.html @@ -1,14 +1,21 @@ - - - - + + + - - Click the Generate button to start this task. - + Click the Generate button to start this task. diff --git a/libs/feature-generate/src/lib/schematics/schematics.component.html b/libs/feature-generate/src/lib/schematics/schematics.component.html index 8fb5b5abec..71bfb08c41 100644 --- a/libs/feature-generate/src/lib/schematics/schematics.component.html +++ b/libs/feature-generate/src/lib/schematics/schematics.component.html @@ -1,3 +1,7 @@ - + diff --git a/libs/feature-install-node-js/src/lib/install-node-js.component.html b/libs/feature-install-node-js/src/lib/install-node-js.component.html index f2000c9881..a8674f87f1 100644 --- a/libs/feature-install-node-js/src/lib/install-node-js.component.html +++ b/libs/feature-install-node-js/src/lib/install-node-js.component.html @@ -1,49 +1,97 @@ -
+
-
- +
+
- - - -
- {{ installNodeJsStatus.downloadPercentage !== null ? 'Downloading Node...' : 'Running Installer...' }} -
+ + + +
+ {{ + installNodeJsStatus.downloadPercentage !== null + ? 'Downloading Node...' + : 'Running Installer...' + }} +
-
Node JS installation not successful
-
- The installation did not finish successfully. Would you like to try again? -
-
- -
+
Node JS installation not successful
+
+ The installation did not finish successfully. Would you like to try + again? +
+
+ +
Just a little set up
- Angular Console requires that Node JS be installed on your computer. We can help you do - that! + Angular Console requires that Node JS be installed on your computer. + We can help you do that!
-
+
diff --git a/libs/feature-run/src/lib/npmscript/npmscript.component.html b/libs/feature-run/src/lib/npmscript/npmscript.component.html index da5b707bf9..7c57d4a722 100644 --- a/libs/feature-run/src/lib/npmscript/npmscript.component.html +++ b/libs/feature-run/src/lib/npmscript/npmscript.component.html @@ -1,9 +1,19 @@ - - - + + + diff --git a/libs/feature-run/src/lib/target/target.component.html b/libs/feature-run/src/lib/target/target.component.html index b674dd5509..3d7216b586 100644 --- a/libs/feature-run/src/lib/target/target.component.html +++ b/libs/feature-run/src/lib/target/target.component.html @@ -1,9 +1,20 @@ - - - + + + diff --git a/libs/feature-run/src/lib/targets/targets.component.html b/libs/feature-run/src/lib/targets/targets.component.html index fc9aacb7e0..18b990f245 100644 --- a/libs/feature-run/src/lib/targets/targets.component.html +++ b/libs/feature-run/src/lib/targets/targets.component.html @@ -1,3 +1,7 @@ - + diff --git a/libs/feature-settings/src/lib/settings/settings.component.html b/libs/feature-settings/src/lib/settings/settings.component.html index 636246455a..d130b3a473 100644 --- a/libs/feature-settings/src/lib/settings/settings.component.html +++ b/libs/feature-settings/src/lib/settings/settings.component.html @@ -3,26 +3,29 @@

General settings

-

- Send anonymous usage data -

+

Send anonymous usage data

- Help make Angular Console better by sending anonymous usage data to the Angular Console team. + Help make Angular Console better by sending anonymous usage data to + the Angular Console team.

- +

Features

-

- Use detailed status -

+

Use detailed status

Enables visual status for certain tasks (e.g. build, test, etc.).

- +
diff --git a/libs/feature-workspaces/src/lib/new-workspace/new-workspace.component.html b/libs/feature-workspaces/src/lib/new-workspace/new-workspace.component.html index 9774ba8445..1dcdcb4891 100644 --- a/libs/feature-workspaces/src/lib/new-workspace/new-workspace.component.html +++ b/libs/feature-workspaces/src/lib/new-workspace/new-workspace.component.html @@ -1,17 +1,40 @@

Create a new workspace

- +
- - + + Select a parent directory
- + Parent directory - + folder Choose a different directory by clicking above @@ -19,51 +42,101 @@

Create a new workspace
- - Name your new workspace + + Name your new workspace
- + Workspace Name - + - {{ ngNewForm.value.path + "/" + control.value | normalizePath }} already exists + {{ + ngNewForm.value.path + '/' + control.value | normalizePath + }} + already exists create_new_folder - Workspace path will be {{ ngNewForm.value.path + "/" + control.value | normalizePath }} + Workspace path will be + {{ ngNewForm.value.path + '/' + control.value | normalizePath }}
- - Choose a schematic set + + Choose a schematic set
- - + +

{{ n.name }}

-

{{ n.description }}

+

{{ n.description }}
- - Set schematic options (coming soon!) + + Set schematic options (coming soon!)
- - +
- + - diff --git a/libs/feature-workspaces/src/lib/projects/projects.component.html b/libs/feature-workspaces/src/lib/projects/projects.component.html index 4a2e038146..4123392978 100644 --- a/libs/feature-workspaces/src/lib/projects/projects.component.html +++ b/libs/feature-workspaces/src/lib/projects/projects.component.html @@ -1,5 +1,5 @@ -
- +
+
{{ p.projectType }}
@@ -8,8 +8,18 @@ folder_open {{ p.root }}
-
-
diff --git a/libs/feature-workspaces/src/lib/workspace/workspace.component.html b/libs/feature-workspaces/src/lib/workspace/workspace.component.html index 53cfdb0992..c6180c1b5b 100644 --- a/libs/feature-workspaces/src/lib/workspace/workspace.component.html +++ b/libs/feature-workspaces/src/lib/workspace/workspace.component.html @@ -1,18 +1,51 @@
-
-
-
-
+
diff --git a/libs/feature-workspaces/src/lib/workspaces/workspaces.component.html b/libs/feature-workspaces/src/lib/workspaces/workspaces.component.html index ea6fbea8f9..8e18a73e66 100644 --- a/libs/feature-workspaces/src/lib/workspaces/workspaces.component.html +++ b/libs/feature-workspaces/src/lib/workspaces/workspaces.component.html @@ -1,15 +1,31 @@ - +

Favorite Workspaces

- - favorite + + favorite

{{ w.name }}

-

{{ w.path | normalizePath }}

- clear +

{{ w.path | normalizePath }}

+ clear
@@ -18,25 +34,61 @@

{{ w.name }}

Recently Opened Workspaces

- - favorite_border + + favorite_border

{{ w.name }}

-

{{ w.path | normalizePath }}

- clear +

{{ w.path | normalizePath }}

+ clear
-
- - @@ -44,24 +96,47 @@

{{ w.name }}

-
+
-
- +
+
Let's Get Started
Create a new Angular workspace or continue working on an existing one.
-
- - -
-
+
Task has not start yet
- - - - + + + +
-
- +
+
- + - + Running task... (This may take a while) @@ -49,7 +100,9 @@ error - Task failed. Please check terminal output for more details. + Task failed. Please check terminal output for more details. diff --git a/libs/ui/src/lib/contextual-action-bar/contextual-action-bar.component.html b/libs/ui/src/lib/contextual-action-bar/contextual-action-bar.component.html index 7991a38302..1bbae26485 100644 --- a/libs/ui/src/lib/contextual-action-bar/contextual-action-bar.component.html +++ b/libs/ui/src/lib/contextual-action-bar/contextual-action-bar.component.html @@ -1,68 +1,165 @@ - + -
-
- - {{ breadcrumb.title }} - | + + {{ breadcrumb.title }} |
-
- - -
-
- clear +
+ clear
{{ contextualActions.contextTitle }}
-
- +
+ - - -
- + diff --git a/libs/ui/src/lib/data-collection/data-collection.component.html b/libs/ui/src/lib/data-collection/data-collection.component.html index b063f17a4c..2b370faebb 100644 --- a/libs/ui/src/lib/data-collection/data-collection.component.html +++ b/libs/ui/src/lib/data-collection/data-collection.component.html @@ -1,6 +1,7 @@

- Help make Angular Console better by sending anonymous usage data to the Angular Console team. + Help make Angular Console better by sending anonymous usage data to the + Angular Console team.

diff --git a/libs/ui/src/lib/flags/flags.component.html b/libs/ui/src/lib/flags/flags.component.html index a9f0dd6483..9e8c6cc8aa 100644 --- a/libs/ui/src/lib/flags/flags.component.html +++ b/libs/ui/src/lib/flags/flags.component.html @@ -1,94 +1,145 @@
-
-
- Configuration -
- +
+
Configuration
+ Default - {{ config.name | titlecase }} + {{ config.name | titlecase }}
- + - - Important fields - Optional fields + + Important fields + Optional fields Fields -
- +
- - {{ field.name }} - + -- - - true - - - false - + true + false - {{ field.description }} - Required. - (Default: {{ field.defaultValue }}) + Required. + (Default: {{ field.defaultValue }})
- - {{ - field.completionValues ? 'search' : 'create' }} + + {{ field.completionValues ? 'search' : 'create' }}
- {{ field.name }} - - - close_outline + + + close_outline - + {{ completionValue.display || completionValue.value }} - {{ field.description }} - Required. - (Default: {{ field.defaultValue }}) + Required. + (Default: {{ field.defaultValue }}) -
-
diff --git a/libs/ui/src/lib/task-runner/task-runner.component.html b/libs/ui/src/lib/task-runner/task-runner.component.html index 83673ec319..a075699ea1 100644 --- a/libs/ui/src/lib/task-runner/task-runner.component.html +++ b/libs/ui/src/lib/task-runner/task-runner.component.html @@ -1,15 +1,32 @@ -
+
-
+
-
-
+
+
{{ terminalWindowTitle }}
-
diff --git a/libs/ui/src/lib/task-selector/task-selector.component.html b/libs/ui/src/lib/task-selector/task-selector.component.html index 2ed44c1fd9..7099864e7b 100644 --- a/libs/ui/src/lib/task-selector/task-selector.component.html +++ b/libs/ui/src/lib/task-selector/task-selector.component.html @@ -1,19 +1,54 @@
-
-
- - {{ taskFilterFormControl.value ? 'clear' : 'filter_list' }} +
+
+ + {{ taskFilterFormControl.value ? 'clear' : 'filter_list' }}
- - - + + +

{{ collection.collectionName }}

- +

{{ t.taskName }}

{{ t.taskDescription }} @@ -22,7 +57,12 @@

{{ t.taskName }}

 -
+
filter_list
No matches for "{{ taskFilterFormControl.value }}"
@@ -30,7 +70,5 @@

{{ t.taskName }}

-
- -
+
diff --git a/libs/ui/src/lib/terminal/terminal.component.html b/libs/ui/src/lib/terminal/terminal.component.html index 8973c446a8..54faadfc7a 100644 --- a/libs/ui/src/lib/terminal/terminal.component.html +++ b/libs/ui/src/lib/terminal/terminal.component.html @@ -1,4 +1,2 @@
$ {{ command }}
-
-
-
+
diff --git a/libs/ui/src/lib/test-status/test-status.component.html b/libs/ui/src/lib/test-status/test-status.component.html index 2b2ecf8f4a..9332d47db4 100644 --- a/libs/ui/src/lib/test-status/test-status.component.html +++ b/libs/ui/src/lib/test-status/test-status.component.html @@ -13,16 +13,27 @@
- + Starting... - + Building... ({{ status?.buildProgress }}%) - - Running tests ({{ status?.success + status?.failure }}/{{ status?.total }})... + + Running tests ({{ status?.success + status?.failure }}/{{ + status?.total + }})... check_circle @@ -39,40 +50,48 @@ warning
- Test cancelled ({{ status?.failure }} failed, {{ status?.success }} passed) + Test cancelled ({{ status?.failure }} failed, + {{ status?.success }} passed)
- + error -
- Build failed -
+
Build failed
 - -
- Watching for changes... -
+ *ngIf=" + ['test_failure', 'test_success'].includes(status?.testStatus) && + commandStatus === 'in-progress' + " + > + +
Watching for changes...
-

- Errors -

- +

Errors

+ {{ error }} -

- Failed tests -

+

Failed tests

- + {{ error.label }} diff --git a/package-scripts.js b/package-scripts.js index d4db7d7d83..1ef9e7dd6a 100644 --- a/package-scripts.js +++ b/package-scripts.js @@ -31,9 +31,9 @@ module.exports = { prod: 'ng serve angular-console --prod' }, format: { - default: 'nx format:write', - write: 'nx format:write', - check: 'nx format:check' + default: 'prettier **/*.ts **/*.css **/*.scss **/*.html --write', + write: 'prettier **/*.ts **/*.css **/*.scss **/*.html --write', + check: 'prettier --list-different **/*.ts **/*.css **/*.scss **/*.html --write' }, lint: npsUtils.series('nx lint', 'nx affected:lint --base=master --parallel'), test: 'nx affected:test --base=master' diff --git a/package.json b/package.json index 5108bb0d54..0509f109f9 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "node-pty-prebuilt": "0.7.3", "nps": "5.9.3", "nps-utils": "1.7.0", - "prettier": "1.13.7", + "prettier": "1.15.1", "protractor": "5.3.0", "resolve": "1.8.1", "rxjs": "6.3.3", diff --git a/server/src/api/detailed-status-calculator.ts b/server/src/api/detailed-status-calculator.ts index 1c1ccf0826..b877b96ced 100644 --- a/server/src/api/detailed-status-calculator.ts +++ b/server/src/api/detailed-status-calculator.ts @@ -411,8 +411,8 @@ export class TestDetailedStatusCalculator ? 'build_failure' : 'test_cancelled' : failure > 0 - ? 'test_failure' - : 'test_success' + ? 'test_failure' + : 'test_success' }; } } diff --git a/yarn.lock b/yarn.lock index 2bfe4ed14e..095065c941 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9601,16 +9601,16 @@ preserve@^0.2.0: resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= -prettier@1.13.7: - version "1.13.7" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281" - integrity sha512-KIU72UmYPGk4MujZGYMFwinB7lOf2LsDNGSOC8ufevsrPLISrZbNJlWstRi3m0AMuszbH+EFSQ/r6w56RSPK6w== - prettier@1.14.3: version "1.14.3" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.3.tgz#90238dd4c0684b7edce5f83b0fb7328e48bd0895" integrity sha512-qZDVnCrnpsRJJq5nSsiHCE3BYMED2OtsI+cmzIzF1QIfqm5ALf8tEJcO27zV1gKNKRPdhjO0dNWnrzssDQ1tFg== +prettier@1.15.1: + version "1.15.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.1.tgz#06c67106afb1b40e74b002353b2079cc7e0e67bf" + integrity sha512-4rgV2hyc/5Pk0XHH4VjJWHRgVjgRbpMfLQjREAhHBtyW1UvTFkjJEsueGYNYYZd9mn97K+1qv0EBwm11zoaSgA== + pretty-bytes@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-1.0.4.tgz#0a22e8210609ad35542f8c8d5d2159aff0751c84"