ccremer · ccremer · May 5, 2023 · May 5, 2023 · May 5, 2023
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/kubernetes-client-angular/projects/kubernetes-client-angular/README.md b/packages/kubernetes-client-angular/projects/kubernetes-client-angular/README.md
@@ -100,8 +100,8 @@ import { KubernetesAuthorizerService } from '@ccremer/kubernetes-client-angular'
 
 @Component({
   selector: 'app-root',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.css'],
+  template: '<p>Kubernetes Client for Angular in Action</p>',
+  styles: [],
 })
 export class AppComponent implements OnInit {
   constructor(private configMapService: ConfigMapService, authorizer: KubernetesAuthorizerService) {

diff --git a/packages/kubernetes-client-angular/projects/kubernetes-client-angular/README.md.njk b/packages/kubernetes-client-angular/projects/kubernetes-client-angular/README.md.njk
@@ -36,17 +36,17 @@ npm install @ccremer/kubernetes-client @ccremer/kubernetes-client-angular
 
 Setup the module with `@ngrx/data` in `app.module.ts`:
 ```typescript
-{% include "projects/kubernetes-client-angular/examples/module.ts" -%}
+{% include "projects/kubernetes-client-angular/examples/app.module.ts" -%}
 ```
 
 Optional but highly recommended: Create an extendable Service for each entity in `config-map.service.ts`:
 ```typescript
-{% include "projects/kubernetes-client-angular/examples/service.ts" -%}
+{% include "projects/kubernetes-client-angular/examples/config-map.service.ts" -%}
 ```
 
 Configure and consume the service in a component like `app.component.ts`:
 ```typescript
-{% include "projects/kubernetes-client-angular/examples/component.ts" -%}
+{% include "projects/kubernetes-client-angular/examples/app.component.ts" -%}
 ```
 
 ## Accessing Kubernetes API

diff --git a/...etes-client-angular/examples/component.ts → ...-client-angular/examples/app.component.ts b/...etes-client-angular/examples/component.ts → ...-client-angular/examples/app.component.ts
@@ -4,8 +4,8 @@ import { KubernetesAuthorizerService } from '@ccremer/kubernetes-client-angular'
 
 @Component({
   selector: 'app-root',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.css'],
+  template: '<p>Kubernetes Client for Angular in Action</p>',
+  styles: [],
 })
 export class AppComponent implements OnInit {
   constructor(private configMapService: ConfigMapService, authorizer: KubernetesAuthorizerService) {

diff --git a/...ernetes-client-angular/examples/module.ts → ...tes-client-angular/examples/app.module.ts b/...ernetes-client-angular/examples/module.ts → ...tes-client-angular/examples/app.module.ts
diff --git a/...rnetes-client-angular/examples/service.ts → ...nt-angular/examples/config-map.service.ts b/...rnetes-client-angular/examples/service.ts → ...nt-angular/examples/config-map.service.ts
diff --git a/packages/kubernetes-client-angular/projects/kubernetes-client-angular/examples/tsconfig.json b/packages/kubernetes-client-angular/projects/kubernetes-client-angular/examples/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../../tsconfig",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "@ccremer/kubernetes-client/*": ["../../../../kubernetes-client/dist/*"],
+      "@ccremer/kubernetes-client-angular": ["../../../dist"]
+    }
+  }
+}
diff --git a/...t-angular/projects/kubernetes-client-example-angular/src/app/store/entity-metadata-map.ts b/...t-angular/projects/kubernetes-client-example-angular/src/app/store/entity-metadata-map.ts
diff --git a/packages/kubernetes-client-angular/tsconfig.json b/packages/kubernetes-client-angular/tsconfig.json
@@ -9,7 +9,8 @@
     "noImplicitOverride": true,
     "noPropertyAccessFromIndexSignature": true,
     "paths": {
-      "kubernetes-client-angular": ["dist/kubernetes-client-angular"]
+      "kubernetes-client-angular": ["dist"],
+      "@ccremer/kubernetes-client/*": ["../kubernetes-client/dist/*"]
     },
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,

diff --git a/packages/kubernetes-client-example-fetch/package.json b/packages/kubernetes-client-example-fetch/package.json
@@ -15,14 +15,15 @@
     "@types/bootstrap": "5.2.6",
     "@types/node": "18.16.3",
     "dotenv": "16.0.3",
+    "eslint-config-custom": "*",
     "sass": "1.62.1",
     "vite": "4.3.3",
-    "eslint-config-custom": "*"
+    "vite-tsconfig-paths": "4.2.0"
   },
   "type": "module",
   "dependencies": {
-    "bootstrap": "5.2.3",
-    "@ccremer/kubernetes-client": "*"
+    "@ccremer/kubernetes-client": "*",
+    "bootstrap": "5.2.3"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/kubernetes-client-example-fetch/tsconfig.json b/packages/kubernetes-client-example-fetch/tsconfig.json
@@ -1,7 +1,11 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "./dist"
+    "outDir": "./dist",
+    "baseUrl": ".",
+    "paths": {
+      "@ccremer/kubernetes-client/*": ["../kubernetes-client/dist/*"]
+    }
   },
   "include": ["src/**/*"],
   "exclude": ["src/**/*.spec.ts"]

diff --git a/packages/kubernetes-client-example-fetch/vite.config.ts b/packages/kubernetes-client-example-fetch/vite.config.ts
@@ -1,13 +1,15 @@
 import { defineConfig } from 'vite'
 import 'dotenv/config'
 import * as path from 'path'
+import tsconfigPaths from 'vite-tsconfig-paths'
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
   if (mode !== 'production' && !process.env.VITE_KUBERNETES_API_URL) {
     console.log('⚠️  WARNING ⚠️ :environment variable VITE_KUBERNETES_API_URL is not defined. API may not be working!')
   }
   return {
+    plugins: [tsconfigPaths()],
     root: path.resolve(__dirname, 'src'),
     resolve: {
       alias: {

diff --git a/packages/kubernetes-client/.eslintignore b/packages/kubernetes-client/.eslintignore
@@ -1,6 +1,2 @@
-/types/
-/api/
-/fetch/
-/index.*
 node_modules/
 /dist/
diff --git a/packages/kubernetes-client/.gitignore b/packages/kubernetes-client/.gitignore
@@ -1,5 +1 @@
-index.*
-/api
-/fetch
-/types
 /dist
diff --git a/packages/kubernetes-client/.prettierignore b/packages/kubernetes-client/.prettierignore
@@ -1,8 +1,4 @@
 # Ignore artifacts
-
-/api/
-/fetch/
-/types/
-/index.*
 /playwright-report/
+/dist/
 package-lock.json
diff --git a/packages/kubernetes-client/examples/tsconfig.json b/packages/kubernetes-client/examples/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../../tsconfig",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "@ccremer/kubernetes-client/*": ["../dist/*"]
+    }
+  }
+}
diff --git a/packages/kubernetes-client/package.json b/packages/kubernetes-client/package.json
@@ -9,9 +9,8 @@
     "prelint": "npm run format",
     "test": "vitest run",
     "clean": "rm -rf types fetch api index.*",
-    "build": "tsc",
-    "ignore:publishVersion": "yq e -i '. += {\"version\": load(\"package.json\").version}' dist/package.json -o json",
-    "prepack": "tsc --outDir ./dist && cp package.json README.md dist/"
+    "build": "rm -rf dist && tsc",
+    "prepack": "cp package.json README.md dist/"
   },
   "repository": {
     "type": "git",

diff --git a/packages/kubernetes-client/tsconfig.json b/packages/kubernetes-client/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig",
   "compilerOptions": {
-    "outDir": "./",
+    "outDir": "./dist",
     "declaration": true
   },
   "include": ["src/**/*"],