Merge pull request #24 from jkcfg/2019-04-29-misc-fixes

Assorted fixes
jkcfg · Apr 29, 2019 · eb3bcde · eb3bcde
2 parents 81875ca + 765802d
commit eb3bcde
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 node_modules
-/dist
+/@jkcfg
 /lib
 /src/api.ts
 /src/shapes.ts

diff --git a/.npmrc b/.npmrc
diff --git a/.travis.yml b/.travis.yml
@@ -27,5 +27,6 @@ jobs:
       script:
         # build and publish
         - make dist
-        - cd dist && npm publish
+        - echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}' > @jkcfg/kubernetes/.npmrc
+        - npm publish @jkcfg/kubernetes
       if: tag IS present
diff --git a/Makefile b/Makefile
@@ -1,20 +1,20 @@
-.PHONY: dist clean-dist gen test
+.PHONY: dist clean gen test
 
 all: gen
 
 gen:
-	go run ./cmd/apigen/ cmd/apigen/specs/swagger-v1.13.0.json cmd/apigen/templates ./src/
+	GO111MODULE=on go run ./cmd/apigen/ cmd/apigen/specs/swagger-v1.13.0.json cmd/apigen/templates ./src/
 
 src/api.ts: gen
 src/shapes.ts: gen
 
 dist: src/api.ts src/shapes.ts
 	npx tsc
 	npx tsc -d --emitDeclarationOnly --allowJs false
-	cp README.md LICENSE package.json .npmrc $@
+	cp README.md LICENSE package.json .npmrc @jkcfg/kubernetes
 
 clean:
-	rm -rf dist
+	rm -rf @jkcfg
 	rm -f src/api.ts src/shapes.ts
 
 test: gen

diff --git a/examples/chart/README.md b/examples/chart/README.md
@@ -13,9 +13,6 @@ keeping track of which charts have been released to the cluster.
 (in this directory)
 
 ```js
-npm install '@jkcfg/kubernetes'
-# or: make -C ../.. dist && npm install ../../dist
-
 # run the chart with defaults
 jk run ./index.js # or ./index2.js
 

diff --git a/examples/chart/node_modules/@jkcfg b/examples/chart/node_modules/@jkcfg
diff --git a/examples/guestbook-ts/README.md b/examples/guestbook-ts/README.md
@@ -2,15 +2,15 @@
 
 To run this example:
 
-```
-# Install the required dependencies: `typecript`, `@jkcfg/kubernetes`, ...
+```console
+# Install the required dependencies: `typescript`, `@jkcfg/kubernetes`, ...
 $ npm install
 
 # Transpile typescript to javascript
 $ npx tsc
 
 # Run jk on the resulting javascript
-$ jk run -v guestbook.ts 
+$ jk run -v guestbook.ts
 wrote redis-master-deployment.yaml
 ```
 

diff --git a/examples/guestbook-ts/tsconfig.json b/examples/guestbook-ts/tsconfig.json
@@ -11,9 +11,6 @@
     "noImplicitReturns": true,
     "forceConsistentCasingInFileNames": true,
     "strictNullChecks": true,
-    "baseUrl": ".",
-    "paths": {
-      "std": ["node_modules/@jkcfg/std"]
-    }
+    "baseUrl": "../.."
   }
 }
diff --git a/examples/overlay/index1.js b/examples/overlay/index1.js
@@ -1,5 +1,5 @@
 import overlay from '@jkcfg/kubernetes/overlay';
-import { writeResources } from '../../dist/write';
+import { writeResources } from '../../@jkcfg/kubernetes/write';
 import std from '@jkcfg/std';
 
 async function generate() {

diff --git a/examples/overlay/index2.js b/examples/overlay/index2.js
@@ -1,5 +1,5 @@
 import overlay from '@jkcfg/kubernetes/overlay';
-import { writeResources } from '../../dist/write';
+import { writeResources } from '../../@jkcfg/kubernetes/write';
 import std from '@jkcfg/std';
 
 async function generate() {

diff --git a/examples/overlay/index3.js b/examples/overlay/index3.js
@@ -1,5 +1,5 @@
 import overlay from '@jkcfg/kubernetes/overlay';
-import { writeResources } from '../../dist/write';
+import { writeResources } from '../../@jkcfg/kubernetes/write';
 import std from '@jkcfg/std';
 import { core } from '@jkcfg/kubernetes/api';
 

diff --git a/examples/overlay/node_modules/@jkcfg b/examples/overlay/node_modules/@jkcfg
diff --git a/package.json b/package.json
@@ -51,10 +51,10 @@
       "<rootDir>/tests/*.test.js"
     ],
     "transformIgnorePatterns": [
-      "<rootDir>/dist/"
+      "<rootDir>/@jkcfg/"
     ],
     "modulePathIgnorePatterns": [
-      "<rootDir>/dist/"
+      "<rootDir>/@jkcfg/"
     ],
     "moduleDirectories": [
       "<rootDir>/node_modules"

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "outDir": "dist",
+    "outDir": "@jkcfg/kubernetes",
     "allowJs": true,
     "target": "es2017",
     "module": "es6",