diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b91bfce..772c8fa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,6 +32,6 @@ jobs: - name: Publish to npm if: startsWith(github.ref, 'refs/tags/v') - run: npm publish - env: - NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} + run: | + echo "//registry.npmjs.org/:_authToken=${{secrets.NPM_TOKEN}}" >> ~/.npmrc + npm publish --access public diff --git a/README.md b/README.md index 20d8831..1da2f03 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,10 @@ [![Build and Test](https://github.com/jin-qu/jinqu-fetch/actions/workflows/build.yml/badge.svg)](https://github.com/jin-qu/jinqu-fetch/actions/workflows/build.yml) [![codecov](https://codecov.io/gh/jin-qu/jinqu-fetch/graph/badge.svg?token=q74l1woFij)](https://codecov.io/gh/jin-qu/jinqu-fetch) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/6b5e54e8758140bb8ecb481c53c50a9f)](https://app.codacy.com/gh/jin-qu/jinqu-fetch/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade) -Known Vulnerabilities +Known Vulnerabilities -[![npm version](https://img.shields.io/npm/v/jinqu-fetch)](https://www.npmjs.com/package/jinqu-fetch) -[![npm downloads](https://img.shields.io/npm/dm/jinqu-fetch.svg)](https://www.npmjs.com/package/jinqu-fetch) +[![npm version](https://img.shields.io/npm/v/@jin-qu/fetch)](https://www.npmjs.com/package/@jin-qu/fetch) +[![npm downloads](https://img.shields.io/npm/dm/@jin-qu/fetch.svg)](https://www.npmjs.com/package/@jin-qu/fetch) [![GitHub issues](https://img.shields.io/github/issues/jin-qu/jinqu-fetch.svg)](https://github.com/jin-qu/jinqu-fetch/issues) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/jin-qu/jinqu-fetch/main/LICENSE) diff --git a/lib/fetch-provider.ts b/lib/fetch-provider.ts index a272e90..ecc392f 100644 --- a/lib/fetch-provider.ts +++ b/lib/fetch-provider.ts @@ -1,4 +1,4 @@ -import { AjaxOptions, AjaxResponse, IAjaxProvider, Value } from "jinqu"; +import { AjaxOptions, AjaxResponse, IAjaxProvider, Value } from "@jin-qu/jinqu"; export type FetchOptions = AjaxOptions & RequestInit; diff --git a/package-lock.json b/package-lock.json index 32777ee..51299ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { - "name": "jinqu-fetch", - "version": "2.0.4", + "name": "@jin-qu/fetch", + "version": "2.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "jinqu-fetch", - "version": "2.0.4", + "name": "@jin-qu/fetch", + "version": "2.0.0", "license": "MIT", "dependencies": { - "jinqu": "^2.0.0" + "@jin-qu/jinqu": "^2.0.0" }, "devDependencies": { "@eslint/js": "^9.20.0", @@ -1136,6 +1136,17 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/@jin-qu/jinqu": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@jin-qu/jinqu/-/jinqu-2.0.0.tgz", + "integrity": "sha512-W0Rwol+5dD0OZ1Ymtc6805ESpZNRIJojuKKW3dfySvarlp7BZ/TWiTUp/YOvtZt/d3MMzwRzfhv5oAyvpBiLZw==", + "license": "MIT", + "dependencies": { + "class-transformer": "^0.5.1", + "deep-equal": "^2.2.3", + "jokenizer": "^1.0.0" + } + }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.8", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz", @@ -4468,17 +4479,6 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/jinqu": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/jinqu/-/jinqu-2.0.0.tgz", - "integrity": "sha512-qaB/4MCtwQ8dCPc1iLTDRos6RnTc2g8OlNFrOwgpUNda2Vjb43sp/rBDig9U7jIOEXZH3Kd6j5JQBfuUt4Lu4w==", - "license": "MIT", - "dependencies": { - "class-transformer": "^0.5.1", - "deep-equal": "^2.2.3", - "jokenizer": "^1.0.0" - } - }, "node_modules/jokenizer": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/jokenizer/-/jokenizer-1.0.0.tgz", diff --git a/package.json b/package.json index 10c79e8..e2288f0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "jinqu-fetch", - "version": "2.0.4", + "name": "@jin-qu/fetch", + "version": "2.0.0", "description": "Jinqu Fetch implementation", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -43,6 +43,6 @@ "typescript": "^5.7.3" }, "dependencies": { - "jinqu": "^2.0.0" + "@jin-qu/jinqu": "^2.0.0" } } diff --git a/yarn.lock b/yarn.lock index cbb9fda..1b95faf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -24,7 +24,7 @@ resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz" integrity sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ== -"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.23.9", "@babel/core@^7.8.0", "@babel/core@>=7.0.0-beta.0 <8": +"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.23.9": version "7.26.8" resolved "https://registry.npmjs.org/@babel/core/-/core-7.26.8.tgz" integrity sha512-l+lkXCHS6tQEc5oUpK28xBOZ6+HwaH7YwoYQbLFiYb4nS2/l1tKnZEtEWkD0GuiYdvArf9qBS0XlQGXzPMsNqQ== @@ -331,7 +331,7 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@^9.20.0", "@eslint/js@9.20.0": +"@eslint/js@9.20.0", "@eslint/js@^9.20.0": version "9.20.0" resolved "https://registry.npmjs.org/@eslint/js/-/js-9.20.0.tgz" integrity sha512-iZA07H9io9Wn836aVTytRaNqh00Sad+EamwOVJT12GTLw1VGMFV/4JaME+JjLtr9fiGaoWgYnS54wrfWsSs4oQ== @@ -552,7 +552,7 @@ jest-haste-map "^29.7.0" slash "^3.0.0" -"@jest/transform@^29.0.0", "@jest/transform@^29.7.0": +"@jest/transform@^29.7.0": version "29.7.0" resolved "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz" integrity sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw== @@ -573,7 +573,7 @@ slash "^3.0.0" write-file-atomic "^4.0.2" -"@jest/types@^29.0.0", "@jest/types@^29.6.3": +"@jest/types@^29.6.3": version "29.6.3" resolved "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz" integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw== @@ -585,6 +585,15 @@ "@types/yargs" "^17.0.8" chalk "^4.0.0" +"@jin-qu/jinqu@^2.0.0": + version "2.0.0" + resolved "https://registry.npmjs.org/@jin-qu/jinqu/-/jinqu-2.0.0.tgz" + integrity sha512-W0Rwol+5dD0OZ1Ymtc6805ESpZNRIJojuKKW3dfySvarlp7BZ/TWiTUp/YOvtZt/d3MMzwRzfhv5oAyvpBiLZw== + dependencies: + class-transformer "^0.5.1" + deep-equal "^2.2.3" + jokenizer "^1.0.0" + "@jridgewell/gen-mapping@^0.3.5": version "0.3.8" resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz" @@ -609,14 +618,6 @@ resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz" integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ== -"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": - version "0.3.25" - resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz" - integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== - dependencies: - "@jridgewell/resolve-uri" "^3.1.0" - "@jridgewell/sourcemap-codec" "^1.4.14" - "@jridgewell/trace-mapping@0.3.9": version "0.3.9" resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz" @@ -625,6 +626,14 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" +"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": + version "0.3.25" + resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz" + integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== + dependencies: + "@jridgewell/resolve-uri" "^3.1.0" + "@jridgewell/sourcemap-codec" "^1.4.14" + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz" @@ -633,7 +642,7 @@ "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" -"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5": +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== @@ -811,7 +820,7 @@ natural-compare "^1.4.0" ts-api-utils "^2.0.1" -"@typescript-eslint/parser@^8.0.0 || ^8.0.0-alpha.0", "@typescript-eslint/parser@^8.24.0": +"@typescript-eslint/parser@^8.24.0": version "8.24.0" resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.24.0.tgz" integrity sha512-MFDaO9CYiard9j9VepMNa9MTcqVvSny2N4hkY6roquzj8pdCBRENhErrteaQuu7Yjn1ppk0v1/ZF9CG3KIlrTA== @@ -889,7 +898,7 @@ acorn-walk@^8.1.1: dependencies: acorn "^8.11.0" -"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", acorn@^8.11.0, acorn@^8.14.0, acorn@^8.4.1: +acorn@^8.11.0, acorn@^8.14.0, acorn@^8.4.1: version "8.14.0" resolved "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz" integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA== @@ -985,7 +994,7 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" -babel-jest@^29.0.0, babel-jest@^29.7.0: +babel-jest@^29.7.0: version "29.7.0" resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz" integrity sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg== @@ -1075,7 +1084,7 @@ braces@^3.0.3: dependencies: fill-range "^7.1.1" -browserslist@^4.24.0, "browserslist@>= 4.21.0": +browserslist@^4.24.0: version "4.24.4" resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz" integrity sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A== @@ -1264,7 +1273,7 @@ cross-spawn@^7.0.3, cross-spawn@^7.0.6: shebang-command "^2.0.0" which "^2.0.1" -debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@4: +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: version "4.4.0" resolved "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz" integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA== @@ -1446,7 +1455,7 @@ eslint-visitor-keys@^4.2.0: resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz" integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw== -"eslint@^6.0.0 || ^7.0.0 || >=8.0.0", "eslint@^8.57.0 || ^9.0.0", eslint@9.20.0: +eslint@9.20.0: version "9.20.0" resolved "https://registry.npmjs.org/eslint/-/eslint-9.20.0.tgz" integrity sha512-aL4F8167Hg4IvsW89ejnpTwx+B/UQRzJPGgbIOl+4XqffWsahVVsLEWoZvnrVuwpWmnRd7XeXmQI1zlKcFDteA== @@ -1571,7 +1580,7 @@ fast-glob@^3.3.2: merge2 "^1.3.0" micromatch "^4.0.8" -fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0, fast-json-stable-stringify@2.x: +fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== @@ -1664,6 +1673,11 @@ fs.realpath@^1.0.0: resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== +fsevents@^2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== + function-bind@^1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz" @@ -2326,7 +2340,7 @@ jest-resolve-dependencies@^29.7.0: jest-regex-util "^29.6.3" jest-snapshot "^29.7.0" -jest-resolve@*, jest-resolve@^29.7.0: +jest-resolve@^29.7.0: version "29.7.0" resolved "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz" integrity sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA== @@ -2470,7 +2484,7 @@ jest-worker@^29.7.0: merge-stream "^2.0.0" supports-color "^8.0.0" -jest@^29.0.0, jest@^29.7.0: +jest@^29.7.0: version "29.7.0" resolved "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz" integrity sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw== @@ -2480,15 +2494,6 @@ jest@^29.0.0, jest@^29.7.0: import-local "^3.0.2" jest-cli "^29.7.0" -jinqu@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/jinqu/-/jinqu-2.0.0.tgz" - integrity sha512-qaB/4MCtwQ8dCPc1iLTDRos6RnTc2g8OlNFrOwgpUNda2Vjb43sp/rBDig9U7jIOEXZH3Kd6j5JQBfuUt4Lu4w== - dependencies: - class-transformer "^0.5.1" - deep-equal "^2.2.3" - jokenizer "^1.0.0" - jokenizer@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/jokenizer/-/jokenizer-1.0.0.tgz" @@ -2499,7 +2504,7 @@ js-tokens@^4.0.0: resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.13.1, js-yaml@3.14.1: +js-yaml@3.14.1, js-yaml@^3.13.1: version "3.14.1" resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== @@ -2986,12 +2991,7 @@ safe-regex-test@^1.1.0: es-errors "^1.3.0" is-regex "^1.2.1" -semver@^6.3.0: - version "6.3.1" - resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz" - integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== - -semver@^6.3.1: +semver@^6.3.0, semver@^6.3.1: version "6.3.1" resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== @@ -3250,7 +3250,7 @@ ts-jest@^29.2.5: semver "^7.6.3" yargs-parser "^21.1.1" -ts-node@^10.9.2, ts-node@>=9.0.0: +ts-node@^10.9.2: version "10.9.2" resolved "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz" integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ== @@ -3286,7 +3286,7 @@ type-fest@^0.21.3: resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz" integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== -typescript@^5.7.3, typescript@>=2.7, "typescript@>=4.3 <6", typescript@>=4.8.4, "typescript@>=4.8.4 <5.8.0": +typescript@^5.7.3: version "5.7.3" resolved "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz" integrity sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==