chore: fix os workflow matrix (#59)

metrics-js · Jul 12, 2024 · 15ec8ea · 15ec8ea
1 parent 9149e4e
commit 15ec8ea
Show file tree

Hide file tree

Showing 11 changed files with 144 additions and 130 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc b/.eslintrc
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+* text=auto eol=lf
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,42 +1,42 @@
 name: Release on main
 
 permissions:
-    contents: write # to be able to publish a GitHub release
-    issues: write # to be able to comment on released issues
-    pull-requests: write # to be able to comment on released pull requests
-    id-token: write # to enable use of OIDC for npm provenance
+  contents: write # to be able to publish a GitHub release
+  issues: write # to be able to comment on released issues
+  pull-requests: write # to be able to comment on released pull requests
+  id-token: write # to enable use of OIDC for npm provenance
 
 on:
-    push:
-        branches:
-            - main
+  push:
+    branches:
+      - main
 
 # Cancel previous workflows which might still be running
 concurrency:
-    group: ${{ github.workflow }}-${{ github.ref }}
-    cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
-    release:
-        name: Release
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - name: Install Node.js
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 20
-
-            - name: Install dependencies
-              run: npm install
-
-            - name: Run all tests
-              run: npm test
-
-            - name: Release and publish
-              run: npx semantic-release
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-                  NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Run all tests
+        run: npm test
+
+      - name: Release and publish
+        run: npx semantic-release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,29 +1,30 @@
 name: Run Lint and Tests
 
 on:
-    pull_request:
-        branches: [main]
+  pull_request:
+    branches: [main]
 
 jobs:
-    build:
-        runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                os: [ubuntu-latest, macOS-latest, windows-latest]
-                node-version: [18.x, 20.x]
-        steps:
-            - uses: actions/checkout@v4
+  build:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macOS-latest, windows-latest]
+        node-version: [18, 20]
+    runs-on: ${{ matrix.os }}
 
-            - name: Use Node.js ${{ matrix.node-version }}
-              uses: actions/setup-node@v4
-              with:
-                  node-version: ${{ matrix.node-version }}
+    steps:
+      - uses: actions/checkout@v4
 
-            - name: Install dependencies
-              run: npm install
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
 
-            - name: Lint
-              run: npm run lint
+      - name: Install dependencies
+        run: npm install
 
-            - name: Run tests
-              run: npm test
+      - name: Lint
+        run: npm run lint
+
+      - name: Run tests
+        run: npm test
diff --git a/.npmrc b/.npmrc
@@ -1 +1,2 @@
 package-lock=false
+save-exact=true
diff --git a/.prettierrc b/.prettierrc
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -0,0 +1,15 @@
+{
+  "singleQuote": false,
+  "trailingComma": "all",
+  "useTabs": true,
+  "printWidth": 120,
+  "overrides": [
+    {
+      "files": ["*.yml", "*.json"],
+      "options": {
+        "tabWidth": 2,
+        "useTabs": false
+      }
+    }
+  ]
+}
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -0,0 +1,22 @@
+import prettierConfig from "eslint-config-prettier";
+import prettierPlugin from "eslint-plugin-prettier/recommended";
+import globals from "globals";
+import js from "@eslint/js";
+
+export default [
+	js.configs.recommended,
+	prettierConfig,
+	prettierPlugin,
+	{
+		languageOptions: {
+			globals: {
+				...globals.node,
+				...globals.browser,
+				global: true,
+			},
+		},
+	},
+	{
+		ignores: ["coverage/*", "dist/*"],
+	},
+];
diff --git a/lib/guard.js b/lib/guard.js
@@ -68,7 +68,7 @@ const MetricsGuard = class MetricsGuard extends stream.Transform {
 	[push](metric) {
 		const met = metric;
 		met.source = this.id;
-		// eslint-disable-next-line no-underscore-dangle
+
 		if (this._readableState.flowing) {
 			this.push(met);
 			return;

diff --git a/package.json b/package.json
@@ -1,52 +1,53 @@
 {
-	"name": "@metrics/guard",
-	"version": "1.0.2",
-	"description": "Module to guard against excessive metric permutation creation in a metric stream",
-	"main": "lib/guard.js",
-	"types": "guard.d.ts",
-	"files": [
-		"lib",
-		"guard.d.ts"
-	],
-	"scripts": {
-		"bench": "node benchmark/benchmark.js",
-		"test": "tap test/*.js --disable-coverage --allow-empty-coverage",
-		"test:coverage": "tap test/*.js",
-		"lint": "eslint .",
-		"lint:fix": "eslint . --fix"
-	},
-	"author": "Trygve Lie <[email protected]>",
-	"license": "MIT",
-	"keywords": [
-		"server-statistics",
-		"server-stats",
-		"statistics",
-		"metrics",
-		"monitoring",
-		"guard"
-	],
-	"dependencies": {
-		"readable-stream": "^3.4.0"
-	},
-	"devDependencies": {
-		"@metrics/client": "2.5.2",
-		"@metrics/metric": "2.3.3",
-		"@semantic-release/changelog": "6.0.3",
-		"@semantic-release/commit-analyzer": "11.1.0",
-		"@semantic-release/git": "10.0.1",
-		"@semantic-release/github": "9.2.6",
-		"@semantic-release/npm": "11.0.3",
-		"@semantic-release/release-notes-generator": "12.1.0",
-		"eslint": "8.57.0",
-		"eslint-config-prettier": "9.1.0",
-		"eslint-plugin-prettier": "5.1.3",
-		"fastbench": "1.0.1",
-		"prettier": "3.3.0",
-		"semantic-release": "23.0.2",
-		"tap": "18.7.1"
-	},
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/metrics-js/client.git"
-	}
+  "name": "@metrics/guard",
+  "version": "1.0.2",
+  "description": "Module to guard against excessive metric permutation creation in a metric stream",
+  "main": "lib/guard.js",
+  "types": "guard.d.ts",
+  "files": [
+    "lib",
+    "guard.d.ts"
+  ],
+  "scripts": {
+    "bench": "node benchmark/benchmark.js",
+    "test": "tap test/*.js --disable-coverage --allow-empty-coverage",
+    "test:coverage": "tap test/*.js",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix"
+  },
+  "author": "Trygve Lie <[email protected]>",
+  "license": "MIT",
+  "keywords": [
+    "server-statistics",
+    "server-stats",
+    "statistics",
+    "metrics",
+    "monitoring",
+    "guard"
+  ],
+  "dependencies": {
+    "readable-stream": "^3.4.0"
+  },
+  "devDependencies": {
+    "@metrics/client": "2.5.2",
+    "@metrics/metric": "2.3.3",
+    "@semantic-release/changelog": "6.0.3",
+    "@semantic-release/commit-analyzer": "11.1.0",
+    "@semantic-release/git": "10.0.1",
+    "@semantic-release/github": "9.2.6",
+    "@semantic-release/npm": "11.0.3",
+    "@semantic-release/release-notes-generator": "12.1.0",
+    "eslint": "9.6.0",
+    "eslint-config-prettier": "9.1.0",
+    "eslint-plugin-prettier": "5.1.3",
+    "fastbench": "1.0.1",
+    "globals": "15.8.0",
+    "prettier": "3.3.0",
+    "semantic-release": "23.0.2",
+    "tap": "18.7.1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/metrics-js/client.git"
+  }
 }