REF compodoc generation in builder

LuccaSA · Dec 29, 2022 · 589d306 · 589d306
1 parent 6051ee0
commit 589d306
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 29 deletions.
diff --git a/.storybook/tsconfig.json b/.storybook/tsconfig.json
@@ -1,14 +1,10 @@
 {
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "types": [
-      "node"
-    ],
-    "allowSyntheticDefaultImports": true
-  },
-  "exclude": ["../node_modules/**/*", "../dist/**/*", "../packages/**/*.spec.ts", "../stories/**/*.spec.ts"],
-  "include": ["../packages/**/*", "../stories/**/*", "./msw/**/*"],
-  "files": [
-    "./typings.d.ts"
-  ]
+	"extends": "../tsconfig.json",
+	"compilerOptions": {
+		"types": ["node"],
+		"allowSyntheticDefaultImports": true
+	},
+	"exclude": ["../packages/**/*.spec.ts", "../stories/**/*.spec.ts"],
+	"include": ["../packages/**/*", "../stories/**/*", "./msw/**/*"],
+	"files": ["./typings.d.ts"]
 }
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -55,7 +55,6 @@ node(label: CI.getSelectedNode(script:this)) {
 			if (isPR || isRc || isMaster) {
 				loggableStage('Deploy') {
 					echo "deploying ${branchName}"
-					bat "npm run compodoc"
 					bat "npm run build-storybook"
 					bat "npm run build-compodoc"
 					powershell "Remove-Item \\\\RBX1-SH1-TECH\\lucca-front\\${branchName}\\storybook -Recurse"

diff --git a/angular.json b/angular.json
@@ -3,9 +3,7 @@
   "version": 1,
   "cli": {
     "packageManager": "npm",
-    "schematicCollections": [
-      "@angular-eslint/schematics"
-    ],
+    "schematicCollections": ["@angular-eslint/schematics"],
     "analytics": false
   },
   "newProjectRoot": "packages/ng",
@@ -17,8 +15,8 @@
         "build": {
           "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
-              "project": "packages/ng/ng-package.json",
-              "tsConfig": "packages/ng/tsconfig.lib.prod.json"
+            "project": "packages/ng/ng-package.json",
+            "tsConfig": "packages/ng/tsconfig.lib.prod.json"
           }
         },
         "lint": {
@@ -31,28 +29,24 @@
           "builder": "@storybook/angular:start-storybook",
           "options": {
             "browserTarget": "ng:build",
-            "compodoc": false,
+            "compodoc": true,
+            "compodocArgs": ["-p", "./tsconfig.compodoc-json.json", "-e", "json", "-d", ".storybook"],
             "port": 6006,
             "styles": [".storybook/styles.scss"],
             "stylePreprocessorOptions": {
-              "includePaths": [
-                "packages/ng/styles",
-                "node_modules"
-              ]
+              "includePaths": ["packages/ng/styles", "node_modules"]
             }
           }
         },
         "build-storybook": {
           "builder": "@storybook/angular:build-storybook",
           "options": {
             "browserTarget": "ng:build",
-            "compodoc": false,
+            "compodoc": true,
+            "compodocArgs": ["-p", "./tsconfig.compodoc-json.json", "-e", "json", "-d", ".storybook"],
             "styles": [".storybook/styles.scss"],
             "stylePreprocessorOptions": {
-              "includePaths": [
-                "packages/ng/styles",
-                "node_modules"
-              ]
+              "includePaths": ["packages/ng/styles", "node_modules"]
             }
           }
         }

diff --git a/package.json b/package.json
@@ -30,7 +30,6 @@
     "start": "ng run ng:storybook",
     "jenkins-test": "jest --no-cache --runInBand",
     "test": "jest --maxWorkers=4 --isolatedModules=true --detectOpenHandles --watchAll",
-    "compodoc": "compodoc -p ./tsconfig.compodoc-json.json -e json -d .storybook",
     "build-compodoc": "compodoc -p ./tsconfig.compodoc-html.json -d compodoc-static",
     "build-storybook": "ng run ng:build-storybook",
     "lint": "ng lint",