Merge pull request #1 from hubot-friends/node-test-runner

feat: Upgrade to latest path-to-regexp

Author: joeyguerra

.eslintrc.yml

@@ -6,3 +6,8 @@ rules:
   indent: [error, 2, { MemberExpression: "off", SwitchCase: 1 }]
   no-trailing-spaces: error
   no-unused-vars: [error, { vars: all, args: none, ignoreRestSiblings: true }]
+parserOptions:
+  ecmaVersion: latest
+  sourceType: module
+env:
+  es6: true

.github/workflows/ci.yml

@@ -5,206 +5,64 @@ on:
 - push
 
 jobs:
-  test:
+  build:
+    name: Build and Verify
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        name:
-        - Node.js 0.10
-        - Node.js 0.12
-        - io.js 1.x
-        - io.js 2.x
-        - io.js 3.x
-        - Node.js 4.x
-        - Node.js 5.x
-        - Node.js 6.x
-        - Node.js 7.x
-        - Node.js 8.x
-        - Node.js 9.x
-        - Node.js 10.x
-        - Node.js 11.x
-        - Node.js 12.x
-        - Node.js 13.x
-        - Node.js 14.x
-        - Node.js 15.x
-        - Node.js 16.x
-        - Node.js 17.x
-        - Node.js 18.x
-        - Node.js 19.x
-
-        include:
-        - name: Node.js 0.10
-          node-version: "0.10"
-          npm-i: [email protected] [email protected] [email protected]
-
-        - name: Node.js 0.12
-          node-version: "0.12"
-          npm-i: [email protected] [email protected] [email protected]
-
-        - name: io.js 1.x
-          node-version: "1.8"
-          npm-i: [email protected] [email protected] [email protected]
-
-        - name: io.js 2.x
-          node-version: "2.5"
-          npm-i: [email protected] [email protected] [email protected]
-
-        - name: io.js 3.x
-          node-version: "3.3"
-          npm-i: [email protected] [email protected] [email protected]
-
-        - name: Node.js 4.x
-          node-version: "4.9"
-          npm-i: [email protected] [email protected] [email protected]
-
-        - name: Node.js 5.x
-          node-version: "5.12"
-          npm-i: [email protected] [email protected] [email protected]
-
-        - name: Node.js 6.x
-          node-version: "6.17"
-          npm-i: [email protected] [email protected] [email protected]
-
-        - name: Node.js 7.x
-          node-version: "7.10"
-          npm-i: [email protected] [email protected] [email protected]
-
-        - name: Node.js 8.x
-          node-version: "8.17"
-          npm-i: [email protected] [email protected]
-
-        - name: Node.js 9.x
-          node-version: "9.11"
-          npm-i: [email protected] [email protected]
-
-        - name: Node.js 10.x
-          node-version: "10.24"
-          npm-i: [email protected]
-
-        - name: Node.js 11.x
-          node-version: "11.15"
-          npm-i: [email protected]
-
-        - name: Node.js 12.x
-          node-version: "12.22"
-          npm-i: [email protected]
-
-        - name: Node.js 13.x
-          node-version: "13.14"
-          npm-i: [email protected]
-
-        - name: Node.js 14.x
-          node-version: "14.20"
-
-        - name: Node.js 15.x
-          node-version: "15.14"
-
-        - name: Node.js 16.x
-          node-version: "16.20"
-
-        - name: Node.js 17.x
-          node-version: "17.9"
-
-        - name: Node.js 18.x
-          node-version: "18.15"
-
-        - name: Node.js 19.x
-          node-version: "19.7"
-
+        node-version:
+          - 18.x
     steps:
-    - uses: actions/checkout@v3
-
-    - name: Install Node.js ${{ matrix.node-version }}
-      shell: bash -eo pipefail -l {0}
-      run: |
-        nvm install --default ${{ matrix.node-version }}
-        dirname "$(nvm which ${{ matrix.node-version }})" >> "$GITHUB_PATH"
-
-    - name: Configure npm
-      run: |
-        npm config set loglevel error
-        if [[ "$(npm config get package-lock)" == "true" ]]; then
-          npm config set package-lock false
-        else
-          npm config set shrinkwrap false
-        fi
-
-    - name: Install npm module(s) ${{ matrix.npm-i }}
-      run: npm install --save-dev ${{ matrix.npm-i }}
-      if: matrix.npm-i != ''
-
-    - name: Remove non-test dependencies
-      run: npm rm --silent --save-dev connect-redis
-
-    - name: Setup Node.js version-specific dependencies
-      shell: bash
-      run: |
-        # eslint for linting
-        # - remove on Node.js < 12
-        if [[ "$(cut -d. -f1 <<< "${{ matrix.node-version }}")" -lt 12 ]]; then
-          node -pe 'Object.keys(require("./package").devDependencies).join("\n")' | \
-            grep -E '^eslint(-|$)' | \
-            sort -r | \
-            xargs -n1 npm rm --silent --save-dev
-        fi
-
-    - name: Install Node.js dependencies
-      run: npm install
-
-    - name: List environment
-      id: list_env
-      shell: bash
-      run: |
-        echo "node@$(node -v)"
-        echo "npm@$(npm -v)"
-        npm -s ls ||:
-        (npm -s ls --depth=0 ||:) | awk -F'[ @]' 'NR>1 && $2 { print $2 "=" $3 }' >> "$GITHUB_OUTPUT"
-
-    - name: Run tests
-      shell: bash
-      run: |
-        npm run test-ci
-        cp coverage/lcov.info "coverage/${{ matrix.name }}.lcov"
-
-    - name: Lint code
-      if: steps.list_env.outputs.eslint != ''
-      run: npm run lint
-
-    - name: Collect code coverage
-      run: |
-        mv ./coverage "./${{ matrix.name }}"
-        mkdir ./coverage
-        mv "./${{ matrix.name }}" "./coverage/${{ matrix.name }}"
-
-    - name: Upload code coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: ./coverage
-        retention-days: 1
-
-  coverage:
-    needs: test
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Setup Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'npm'
+      - name: Install dependencies
+        run: npm ci
+      - name: Verify the integrity of provenance attestations and registry signatures for installed dependencies
+        run: npm audit signatures
+  test:
+    name: Fast Tests
     runs-on: ubuntu-latest
+    needs: build
+    strategy:
+      matrix:
+        node-version:
+          - 18.x
+          - 19.x
+          - 20.x
     steps:
-    - uses: actions/checkout@v3
-
-    - name: Install lcov
-      shell: bash
-      run: sudo apt-get -y install lcov
-
-    - name: Collect coverage reports
-      uses: actions/download-artifact@v3
-      with:
-        name: coverage
-        path: ./coverage
-
-    - name: Merge coverage reports
-      shell: bash
-      run: find ./coverage -name lcov.info -exec printf '-a %q\n' {} \; | xargs lcov -o ./coverage/lcov.info
-
-    - name: Upload coverage report
-      uses: coverallsapp/github-action@master
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'npm'
+      - run: npm ci
+      - run: npm test
+  release:
+    name: Release
+    if: github.ref == 'refs/heads/main' && success()
+    needs: [build, test]
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version:
+          - 20.x
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Semantic Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: npx semantic-release

History.md

@@ -1,6 +1,23 @@
-unreleased
-==========
-
+5.0.0 / 2023-12-11
+===================
+
+  * deps: removed safe-buffer
+    - engine: node >= v18.19.0
+    - Use Node Buffer instead of `safe-buffer`
+  * deps: [email protected]
+    - BREAKING CHANGE: upgraded from 0.1.7. Route mapping changes e.g. /*, /foo/ handling /foo, no longer work
+    - See https://github.com/pillarjs/path-to-regexp for documentation
+  * deps: removed array-flatten
+    - Replaced with Array.prototype.flat
+    - Removed `utils.flatten`
+  * deps: [email protected]
+  * deps: [email protected]
+  * deps: removed mocha
+    - Replaced mocha with Node Test Runner
+    - Removed `nyc`
+  * Use ES Import for tests
+    - Renamed tests with `.mjs` file extension
+    - Renamed tests with Pascal Casing
   * Fix routing requests without method
   * deps: [email protected]
     - Fix strict json error message on Node.js 19+
@@ -2950,7 +2967,7 @@ Closes #805
   * Added route `Collection`, ex: `app.get('/user/:id').remove();`
   * Added support for `app.param(fn)` to define param logic
   * Removed `app.param()` support for callback with return value
-  * Removed module.parent check from express(1) generated app. Closes #670
+  * Removed require.main check from express(1) generated app. Closes #670
   * Refactored router. Closes #639
 
 2.3.6 / 2011-05-20

examples/auth/index.js

@@ -58,7 +58,7 @@ hash({ password: 'foobar' }, function (err, pass, salt, hash) {
 // Authenticate using our plain-object database of doom!
 
 function authenticate(name, pass, fn) {
-  if (!module.parent) console.log('authenticating %s:%s', name, pass);
+  if (!require.main) console.log('authenticating %s:%s', name, pass);
   var user = users[name];
   // query the db for the given username
   if (!user) return fn(null, null)
@@ -127,7 +127,8 @@ app.post('/login', function (req, res, next) {
 });
 
 /* istanbul ignore next */
-if (!module.parent) {
-  app.listen(3000);
-  console.log('Express started on port 3000');
+if (!require.main) {
+  const server = app.listen();
+  app.close = () => server.close();
+  console.log(`Express started on port ${server.address().port}`);
 }

examples/content-negotiation/index.js

@@ -40,7 +40,8 @@ function format(path) {
 app.get('/users', format('./users'));
 
 /* istanbul ignore next */
-if (!module.parent) {
-  app.listen(3000);
-  console.log('Express started on port 3000');
+if (!require.main) {
+  const server = app.listen();
+  app.close = () => server.close();
+  console.log(`Express started on port ${server.address().port}`);
 }

examples/cookie-sessions/index.js

@@ -22,7 +22,8 @@ function count(req, res) {
 }
 
 /* istanbul ignore next */
-if (!module.parent) {
-  app.listen(3000);
-  console.log('Express started on port 3000');
+if (!require.main) {
+  const server = app.listen();
+  app.close = () => server.close();
+  console.log(`Express started on port ${server.address().port}`);
 }

examples/cookies/index.js

@@ -43,7 +43,8 @@ app.post('/', function(req, res){
 });
 
 /* istanbul ignore next */
-if (!module.parent) {
-  app.listen(3000);
-  console.log('Express started on port 3000');
+if (!require.main) {
+  const server = app.listen();
+  app.close = () => server.close();
+  console.log(`Express started on port ${server.address().port}`);
 }

examples/downloads/index.js

@@ -23,7 +23,7 @@ app.get('/', function(req, res){
 
 // /files/* is accessed via req.params[0]
 // but here we name it :file
-app.get('/files/:file(*)', function(req, res, next){
+app.get('/files/:file(.*)', function(req, res, next){
   res.download(req.params.file, { root: FILES_DIR }, function (err) {
     if (!err) return; // file sent
     if (err.status !== 404) return next(err); // non-404 error
@@ -34,7 +34,8 @@ app.get('/files/:file(*)', function(req, res, next){
 });
 
 /* istanbul ignore next */
-if (!module.parent) {
-  app.listen(3000);
-  console.log('Express started on port 3000');
+if (!require.main) {
+  const server = app.listen();
+  app.close = () => server.close();
+  console.log(`Express started on port ${server.address().port}`);
 }

examples/ejs/index.js

@@ -51,7 +51,8 @@ app.get('/', function(req, res){
 });
 
 /* istanbul ignore next */
-if (!module.parent) {
-  app.listen(3000);
-  console.log('Express started on port 3000');
+if (!require.main) {
+  const server = app.listen();
+  app.close = () => server.close();
+  console.log(`Express started on port ${server.address().port}`);
 }