[ZEPPELIN-6305] Modify package.json so that lint and prettier cover projects folder

zeppelin-web-angular/.prettierignore

@@ -1,3 +1,9 @@
 **/*.md
 **/*.less
 **/*.svg
+
+dist/*
+node/*
+node_modules/*
+target/*
+tslint-rules/**/*.js

zeppelin-web-angular/angular.json

@@ -76,11 +76,7 @@
               "./node_modules/github-markdown-css/github-markdown.css"
             ],
             "stylePreprocessorOptions": {
-              "includePaths": [
-                "src/styles/theme",
-                "src/styles/theme/dark",
-                "src/styles/theme/light"
-              ]
+              "includePaths": ["src/styles/theme", "src/styles/theme/dark", "src/styles/theme/light"]
             },
             "scripts": [
               "node_modules/mathjax/MathJax.js",
@@ -134,26 +130,16 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "src/tsconfig.spec.json",
             "karmaConfig": "src/karma.conf.js",
-            "styles": [
-              "src/styles.less"
-            ],
+            "styles": ["src/styles.less"],
             "scripts": [],
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ]
+            "assets": ["src/favicon.ico", "src/assets"]
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
-            "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
+            "exclude": ["**/node_modules/**"]
           }
         }
       }
@@ -179,9 +165,7 @@
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": "e2e/tsconfig.json",
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
           }
         }
       }
@@ -210,13 +194,8 @@
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
-            "tsConfig": [
-              "projects/zeppelin-helium/tsconfig.lib.json",
-              "projects/zeppelin-helium/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "tsConfig": ["projects/zeppelin-helium/tsconfig.lib.json", "projects/zeppelin-helium/tsconfig.spec.json"],
+            "exclude": ["**/node_modules/**"]
           }
         }
       }
@@ -249,9 +228,7 @@
               "projects/helium-vis-example/tsconfig.lib.json",
               "projects/helium-vis-example/tsconfig.spec.json"
             ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
           }
         }
       }
@@ -284,9 +261,7 @@
               "projects/zeppelin-visualization/tsconfig.lib.json",
               "projects/zeppelin-visualization/tsconfig.spec.json"
             ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
           }
         }
       }
@@ -315,17 +290,12 @@
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
-            "tsConfig": [
-              "projects/zeppelin-sdk/tsconfig.lib.json",
-              "projects/zeppelin-sdk/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "tsConfig": ["projects/zeppelin-sdk/tsconfig.lib.json", "projects/zeppelin-sdk/tsconfig.spec.json"],
+            "exclude": ["**/node_modules/**"]
           }
         }
       }
     }
   },
   "defaultProject": "zeppelin"
-}
+}

zeppelin-web-angular/e2e/protractor.conf.js

@@ -21,11 +21,9 @@ const { SpecReporter } = require('jasmine-spec-reporter');
  */
 exports.config = {
   allScriptsTimeout: 11000,
-  specs: [
-    './src/**/*.e2e-spec.ts'
-  ],
+  specs: ['./src/**/*.e2e-spec.ts'],
   capabilities: {
-    'browserName': 'chrome'
+    browserName: 'chrome'
   },
   directConnect: true,
   baseUrl: 'http://localhost:4200/',
@@ -41,4 +39,4 @@ exports.config = {
     });
     jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
   }
-};
+};

zeppelin-web-angular/e2e/src/app.e2e-spec.ts

@@ -27,9 +27,14 @@ describe('workspace-project App', () => {
 
   afterEach(async () => {
     // Assert that there are no errors emitted from the browser
-    const logs = await browser.manage().logs().get(logging.Type.BROWSER);
-    expect(logs).not.toContain(jasmine.objectContaining({
-      level: logging.Level.SEVERE
-    } as logging.Entry));
+    const logs = await browser
+      .manage()
+      .logs()
+      .get(logging.Type.BROWSER);
+    expect(logs).not.toContain(
+      jasmine.objectContaining({
+        level: logging.Level.SEVERE
+      } as logging.Entry)
+    );
   });
 });

zeppelin-web-angular/e2e/tsconfig.json

@@ -4,10 +4,6 @@
     "outDir": "../out-tsc/e2e",
     "module": "commonjs",
     "target": "es5",
-    "types": [
-      "jasmine",
-      "jasminewd2",
-      "node"
-    ]
+    "types": ["jasmine", "jasminewd2", "node"]
   }
 }

zeppelin-web-angular/karma.conf.js

@@ -13,7 +13,7 @@
 // Karma configuration file, see link for more information
 // https://karma-runner.github.io/1.0/config/configuration-file.html
 
-module.exports = function (config) {
+module.exports = function(config) {
   config.set({
     basePath: '',
     frameworks: ['jasmine', '@angular-devkit/build-angular'],

zeppelin-web-angular/package.json

@@ -13,7 +13,8 @@
     "build-project:vis": " ng build --project zeppelin-visualization",
     "build-project:helium": "ng build --project zeppelin-helium",
     "test": "ng test",
-    "lint": "ng lint && prettier --check \"src/**/*.{ts,js,css,html}\"",
+    "lint": "ng lint && tslint tslint-rules/*.ts && prettier --check \"**/*.{ts,js,json,css,html}\"",
+    "lint:fix": "ng lint --fix && tslint --fix tslint-rules/*.ts && prettier --write \"**/*.{ts,js,json,css,html}\"",
     "e2e": "ng e2e"
   },
   "engines": {
@@ -88,12 +89,13 @@
     "typescript": "3.8.3"
   },
   "lint-staged": {
-    "src/**/*.{ts,js,json}": [
+    "**/*.ts": [
+      "tslint --fix",
       "./node_modules/.bin/prettier --write",
       "git add"
     ],
-    "src/**/*.ts": [
-      "tslint --project src/tslint.json --fix",
+    "**/*.{js,json,css,html}": [
+      "./node_modules/.bin/prettier --write",
       "git add"
     ]
   },

zeppelin-web-angular/projects/helium-vis-example/karma.conf.js

@@ -13,7 +13,7 @@
 // Karma configuration file, see link for more information
 // https://karma-runner.github.io/1.0/config/configuration-file.html
 
-module.exports = function (config) {
+module.exports = function(config) {
   config.set({
     basePath: '',
     frameworks: ['jasmine', '@angular-devkit/build-angular'],

zeppelin-web-angular/projects/helium-vis-example/ng-package.json

@@ -4,4 +4,4 @@
   "lib": {
     "entryFile": "src/public-api.ts"
   }
-}
+}

zeppelin-web-angular/projects/helium-vis-example/package.json

@@ -5,4 +5,4 @@
     "@angular/common": "^8.2.9",
     "@angular/core": "^8.2.9"
   }
-}
+}

zeppelin-web-angular/projects/helium-vis-example/src/json-vis.module.ts

@@ -20,4 +20,4 @@ import { JsonVisComponent } from './json-vis.component';
   entryComponents: [JsonVisComponent],
   exports: [JsonVisComponent]
 })
-export class JsonVisModule { }
+export class JsonVisModule {}

zeppelin-web-angular/projects/helium-vis-example/src/json-visualization.ts

@@ -36,7 +36,8 @@ export class JsonVisualization extends Visualization<JsonVisComponent> {
     private portalOutlet: CdkPortalOutlet,
     private viewContainerRef: ViewContainerRef,
     config: GraphConfig,
-    private componentFactoryResolver?: ComponentFactoryResolver) {
+    private componentFactoryResolver?: ComponentFactoryResolver
+  ) {
     super(config);
   }
 

zeppelin-web-angular/projects/helium-vis-example/src/test.ts

@@ -13,20 +13,14 @@
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
 import { getTestBed } from '@angular/core/testing';
-import {
-  platformBrowserDynamicTesting,
-  BrowserDynamicTestingModule
-} from '@angular/platform-browser-dynamic/testing';
+import { platformBrowserDynamicTesting, BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing';
 // tslint:disable-next-line:no-import-side-effect
 import 'zone.js/dist/zone';
 // tslint:disable-next-line:no-import-side-effect
 import 'zone.js/dist/zone-testing';
 
 // First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
-);
+getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
 
 declare const require: NodeJS.Require;
 

zeppelin-web-angular/projects/helium-vis-example/tsconfig.lib.json

@@ -6,10 +6,7 @@
     "declaration": true,
     "inlineSources": true,
     "types": [],
-    "lib": [
-      "dom",
-      "es2018"
-    ]
+    "lib": ["dom", "es2018"]
   },
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
@@ -19,8 +16,5 @@
     "strictInjectionParameters": true,
     "enableResourceInlining": true
   },
-  "exclude": [
-    "src/test.ts",
-    "**/*.spec.ts"
-  ]
+  "exclude": ["src/test.ts", "**/*.spec.ts"]
 }

zeppelin-web-angular/projects/helium-vis-example/tsconfig.spec.json

@@ -2,16 +2,8 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/spec",
-    "types": [
-      "jasmine",
-      "node"
-    ]
+    "types": ["jasmine", "node"]
   },
-  "files": [
-    "src/test.ts"
-  ],
-  "include": [
-    "**/*.spec.ts",
-    "**/*.d.ts"
-  ]
+  "files": ["src/test.ts"],
+  "include": ["**/*.spec.ts", "**/*.d.ts"]
 }

zeppelin-web-angular/projects/helium-vis-example/tslint.json

@@ -1,17 +1,7 @@
 {
   "extends": "../../tslint.json",
   "rules": {
-    "directive-selector": [
-      true,
-      "attribute",
-      "lib",
-      "camelCase"
-    ],
-    "component-selector": [
-      true,
-      "element",
-      "lib",
-      "kebab-case"
-    ]
+    "directive-selector": [true, "attribute", "lib", "camelCase"],
+    "component-selector": [true, "element", "lib", "kebab-case"]
   }
 }

zeppelin-web-angular/projects/zeppelin-helium/karma.conf.js

@@ -13,7 +13,7 @@
 // Karma configuration file, see link for more information
 // https://karma-runner.github.io/1.0/config/configuration-file.html
 
-module.exports = function (config) {
+module.exports = function(config) {
   config.set({
     basePath: '',
     frameworks: ['jasmine', '@angular-devkit/build-angular'],

zeppelin-web-angular/projects/zeppelin-helium/ng-package.json

@@ -4,4 +4,4 @@
   "lib": {
     "entryFile": "src/public-api.ts"
   }
-}
+}

zeppelin-web-angular/projects/zeppelin-helium/package.json

@@ -9,4 +9,4 @@
     "rxjs": "~6.5.3",
     "ng-zorro-antd": "^8.3.0"
   }
-}
+}

zeppelin-web-angular/projects/zeppelin-helium/src/common-deps.ts

@@ -37,7 +37,7 @@ export const COMMON_DEPS = {
   '@zeppelin/sdk': sdk,
   '@zeppelin/visualization': visualization,
   '@zeppelin/helium': zeppelinHelium,
-  'lodash': lodash,
+  lodash: lodash,
   'ng-zorro-antd': ngZorro,
   rxjs,
   tslib

zeppelin-web-angular/projects/zeppelin-helium/src/test.ts

@@ -13,10 +13,7 @@
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
 import { getTestBed } from '@angular/core/testing';
-import {
-  platformBrowserDynamicTesting,
-  BrowserDynamicTestingModule
-} from '@angular/platform-browser-dynamic/testing';
+import { platformBrowserDynamicTesting, BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing';
 // tslint:disable-next-line:no-import-side-effect
 import 'zone.js/dist/zone';
 // tslint:disable-next-line:no-import-side-effect
@@ -25,10 +22,7 @@ import 'zone.js/dist/zone-testing';
 declare const require: NodeJS.Require;
 
 // First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
-);
+getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);
 // And load the modules.

zeppelin-web-angular/projects/zeppelin-helium/src/zeppelin-helium.module.ts

@@ -13,4 +13,4 @@
 import { NgModule } from '@angular/core';
 
 @NgModule({})
-export class ZeppelinHeliumModule { }
+export class ZeppelinHeliumModule {}