From 3329f5b0ef3455815a7f8c3de210f401fa24d7f7 Mon Sep 17 00:00:00 2001
From: Lei Chen <chenleicoder@foxmail.com>
Date: Sat, 27 Nov 2021 17:34:09 +0800
Subject: [PATCH] deps: remove semver and mkdirp deps and add node17 test
 (#2641)

* deps: remove semver and mkdirp deps

* ci: add node v17 test

* ci: change ci yml config

* ci: fix yml grammer error

* [skip ci] use matrix os
---
 .github/workflows/ci.yml | 28 ++++++++++++++++++++++------
 bin/stylus               |  3 +--
 lib/middleware.js        |  3 +--
 package-lock.json        | 10 ----------
 package.json             |  2 --
 5 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b41c07bc2..c6477b5e7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,12 +10,10 @@ on:
 
 jobs:
   node_tests:
-    name: 'Test stylus on ${{matrix.os}} with node${{matrix.node}}'
+    name: 'Test stylus on ${{matrix.os}} with node16'
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        # Latest four Nodejs LTS version
-        node: [10, 12, 14, 16]
     runs-on: ${{ matrix.os }}
     steps:
      # Pull repo to test machine
@@ -24,7 +22,7 @@ jobs:
      - uses: actions/setup-node@v2
        with:
          # The Node.js version to configure
-         node-version: ${{ matrix.node }}
+         node-version: '16'
      # Caching dependencies to speed up workflows    
      - name: Get npm cache directory
        id: npm-cache-dir
@@ -43,8 +41,26 @@ jobs:
        # Output useful info for debugging.
        run: node --version && npm --version 
      - name: Run Test
-       run: npm run test
-     
+       run: npm run test     
      # Not work currently, need investigate
      #- name: Run Test Cov
      #  run: npm run test-cov
+
+  compat_node_tests:
+    name: 'Compat test stylus on ${{matrix.os}} with node${{matrix.node}}'
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        node: [10, 12, 14, 17]
+    runs-on: ${{ matrix.os }}
+    steps:
+     - uses: actions/checkout@v2
+     - uses: actions/setup-node@v2
+       with:
+         node-version: ${{ matrix.node }}
+     - name: Install npm dependencies
+       run: npm install
+     - name: Print put node & npm version
+       run: node --version && npm --version 
+     - name: Run Test
+       run: npm run test
diff --git a/bin/stylus b/bin/stylus
index 80bd61845..df9a18b63 100755
--- a/bin/stylus
+++ b/bin/stylus
@@ -12,8 +12,7 @@ var fs = require('fs')
   , resolve = require('path').resolve
   , join = require('path').join
   , isWindows = process.platform === 'win32'
-  , semver = require('semver')
-  , mkdirSync = semver.satisfies(process.version, '>=10.12.0') ? fs.mkdirSync : require('mkdirp').sync;
+  , mkdirSync = fs.mkdirSync;
 
 /**
  * Arguments.
diff --git a/lib/middleware.js b/lib/middleware.js
index d49e7767c..84884cca4 100644
--- a/lib/middleware.js
+++ b/lib/middleware.js
@@ -9,14 +9,13 @@
  */
 
 var stylus = require('./stylus')
-  , semver = require('semver')
   , fs = require('fs')
   , url = require('url')
   , dirname = require('path').dirname
   , join = require('path').join
   , sep = require('path').sep
   , debug = require('debug')('stylus:middleware')
-  , mkdir = semver.satisfies(process.version, '>=10.12.0') ? fs.mkdir : require('mkdirp');
+  , mkdir = fs.mkdir;
 
 /**
  * Import map.
diff --git a/package-lock.json b/package-lock.json
index 6d6146ad3..8973f06fd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -552,11 +552,6 @@
       "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
       "dev": true
     },
-    "mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
-    },
     "mocha": {
       "version": "9.0.3",
       "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.0.3.tgz",
@@ -793,11 +788,6 @@
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
-    "semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-    },
     "serialize-javascript": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
diff --git a/package.json b/package.json
index 75d2fa8e9..1e5dbffe9 100644
--- a/package.json
+++ b/package.json
@@ -32,10 +32,8 @@
     "css": "^3.0.0",
     "debug": "^4.3.2",
     "glob": "^7.1.6",
-    "mkdirp": "~1.0.4",
     "safer-buffer": "^2.1.2",
     "sax": "~1.2.4",
-    "semver": "^6.3.0",
     "source-map": "^0.7.3"
   },
   "devDependencies": {