Merge pull request #213 from curveball/prep-v1

Dropping CommonJS and releasing 1.0

.eslintrc.json

@@ -2,7 +2,8 @@
   "env": {
       "browser": true,
       "node": true,
-      "es6": true
+      "es6": true,
+      "mocha": true
   },
   "extends": [
       "eslint:recommended",
@@ -61,7 +62,6 @@
         "args": "none"
       }],
       "@typescript-eslint/prefer-for-of": ["error"],
-      "@typescript-eslint/prefer-optional-chain": ["error"],
       "@typescript-eslint/prefer-ts-expect-error": ["error"]
   }
 }

.github/workflows/node.yml

@@ -1,7 +1,7 @@
 # This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
 
-name: Node.js CI
+name: Node.js Test Runner
 
 on:
   push:
@@ -11,56 +11,35 @@ on:
 
 jobs:
   node-test:
-    name: Node.js tests (ESM)
+    name: Node.js tests
 
     runs-on: ubuntu-latest
-    timeout-minutes: 5
+    timeout-minutes: 10
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [18.x, 20.x, 21.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm ci
     - run: npm run build --if-present
     - run: npm test
 
-  cjs-test:
-    name: Node.js tests (CommonJS)
-    timeout-minutes: 5
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [14.x, 16.x, 18.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }} (CommonJS)
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - run: npm ci
-    - run: npm run build --if-present
-    - run: make test-cjs
-
   lint:
     name: Lint
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Use Node.js
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: 18.x
     - run: npm ci

.github/workflows/npm-publish.yml

@@ -11,21 +11,21 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 18
       - run: npm ci
       - run: npm test
 
   publish-npm:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 18
           registry-url: https://registry.npmjs.org/
       - run: npm ci
       - run: npm publish
@@ -36,14 +36,14 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 18
       - run: npm ci
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 18
           registry-url: 'https://npm.pkg.github.com'
           scope: '@curveball'
       - run: npm publish

.gitignore

@@ -2,8 +2,7 @@
 /node_modules
 
 # typescript output
-/esm
-/cjs
+/dist
 
 # Directory used for running tests in CommonJS mode
 /cjs-test

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2023 Bad Gateway Inc.
+Copyright (c) 2018-2024 Bad Gateway Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -4,20 +4,11 @@ SOURCE_FILES:=$(shell find src/ -type f -name '*.ts')
 all: build
 
 .PHONY:build
-build: cjs/build esm/build
+build: dist/build
 
 .PHONY:test
 test:
-	npx nyc mocha --exit
-
-.PHONY:test-cjs
-test-cjs:
-	mkdir -p cjs-test
-	cd test; npx tsc --module commonjs --outdir ../cjs-test
-	echo '{"type": "commonjs", "dependencies": {"node-fetch": "^2"}}' > cjs-test/package.json
-	cp test/polyfills.cjs cjs-test/
-	cd cjs-test; npm i;
-	cd cjs-test; npx mocha --exit --no-package --r polyfills.cjs
+	npx nyc mocha
 
 .PHONY:lint
 lint:
@@ -39,17 +30,8 @@ start: build
 
 .PHONY:clean
 clean:
-	rm -rf dist esm cjs cjs-test
-
-cjs/build: $(SOURCE_FILES)
-	npx tsc --module commonjs --outDir cjs/
-	echo '{"type": "commonjs"}' > cjs/package.json
-	@# Creating a small file to keep track of the last build time
-	touch cjs/build
-
+	rm -rf dist
 
-esm/build: $(SOURCE_FILES)
-	npx tsc --module es2022 --outDir esm/
-	echo '{"type": "module"}' > esm/package.json
-	@# Creating a small file to keep track of the last build time
-	touch esm/build
+dist/build: $(SOURCE_FILES)
+	npx tsc
+	touch dist/build

changelog.md

@@ -1,6 +1,16 @@
 Changelog
 =========
 
+1.0.0 (2024-01-15)
+------------------
+
+* Finally! Curveball v1. Only took 6 years.
+* CommonJS support has been dropped. The previous version of this library
+  supported both CommonJS and ESM. The effort of this no longer feels worth it.
+  ESM is the future, so we're dropping CommonJS.
+* Now requires Node 18.
+
+
 0.21.1 (2023-02-17)
 -------------------
 
@@ -55,6 +65,7 @@ Identical release as the previous alpha.
 
 
 
+
 0.18.0-alpha.0 (2022-04-09)
 ---------------------------
 
@@ -133,8 +144,8 @@ Happy birthday Mom!
 0.14.3 (2020-09-23)
 -------------------
 
-* #155 - `listen` and `listenWs` now both have a second `host` argument to
-  bind to a specific interface. (@Nicholaiii)
+* #155 - `listen` and `listenWs` now both have a second `host` argument to bind
+  to a specific interface. (@Nicholaiii)
 * #145 - `request.headers` and `response.head` function to get a list of header
   values for a given header name. (@Nicholaiii)ers` now have a `getMany()`