Skip to content

WIP Build: Make the JavaScript middleware work on Nginx as well #5652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
WIP Build: Make the JavaScript middleware work on Nginx as well
  • Loading branch information
mgol committed Apr 7, 2025
commit 32873aa609236c02cc11c86e4ddc722d42e75e90
14 changes: 12 additions & 2 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ export default [
"test/node_smoke_tests/**",
"test/bundler_smoke_tests/**/*",
"test/promises_aplus_adapters/**",
"test/middleware-mockserver.cjs"
"test/middleware-*.js"
],
languageOptions: {
ecmaVersion: "latest",
Expand Down Expand Up @@ -376,13 +376,23 @@ export default [
"src/wrapper-factory.js",
"dist/jquery.factory.js",
"dist/jquery.factory.slim.js",
"test/middleware-mockserver.cjs"
"test/middleware-*.js"
],
rules: {
"no-implicit-globals": "off"
}
},

{
files: [
"test/middleware-*.js"
],
languageOptions: {
ecmaVersion: "latest",
sourceType: "module"
}
},

{
files: [
"dist/**"
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@
"test:firefox": "npm run pretest && npm run build:main && npm run test:unit -- -v -b firefox --headless",
"test:ie": "npm run pretest && npm run build:main && npm run test:unit -- -v -b ie",
"test:safari": "npm run pretest && npm run build:main && npm run test:unit -- -b safari",
"test:server": "jtr serve -m test/middleware-mockserver.cjs",
"test:server": "jtr serve -m test/middleware-mockserver.js",
"test:esm": "npm run pretest && npm run build:main && npm run test:unit -- -f esmodules --headless",
"test:no-deprecated": "npm run pretest && npm run build -- -e deprecated && npm run test:unit -- --headless",
"test:selector-native": "npm run pretest && npm run build -- -e selector && npm run test:unit -- --headless",
"test:slim": "npm run pretest && npm run build -- --slim && npm run test:unit -- --headless",
"test:unit": "jtr -m test/middleware-mockserver.cjs",
"test:unit": "jtr -m test/middleware-mockserver.js",
"test": "npm run build:all && npm run lint && npm run test:browserless && npm run test:browser && npm run test:esm && npm run test:slim && npm run test:no-deprecated && npm run test:selector-native"
},
"homepage": "https://jquery.com",
Expand Down
2 changes: 1 addition & 1 deletion test/data/mock.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/**
* Keep in sync with /test/middleware-mockserver.cjs
* Keep in sync with /test/middleware-mockserver.js
*/
function cleanCallback( $callback ) {
return preg_replace( '/[^a-z0-9_]/i', '', $callback );
Expand Down
2 changes: 1 addition & 1 deletion test/data/testrunner.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ var oldActive = 0,
*/

// Max time for done() to fire in an async test.
QUnit.config.testTimeout = 60e3; // 1 minute
QUnit.config.testTimeout = 60e2; // 6 seconds

// Enforce an "expect" argument or expect() call in all test bodies.
QUnit.config.requireExpects = true;
Expand Down
Loading
Loading