mirror of
https://github.com/NginxProxyManager/nginx-proxy-manager.git
synced 2026-02-05 02:12:52 +00:00
Compare commits
11 Commits
cfec30f0eb
...
11d3d2fa45
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
11d3d2fa45 | ||
|
|
eaf9f5ab1e | ||
|
|
4af0a968f0 | ||
|
|
df06eb6c2f | ||
|
|
74360cc9b3 | ||
|
|
16a301fc64 | ||
|
|
124737bbc6 | ||
|
|
d5d222ef2d | ||
|
|
69f9031447 | ||
|
|
727bc944ea | ||
|
|
a0ef0d9048 |
2
.github/workflows/stale.yml
vendored
2
.github/workflows/stale.yml
vendored
@@ -8,7 +8,7 @@ jobs:
|
|||||||
stale:
|
stale:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/stale@v9
|
- uses: actions/stale@v10
|
||||||
with:
|
with:
|
||||||
stale-issue-label: 'stale'
|
stale-issue-label: 'stale'
|
||||||
stale-pr-label: 'stale'
|
stale-pr-label: 'stale'
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
"express-fileupload": "^1.5.2",
|
"express-fileupload": "^1.5.2",
|
||||||
"gravatar": "^1.8.2",
|
"gravatar": "^1.8.2",
|
||||||
"jsonwebtoken": "^9.0.3",
|
"jsonwebtoken": "^9.0.3",
|
||||||
"knex": "2.4.2",
|
"knex": "3.1.0",
|
||||||
"liquidjs": "10.6.1",
|
"liquidjs": "10.6.1",
|
||||||
"lodash": "^4.17.23",
|
"lodash": "^4.17.23",
|
||||||
"moment": "^2.30.1",
|
"moment": "^2.30.1",
|
||||||
|
|||||||
@@ -642,11 +642,6 @@ commander@^10.0.0:
|
|||||||
resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
|
resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
|
||||||
integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
|
integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
|
||||||
|
|
||||||
commander@^9.1.0:
|
|
||||||
version "9.5.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30"
|
|
||||||
integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==
|
|
||||||
|
|
||||||
compress-commons@^4.1.2:
|
compress-commons@^4.1.2:
|
||||||
version "4.1.2"
|
version "4.1.2"
|
||||||
resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.2.tgz#6542e59cb63e1f46a8b21b0e06f9a32e4c8b06df"
|
resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.2.tgz#6542e59cb63e1f46a8b21b0e06f9a32e4c8b06df"
|
||||||
@@ -1498,13 +1493,13 @@ jws@^4.0.1:
|
|||||||
jwa "^2.0.1"
|
jwa "^2.0.1"
|
||||||
safe-buffer "^5.0.1"
|
safe-buffer "^5.0.1"
|
||||||
|
|
||||||
knex@2.4.2:
|
knex@3.1.0:
|
||||||
version "2.4.2"
|
version "3.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/knex/-/knex-2.4.2.tgz#a34a289d38406dc19a0447a78eeaf2d16ebedd61"
|
resolved "https://registry.yarnpkg.com/knex/-/knex-3.1.0.tgz#b6ddd5b5ad26a6315234a5b09ec38dc4a370bd8c"
|
||||||
integrity sha512-tMI1M7a+xwHhPxjbl/H9K1kHX+VncEYcvCx5K00M16bWvpYPKAZd6QrCu68PtHAdIZNQPWZn0GVhqVBEthGWCg==
|
integrity sha512-GLoII6hR0c4ti243gMs5/1Rb3B+AjwMOfjYm97pu0FOQa7JH56hgBxYf5WK2525ceSbBY1cjeZ9yk99GPMB6Kw==
|
||||||
dependencies:
|
dependencies:
|
||||||
colorette "2.0.19"
|
colorette "2.0.19"
|
||||||
commander "^9.1.0"
|
commander "^10.0.0"
|
||||||
debug "4.3.4"
|
debug "4.3.4"
|
||||||
escalade "^3.1.1"
|
escalade "^3.1.1"
|
||||||
esm "^3.2.25"
|
esm "^3.2.25"
|
||||||
@@ -1512,7 +1507,7 @@ knex@2.4.2:
|
|||||||
getopts "2.3.0"
|
getopts "2.3.0"
|
||||||
interpret "^2.2.0"
|
interpret "^2.2.0"
|
||||||
lodash "^4.17.21"
|
lodash "^4.17.21"
|
||||||
pg-connection-string "2.5.0"
|
pg-connection-string "2.6.2"
|
||||||
rechoir "^0.8.0"
|
rechoir "^0.8.0"
|
||||||
resolve-from "^5.0.0"
|
resolve-from "^5.0.0"
|
||||||
tarn "^3.0.2"
|
tarn "^3.0.2"
|
||||||
@@ -2124,10 +2119,10 @@ pg-cloudflare@^1.2.7:
|
|||||||
resolved "https://registry.yarnpkg.com/pg-cloudflare/-/pg-cloudflare-1.2.7.tgz#a1f3d226bab2c45ae75ea54d65ec05ac6cfafbef"
|
resolved "https://registry.yarnpkg.com/pg-cloudflare/-/pg-cloudflare-1.2.7.tgz#a1f3d226bab2c45ae75ea54d65ec05ac6cfafbef"
|
||||||
integrity sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg==
|
integrity sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg==
|
||||||
|
|
||||||
pg-connection-string@2.5.0:
|
pg-connection-string@2.6.2:
|
||||||
version "2.5.0"
|
version "2.6.2"
|
||||||
resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.5.0.tgz#538cadd0f7e603fc09a12590f3b8a452c2c0cf34"
|
resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.6.2.tgz#713d82053de4e2bd166fab70cd4f26ad36aab475"
|
||||||
integrity sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==
|
integrity sha512-ch6OwaeaPYcova4kKZ15sbJ2hKb/VP48ZD2gE7i1J+L4MspCtBMAx8nMgz7bksc7IojCIIWuEhHibSMFH8m8oA==
|
||||||
|
|
||||||
pg-connection-string@^2.9.1:
|
pg-connection-string@^2.9.1:
|
||||||
version "2.9.1"
|
version "2.9.1"
|
||||||
|
|||||||
@@ -1844,9 +1844,9 @@ lodash.debounce@^4.0.8:
|
|||||||
integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
|
integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
|
||||||
|
|
||||||
lodash@^4.17.21:
|
lodash@^4.17.21:
|
||||||
version "4.17.21"
|
version "4.17.23"
|
||||||
resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
|
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
|
||||||
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
|
integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
|
||||||
|
|
||||||
longest-streak@^3.0.0:
|
longest-streak@^3.0.0:
|
||||||
version "3.1.0"
|
version "3.1.0"
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
const { defineConfig } = require('cypress');
|
|
||||||
|
|
||||||
module.exports = defineConfig({
|
|
||||||
requestTimeout: 30000,
|
|
||||||
defaultCommandTimeout: 20000,
|
|
||||||
reporter: 'cypress-multi-reporters',
|
|
||||||
reporterOptions: {
|
|
||||||
configFile: 'multi-reporter.json'
|
|
||||||
},
|
|
||||||
video: true,
|
|
||||||
videosFolder: 'results/videos',
|
|
||||||
screenshotsFolder: 'results/screenshots',
|
|
||||||
e2e: {
|
|
||||||
setupNodeEvents(on, config) {
|
|
||||||
return require("../plugins/index.js")(on, config);
|
|
||||||
},
|
|
||||||
env: {
|
|
||||||
swaggerBase: '{{baseUrl}}/api/schema?ts=' + Date.now(),
|
|
||||||
},
|
|
||||||
baseUrl: 'http://fullstack:81',
|
|
||||||
}
|
|
||||||
});
|
|
||||||
23
test/cypress/config/ci.mjs
Normal file
23
test/cypress/config/ci.mjs
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
import { defineConfig } from 'cypress';
|
||||||
|
import pluginSetup from '../plugins/index.mjs';
|
||||||
|
|
||||||
|
export default defineConfig({
|
||||||
|
requestTimeout: 30000,
|
||||||
|
defaultCommandTimeout: 20000,
|
||||||
|
reporter: "cypress-multi-reporters",
|
||||||
|
reporterOptions: {
|
||||||
|
configFile: "multi-reporter.json"
|
||||||
|
},
|
||||||
|
video: true,
|
||||||
|
videosFolder: "results/videos",
|
||||||
|
screenshotsFolder: "results/screenshots",
|
||||||
|
e2e: {
|
||||||
|
setupNodeEvents(on, config) {
|
||||||
|
return pluginSetup(on, config);
|
||||||
|
},
|
||||||
|
env: {
|
||||||
|
swaggerBase: `{{baseUrl}}/api/schema?ts=${Date.now()}`,
|
||||||
|
},
|
||||||
|
baseUrl: "http://fullstack:81",
|
||||||
|
}
|
||||||
|
});
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
const { defineConfig } = require('cypress');
|
|
||||||
|
|
||||||
module.exports = defineConfig({
|
|
||||||
requestTimeout: 30000,
|
|
||||||
defaultCommandTimeout: 20000,
|
|
||||||
reporter: 'cypress-multi-reporters',
|
|
||||||
reporterOptions: {
|
|
||||||
configFile: 'multi-reporter.json'
|
|
||||||
},
|
|
||||||
video: true,
|
|
||||||
videosFolder: 'results/videos',
|
|
||||||
screenshotsFolder: 'results/screenshots',
|
|
||||||
e2e: {
|
|
||||||
setupNodeEvents(on, config) {
|
|
||||||
return require("../plugins/index.js")(on, config);
|
|
||||||
},
|
|
||||||
env: {
|
|
||||||
swaggerBase: '{{baseUrl}}/api/schema?ts=' + Date.now(),
|
|
||||||
},
|
|
||||||
baseUrl: 'http://127.0.0.1:3081',
|
|
||||||
}
|
|
||||||
});
|
|
||||||
23
test/cypress/config/dev.mjs
Normal file
23
test/cypress/config/dev.mjs
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
import { defineConfig } from 'cypress';
|
||||||
|
import pluginSetup from '../plugins/index.mjs';
|
||||||
|
|
||||||
|
export default defineConfig({
|
||||||
|
requestTimeout: 30000,
|
||||||
|
defaultCommandTimeout: 20000,
|
||||||
|
reporter: "cypress-multi-reporters",
|
||||||
|
reporterOptions: {
|
||||||
|
configFile: "multi-reporter.json"
|
||||||
|
},
|
||||||
|
video: true,
|
||||||
|
videosFolder: "results/videos",
|
||||||
|
screenshotsFolder: "results/screenshots",
|
||||||
|
e2e: {
|
||||||
|
setupNodeEvents(on, config) {
|
||||||
|
return pluginSetup(on, config);
|
||||||
|
},
|
||||||
|
env: {
|
||||||
|
swaggerBase: `{{baseUrl}}/api/schema?ts=${Date.now()}`,
|
||||||
|
},
|
||||||
|
baseUrl: "http://127.0.0.1:3081",
|
||||||
|
}
|
||||||
|
});
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
const { SwaggerValidation } = require('@jc21/cypress-swagger-validation');
|
import { SwaggerValidation } from '@jc21/cypress-swagger-validation';
|
||||||
const chalk = require('chalk');
|
import chalk from 'chalk';
|
||||||
|
|
||||||
module.exports = (on, config) => {
|
export default (on, config) => {
|
||||||
// Replace swaggerBase config var wildcard
|
// Replace swaggerBase config var wildcard
|
||||||
if (typeof config.env.swaggerBase !== 'undefined') {
|
if (typeof config.env.swaggerBase !== 'undefined') {
|
||||||
config.env.swaggerBase = config.env.swaggerBase.replace('{{baseUrl}}', config.baseUrl);
|
config.env.swaggerBase = config.env.swaggerBase.replace('{{baseUrl}}', config.baseUrl);
|
||||||
@@ -1,6 +1,9 @@
|
|||||||
{
|
{
|
||||||
"include": [
|
"include": [
|
||||||
"./node_modules/cypress",
|
"./node_modules/cypress",
|
||||||
"cypress/**/*.js"
|
"cypress/**/*.js",
|
||||||
|
"cypress/config/dev.mjs",
|
||||||
|
"cypress/config/ci.mjs",
|
||||||
|
"cypress/plugins/index.mjs"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
"@jc21/cypress-swagger-validation": "^0.3.2",
|
"@jc21/cypress-swagger-validation": "^0.3.2",
|
||||||
"@quobix/vacuum": "^0.23.4",
|
"@quobix/vacuum": "^0.23.4",
|
||||||
"axios": "^1.13.1",
|
"axios": "^1.13.1",
|
||||||
"chalk": "^4.1.0",
|
"chalk": "^5.6.2",
|
||||||
"cypress": "^15.9.0",
|
"cypress": "^15.9.0",
|
||||||
"cypress-multi-reporters": "^2.0.5",
|
"cypress-multi-reporters": "^2.0.5",
|
||||||
"cypress-wait-until": "^3.0.2",
|
"cypress-wait-until": "^3.0.2",
|
||||||
@@ -21,9 +21,9 @@
|
|||||||
"mocha-junit-reporter": "^2.2.1"
|
"mocha-junit-reporter": "^2.2.1"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"cypress": "HTTP_PROXY=127.0.0.1:8128 HTTPS_PROXY=127.0.0.1:8128 cypress open --config-file=cypress/config/ci.js",
|
"cypress": "HTTP_PROXY=127.0.0.1:8128 HTTPS_PROXY=127.0.0.1:8128 cypress open --config-file=cypress/config/ci.mjs",
|
||||||
"cypress:headless": "HTTP_PROXY=127.0.0.1:8128 HTTPS_PROXY=127.0.0.1:8128 cypress run --config-file=cypress/config/ci.js",
|
"cypress:headless": "HTTP_PROXY=127.0.0.1:8128 HTTPS_PROXY=127.0.0.1:8128 cypress run --config-file=cypress/config/ci.mjs",
|
||||||
"cypress:dev": "cypress run --config-file=cypress/config/dev.js",
|
"cypress:dev": "cypress run --config-file=cypress/config/dev.mjs",
|
||||||
"swagger-lint": "vacuum lint -b -q -d -a --no-clip -n=warn"
|
"swagger-lint": "vacuum lint -b -q -d -a --no-clip -n=warn"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
|
|||||||
@@ -565,6 +565,11 @@ chalk@^4.0.0, chalk@^4.1.0:
|
|||||||
ansi-styles "^4.1.0"
|
ansi-styles "^4.1.0"
|
||||||
supports-color "^7.1.0"
|
supports-color "^7.1.0"
|
||||||
|
|
||||||
|
chalk@^5.6.2:
|
||||||
|
version "5.6.2"
|
||||||
|
resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.6.2.tgz#b1238b6e23ea337af71c7f8a295db5af0c158aea"
|
||||||
|
integrity sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==
|
||||||
|
|
||||||
charenc@0.0.2:
|
charenc@0.0.2:
|
||||||
version "0.0.2"
|
version "0.0.2"
|
||||||
resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
|
resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
|
||||||
@@ -1629,9 +1634,9 @@ lodash.once@^4.1.1:
|
|||||||
integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
|
integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
|
||||||
|
|
||||||
lodash@^4.17.21:
|
lodash@^4.17.21:
|
||||||
version "4.17.21"
|
version "4.17.23"
|
||||||
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
|
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
|
||||||
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
|
integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
|
||||||
|
|
||||||
log-symbols@^4.0.0, log-symbols@^4.1.0:
|
log-symbols@^4.0.0, log-symbols@^4.1.0:
|
||||||
version "4.1.0"
|
version "4.1.0"
|
||||||
|
|||||||
Reference in New Issue
Block a user