upgrade to oas3

Author: Elmer Bulthuis

.circleci/config.yml

@@ -1,64 +1,34 @@
 version: 2.1
 
 jobs:
+  install:
+    docker: [image: circleci/node:14]
+    steps:
+      - checkout
+      - run: npm install
+      - persist_to_workspace:
+          root: .
+          paths: [node_modules]
+
   build:
-    docker: [image: circleci/node:16]
+    docker: [image: circleci/node:14]
     steps:
       - checkout
-      - run: make TAG=$CIRCLE_TAG
+      - attach_workspace: { at: . }
+      - run: make TAG=$CIRCLE_TAG PACKAGE_NAME=@gameye/$CIRCLE_PROJECT_REPONAME
       - persist_to_workspace:
           root: .
           paths: [out]
 
   test:
-    docker: [image: circleci/node:16]
+    docker: [image: circleci/node:14]
     steps:
       - checkout
-      - run: ./test
-
-  publish-static:
-    docker: [image: circleci/python:3.6]
-    environment:
-      BUCKET: api-spec.gameye.com
-    steps:
-      - run: sudo pip install awscli
       - attach_workspace: { at: . }
-      - run: >
-          aws s3 cp
-          out/static/index.html
-          s3://$BUCKET/$CIRCLE_TAG/index.html
-          --content-type 'text/html'
-          --cache-control 'max-age=604800'
-      - run: >
-          aws s3 cp
-          out/static/openapi.yaml
-          s3://$BUCKET/$CIRCLE_TAG/openapi.yaml
-          --content-type 'application/vnd.oai.openapi;version=3.0'
-          --cache-control 'max-age=604800'
-      - run: >
-          aws s3 cp
-          out/static/openapi.json
-          s3://$BUCKET/$CIRCLE_TAG/openapi.json
-          --content-type 'application/vnd.oai.openapi+json;version=3.0'
-          --cache-control 'max-age=604800'
-      - run: >
-          aws s3api put-bucket-website
-          --bucket $BUCKET
-          --website-configuration '{
-            "IndexDocument": {"Suffix": "index.html"},
-            "RoutingRules": [
-              {
-                "Condition": {"KeyPrefixEquals": "latest"},
-                "Redirect": {
-                  "HttpRedirectCode": "302",
-                  "ReplaceKeyPrefixWith": "'$CIRCLE_TAG'"
-                }
-              }
-            ]
-          }'
+      - run: ./test
 
   publish-npm:
-    docker: [image: circleci/node:16]
+    docker: [image: circleci/node:14]
     steps:
       - attach_workspace: { at: . }
       - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
@@ -67,22 +37,21 @@ jobs:
 workflows:
   main:
     jobs:
+      - install:
+          filters:
+            tags: { only: /^v\d+\.\d+\.\d+$/ }
       - build:
+          requires: [install]
           filters:
             branches: { ignore: /.*/ }
             tags: { only: /^v\d+\.\d+\.\d+$/ }
       - test:
+          requires: [install]
           filters:
             tags: { only: /^v\d+\.\d+\.\d+$/ }
-      - publish-static:
-          context: authorized
-          requires: [build]
-          filters:
-            branches: { ignore: /.*/ }
-            tags: { only: /^v\d+\.\d+\.\d+$/ }
       - publish-npm:
           context: authorized
-          requires: [build]
+          requires: [install, build]
           filters:
             branches: { ignore: /.*/ }
             tags: { only: /^v\d+\.\d+\.\d+$/ }

.gitignore

@@ -1,2 +1,3 @@
 .*
-/out/
+node_modules/
+out/

.npmrc

@@ -0,0 +1,3 @@
+commit-hooks=false
+git-tag-version=false
+@oas3:registry=https://gitlab.com/api/v4/packages/npm/

.vscode/launch.json

@@ -12,7 +12,10 @@
                 "<node_internals>/**"
             ],
             "runtimeExecutable": "npx",
-            "program": "redoc-cli",
+            "runtimeArgs": [
+                "--yes"
+            ],
+            "program": "[email protected]",
             "args": [
                 "serve",
                 "${workspaceFolder}/src/openapi.yaml",

.vscode/settings.json

@@ -1,8 +1,11 @@
+// Place your settings in this file to overwrite default and user settings.
 {
     "editor.formatOnSave": true,
+    "editor.codeActionsOnSave": {
+        "source.fixAll": true,
+        "source.organizeImports": true
+    },
     "editor.rulers": [
-        100
-    ],
-    "editor.tabSize": 4,
-    "editor.insertSpaces": true
+        100,
+    ]
 }

Makefile

@@ -1,9 +1,7 @@
+PACKAGE_NAME?=
+TAG?=v0.0.0-local
 SHELL:=$(PREFIX)/bin/sh
-TAG?=$(shell git describe --tags)
-VERSION:=$(shell npx --yes semver $(TAG))
-PACKAGE_NAME:=match-api-spec
-
-rebuild: clean build
+VERSION:=$(shell `npm bin`/semver $(TAG))
 
 build: \
 	out/static/version.txt \
@@ -12,7 +10,10 @@ build: \
 	out/static/index.html \
 	out/npm/ \
 
+rebuild: clean build
+
 clean:
+	rm -rf bin
 	rm -rf out
 
 out/static/version.txt:
@@ -25,24 +26,24 @@ out/static/openapi.yaml: src/openapi.yaml
 
 out/static/openapi.json: out/static/openapi.yaml
 	@mkdir --parents $(@D)
-	npx js-yaml $< > $@
+	`npm bin`/js-yaml $< > $@
 
 out/static/index.html: out/static/openapi.yaml
 	@mkdir --parents $(@D)
-	npx --yes redoc-cli@0.10.2 bundle $< --output $@
+	`npm bin`/redoc-cli bundle $< --output $@
 
 out/npm/: out/static/openapi.yaml
-	npx --yes oas3ts-generator@1.1.3 package \
+	`npm bin`/oas3ts-generator package \
 		--package-dir $@ \
-		--package-name @gameye/$(PACKAGE_NAME) \
+		--package-name $(PACKAGE_NAME) \
 		--request-type application/json \
-		--response-type text/plain \
 		--response-type application/json \
-		--response-type application/x-tar \
+		--response-type text/plain \
 		$<
-	( cd $@ ; npm install )
+	( cd $@ ; npm install --unsafe-perm )
+
 
 .PHONY: \
-	clean \
 	build \
 	rebuild \
+	clean \