FIX: use genversion to include SDK version in request headers (#70)

* FIX: use genversion to include SDK version in request headers

* add a couple comments

* tidy

* xo

* grant permission

* run as shell script, not npm script

* improve test, untouch package.json

* npm i

* now make it pass

* PR cleanup

* Update snapshots

* Bump version

* Fix tests again

Co-authored-by: Brent Mealhouse <[email protected]>

Author: markrmullan

.github/workflows/ci_checks.yml

@@ -64,6 +64,10 @@ jobs:
         id: npm-lint
         run: npm run lint
 
+      - name: Verify package.json version matches version.ts (genversion --check-only)
+        id: verify-version
+        run: ./verify_version.sh
+
       - uses: act10ns/slack@v1
         with:
           status: ${{ job.status }}

build.sh

@@ -1,8 +1,12 @@
 #!/bin/bash
+set -e
 
 # Clean dist directory
 rm -rf dist
 
+# Verify package.json version matches version.ts
+source ./verify_version.sh
+
 # Build for esm and cjs
 npm run build:esm
 npm run build:cjs

fix-esm-imports.mjs

@@ -32,11 +32,6 @@ function fixImportsAtFile(filePath) {
     }
 
     const [, importPath] = line.split(`"`);
-    if (importPath.includes(".json")) {
-      return `import { createRequire } from "module";
-const require = createRequire(import.meta.url);
-const { version } = require("${importPath}");`;
-    }
 
     const fullPath = path.join(filePath, "..", importPath);
     if (!fs.existsSync(fullPath)) {

jest.config.js

@@ -1,5 +1,5 @@
 module.exports = {
   preset: "ts-jest",
   testEnvironment: "node",
-  testTimeout: 10000,
+  testTimeout: 15000,
 };

package-lock.json

@@ -1,18 +1,18 @@
 {
   "name": "@withabound/node-sdk",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "The Abound Node library provides convenient access to the Abound API from applications written in server-side JavaScript.",
   "author": "Abound <[email protected]>",
   "license": "MIT",
-  "main": "dist/cjs/src/abound.js",
-  "module": "dist/esm/src/abound.js",
+  "main": "dist/cjs/abound.js",
+  "module": "dist/esm/abound.js",
   "exports": {
     ".": {
-      "import": "./dist/esm/src/abound.js",
-      "require": "./dist/cjs/src/abound.js"
+      "import": "./dist/esm/abound.js",
+      "require": "./dist/cjs/abound.js"
     }
   },
-  "types": "dist/types/src/abound.d.ts",
+  "types": "dist/types/abound.d.ts",
   "files": [
     "dist/**/*"
   ],
@@ -37,6 +37,7 @@
     "@types/jest": "27.0.1",
     "axios-mock-adapter": "^1.20.0",
     "eslint-config-xo-typescript": "0.44.0",
+    "genversion": "^3.1.1",
     "husky": "7.0.2",
     "jest": "27.2.1",
     "lint-staged": "11.1.2",

package.json

@@ -2,7 +2,7 @@ import { URLSearchParams } from "url";
 import axios, { AxiosInstance } from "axios";
 
 import { AboundConfig } from "../AboundClient";
-import { version } from "../../package.json";
+import { version } from "./version";
 
 export function initAxios(config: AboundConfig): AxiosInstance {
   return axios.create({

src/util/http.ts

@@ -0,0 +1,2 @@
+// Generated by genversion.
+export const version = "1.1.4";