Update ember template lint and format

mirego · Feb 23, 2023 · 0246450 · 0246450
1 parent 487d833
commit 0246450
Show file tree

Hide file tree

Showing 204 changed files with 7,347 additions and 6,502 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -2,6 +2,12 @@
   "singleQuote": true,
   "bracketSpacing": false,
   "overrides": [
+    {
+      "files": ["*.hbs"],
+      "options": {
+        "printWidth": 180
+      }
+    },
     {
       "files": "*.svg",
       "options": {

diff --git a/Makefile b/Makefile
@@ -91,11 +91,11 @@ lint-eslint:
 
 .PHONY: lint-prettier
 lint-prettier:
-	npx prettier --check './{webapp,jipt,cli}/!(node_modules)/**/*.{js,ts,json,svg,scss,md}' '*.md'
+	npx prettier --check './{webapp,jipt,cli}/!(node_modules)/**/*.{js,ts,json,svg,scss,md,hbs}' '*.md'
 
 .PHONY: lint-template-hbs
 lint-template-hbs:
-	npx ember-template-lint './webapp/app/**/*.hbs' --config-path './webapp/.template-lintrc'
+	npx ember-template-lint 'webapp/app/**/*.hbs' --config-path './webapp/.template-lintrc'
 
 .PHONY: type-check
 type-check: ## Type-check typescript files
@@ -127,7 +127,7 @@ format-elixir:
 
 .PHONY: format-prettier
 format-prettier:
-	npx prettier --write --single-quote --no-bracket-spacing './{webapp,jipt,cli}/!(node_modules)/**/*.{js,ts,json,svg,scss,md}' '*.md'
+	npx prettier --write --single-quote --no-bracket-spacing './{webapp,jipt,cli}/!(node_modules)/**/*.{js,ts,json,svg,scss,md,hbs}' '*.md'
 
 # Development targets
 # -------------------

diff --git a/cli/src/base.ts b/cli/src/base.ts
@@ -50,6 +50,8 @@ export default abstract class extends Command {
     const config = this.projectConfig.config;
 
     const fetcher = new ProjectFetcher();
-    this.project = await fetcher.fetch(config);
+    const response = await fetcher.fetch(config);
+    this.project = response.project;
+    this.viewer = response;
   }
 }