Merge branch 'master' into dependabot/npm_and_yarn/c8-10.1.2

Author: yoshinorin

.github/workflows/linter.yml

@@ -1,20 +1,17 @@
 name: Linter
 
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 jobs:
   linter:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js 14.x
-        uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: '14.x'
+          node-version: 'lts/*'
       - name: Install Dependencies
         run: npm install
       - name: Lint
         run: |
           npm run eslint
-        env:
-          CI: true

.github/workflows/tester.yml

@@ -1,19 +1,19 @@
 name: Tester
 
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 jobs:
   tester:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        node-version: ['14.x', '16.x', '18.x']
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        node-version: [ '18','20','22' ]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install Dependencies
@@ -26,21 +26,19 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        node-version: ['14.x']
+        os: [ ubuntu-latest ]
+        node-version: [ 'lts/*' ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install Dependencies
         run: npm install
       - name: Coverage
         run: npm run test-cov
-        env:
-          CI: true
       - name: Coveralls
-        uses: coverallsapp/github-action@master
+        uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.github_token }}

lib/encode_url.ts

@@ -8,7 +8,7 @@ const encodeURL = (str: string) => {
     // Exit if input is a data url
     if (parsed.origin === 'null') return str;
 
-    parsed.search = encodeURI(unescape(parsed.search));
+    parsed.search = new URLSearchParams(parsed.search).toString();
     parsed.pathname = encodeURI(decodeURI(parsed.pathname));
     // preserve IDN
     return format(parsed, { unicode: true });

package.json

@@ -8,7 +8,6 @@
     "prepublishOnly": "npm install && npm run clean && npm run build",
     "build": "tsc -b",
     "clean": "tsc -b --clean",
-    "preeslint": "npm run clean && npm run build",
     "eslint": "eslint lib test",
     "pretest": "npm run clean && npm run build",
     "test": "mocha --require ts-node/register",
@@ -65,6 +64,6 @@
     "strip-indent": "^3.0.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   }
 }

test/encode_url.spec.ts

@@ -63,6 +63,12 @@ describe('encodeURL', () => {
     encodeURL(content).should.eql('http://foo.com/bar?query=b%C3%A1z#f%C3%B3o');
   });
 
+  it('perserve escape in search', () => {
+    // https://github.com/hexojs/hexo-util/issues/411
+    const content = 'https://fóo.com/path?search1=2%2B2&search2=bár';
+    encodeURL(content).should.eql(content.replace('bár', 'b%C3%A1r'));
+  });
+
   it('idn', () => {
     const content = 'http://bár.com/baz';
     encodeURL(content).should.eql('http://bár.com/baz');