Merge branch 'master' into sam/eng-124-update-node-ipinfo-to-use-fetch-error-error-parsing-json

Author: shrink

.github/workflows/cd_npm.yml

@@ -1,33 +1,33 @@
 name: Release package to npm
 
 on:
-  push:
-    tags:
-      - 'v*'
+    push:
+        tags:
+            - "v*"
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-      - run: npm ci
-      - run: npm test
-        env:
-          IPINFO_TOKEN: ${{secrets.IPINFO_TOKEN}}
-  publish:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-          registry-url: https://registry.npmjs.org/
-      - run: npm ci
-      - run: npm run build
-      - run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+    build:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+            - uses: actions/setup-node@v3
+              with:
+                  node-version: 16
+            - run: npm ci
+            - run: npm test
+              env:
+                  IPINFO_TOKEN: ${{secrets.IPINFO_TOKEN}}
+    publish:
+        needs: build
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+            - uses: actions/setup-node@v3
+              with:
+                  node-version: 16
+                  registry-url: https://registry.npmjs.org/
+            - run: npm ci
+            - run: npm run build
+            - run: npm publish
+              env:
+                  NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

.github/workflows/lint.yaml

@@ -0,0 +1,17 @@
+name: "Lint Code"
+
+on:
+    push:
+    workflow_dispatch:
+
+jobs:
+    lint:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: "latest"
+            - run: npm ci
+            - run: npx prettier . --check

.prettierignore

@@ -0,0 +1,3 @@
+**/*.md
+config/**/*
+package-lock.json

.prettierrc.js

@@ -8,7 +8,6 @@ module.exports = {
     jsxSingleQuote: false,
     trailingComma: "none",
     bracketSpacing: true,
-    jsxBracketSameLine: false,
     arrowParens: "always",
     rangeStart: 0,
     rangeEnd: Infinity,

__tests__/ipinfoWrapper.test.ts

@@ -24,7 +24,9 @@ describe("IPinfoWrapper", () => {
             expect(data.countryCode).toEqual("US");
             expect(data.countryFlag.emoji).toEqual("🇺🇸");
             expect(data.countryFlag.unicode).toEqual("U+1F1FA U+1F1F8");
-            expect(data.countryFlagURL).toEqual("https://cdn.ipinfo.io/static/images/countries-flags/US.svg");
+            expect(data.countryFlagURL).toEqual(
+                "https://cdn.ipinfo.io/static/images/countries-flags/US.svg"
+            );
             expect(data.countryCurrency.code).toEqual("USD");
             expect(data.countryCurrency.symbol).toEqual("$");
             expect(data.continent.code).toEqual("NA");
@@ -152,7 +154,7 @@ describe("IPinfoWrapper", () => {
                         "safermoto.com",
                         "progeni.com",
                         "grahamhostedservices.com",
-                        "bhcentral.tech",
+                        "bhcentral.tech"
                     ]
                 },
                 countryCode: "ID"

test-app/index.js

@@ -2,11 +2,11 @@ let { IPinfoWrapper, LruCache } = require("node-ipinfo");
 
 let cacheOptions = {
     max: 5000,
-    ttl: 24 * 1000 * 60 * 60,
+    ttl: 24 * 1000 * 60 * 60
 };
 let cache = new LruCache(cacheOptions);
 
-let token = process.env.IPINFO_TOKEN
+let token = process.env.IPINFO_TOKEN;
 let ipinfo = new IPinfoWrapper(token, cache);
 
 ipinfo.lookupIp("1.1.1.1").then((response) => {

test-app/ipinfo.ts

@@ -1,8 +1,13 @@
-import IPinfoWrapper, { LruCache, Options, IPinfo, AsnResponse } from "node-ipinfo";
+import IPinfoWrapper, {
+    LruCache,
+    Options,
+    IPinfo,
+    AsnResponse
+} from "node-ipinfo";
 
 const cacheOptions: Options<string, any> = {
     max: 5000,
-    ttl: 24 * 1000 * 60 * 60,
+    ttl: 24 * 1000 * 60 * 60
 };
 const cache = new LruCache(cacheOptions);