diff options
-rw-r--r-- | .github/workflows/browserstack.yml | 8 | ||||
-rw-r--r-- | .github/workflows/codeql-analysis.yml | 6 | ||||
-rw-r--r-- | .github/workflows/node.js.yml | 8 | ||||
-rw-r--r-- | .release-it.cjs | 5 | ||||
-rw-r--r-- | AUTHORS.txt | 2 | ||||
-rw-r--r-- | build/release/post-release.sh | 2 | ||||
-rw-r--r-- | build/release/pre-release.sh | 3 | ||||
-rw-r--r-- | build/tasks/minify.js | 2 | ||||
-rw-r--r-- | package-lock.json | 7 | ||||
-rw-r--r-- | src/wrapper-esm.js | 2 | ||||
-rw-r--r-- | src/wrapper-factory-esm.js | 2 | ||||
-rw-r--r-- | src/wrapper-factory.js | 2 | ||||
-rw-r--r-- | src/wrapper.js | 2 |
13 files changed, 34 insertions, 17 deletions
diff --git a/.github/workflows/browserstack.yml b/.github/workflows/browserstack.yml index 3357ae92d..47ff7634b 100644 --- a/.github/workflows/browserstack.yml +++ b/.github/workflows/browserstack.yml @@ -23,7 +23,13 @@ jobs: BROWSER: - 'IE_11' - 'Safari_latest' - - 'Safari_latest-1' + # JTR doesn't take into account the jump from Safari 18 to 26, + # so we need to specify versions explicitly. Also, while BrowserStack + # already added macOS Tahoe with Safari 26, it's not a stable release + # yet, so we need to test on Safari 17 as well. + # See https://github.com/jquery/jquery-test-runner/issues/17 + - 'Safari_18' + - 'Safari_17' - 'Chrome_latest' - 'Chrome_latest-1' - 'Opera_latest' diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 5b2bdead3..8c2f79b35 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -33,7 +33,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18 + uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2 # Override language selection by uncommenting this and choosing your languages # with: # languages: go, javascript, csharp, python, cpp, java @@ -41,7 +41,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18 + uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2 # âšī¸ Command-line programs to run using the OS shell. # đ https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun @@ -55,4 +55,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18 + uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2 diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 851116ef7..cd2bb3f45 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -72,7 +72,13 @@ jobs: - name: Install Firefox ESR run: | - wget --no-verbose $FIREFOX_SOURCE_URL -O - | tar -jx -C ${HOME} + # Support: Firefox <135 only + # Older Firefox used to be compressed using bzip2, newer using xz. Try + # to uncompress using xz, fall back to bzip2 if that fails. + # Note: this will download the old Firefox ESR twice, but it will still work + # when the current ESR version starts to use xz with no changes to the code. + wget --no-verbose "$FIREFOX_SOURCE_URL" -O - | tar -Jx -C "$HOME" || \ + wget --no-verbose "$FIREFOX_SOURCE_URL" -O - | tar -jx -C "$HOME" echo "PATH=${HOME}/firefox:$PATH" >> "$GITHUB_ENV" echo "FIREFOX_BIN=${HOME}/firefox/firefox" >> "$GITHUB_ENV" if: contains(matrix.NAME, 'Firefox ESR') diff --git a/.release-it.cjs b/.release-it.cjs index ff55b0ef1..425e9d313 100644 --- a/.release-it.cjs +++ b/.release-it.cjs @@ -11,7 +11,7 @@ module.exports = { hooks: { "before:init": "bash ./build/release/pre-release.sh", "after:version:bump": - "sed -i 's/main\\/AUTHORS.txt/${version}\\/AUTHORS.txt/' package.json", + "sed -i '' -e 's|main/AUTHORS.txt|${version}/AUTHORS.txt|' package.json", "after:bump": "cross-env VERSION=${version} npm run build:all", "before:git:release": "git add -f dist/ dist-module/ changelog.md", "after:release": "echo 'Run the following to complete the release:' && " + @@ -34,6 +34,7 @@ module.exports = { tokenRef: "JQUERY_GITHUB_TOKEN" }, npm: { - publish: true + publish: true, + publishPath: "tmp/release/dist" } }; diff --git a/AUTHORS.txt b/AUTHORS.txt index 1ef119e02..73d14981c 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -373,3 +373,5 @@ Gabriela Gutierrez <gabigutierrez@google.com> Dimitri Papadopoulos Orfanos <3234522+DimitriPapadopoulos@users.noreply.github.com> J.Son <x@x-wx.com> Liam James <liam@minimaximize.com> +ac-mmi <79802170+ac-mmi@users.noreply.github.com> +neogy-akash <AKASHNEOGY400@GMAIL.COM> diff --git a/build/release/post-release.sh b/build/release/post-release.sh index 6cc4d6517..271c00734 100644 --- a/build/release/post-release.sh +++ b/build/release/post-release.sh @@ -43,7 +43,7 @@ git push --follow-tags cd - # Restore AUTHORS URL -sed -i "s/$1\/AUTHORS.txt/main\/AUTHORS.txt/" package.json +sed -i '' -e "s|$1/AUTHORS.txt|main/AUTHORS.txt|" package.json git add package.json # Remove built files from tracking. diff --git a/build/release/pre-release.sh b/build/release/pre-release.sh index f469b0da0..be59e0109 100644 --- a/build/release/pre-release.sh +++ b/build/release/pre-release.sh @@ -13,7 +13,8 @@ npm run release:clean npm run authors:check # Run tests -npm test +# Temporarily disable running tests on release due to flakiness in Chrome +# npm test # Clone dist and cdn repos to the tmp/release directory mkdir -p tmp/release diff --git a/build/tasks/minify.js b/build/tasks/minify.js index aff942b32..d28c16cf4 100644 --- a/build/tasks/minify.js +++ b/build/tasks/minify.js @@ -24,7 +24,7 @@ export default async function minify( { filename, dir, esm } ) { comments: false, preamble: `/*! jQuery ${ version }` + " | (c) OpenJS Foundation and other contributors" + - " | jquery.org/license */\n" + " | jquery.com/license */\n" }, inlineSourcesContent: false, mangle: true, diff --git a/package-lock.json b/package-lock.json index b16eaf512..abba87e01 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5076,15 +5076,16 @@ } }, "node_modules/form-data": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", - "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", + "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", "dev": true, "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", "es-set-tostringtag": "^2.1.0", + "hasown": "^2.0.2", "mime-types": "^2.1.12" }, "engines": { diff --git a/src/wrapper-esm.js b/src/wrapper-esm.js index a4574a3fa..0e6d49cfa 100644 --- a/src/wrapper-esm.js +++ b/src/wrapper-esm.js @@ -4,7 +4,7 @@ * * Copyright OpenJS Foundation and other contributors * Released under the MIT license - * https://jquery.org/license + * https://jquery.com/license/ * * Date: @DATE */ diff --git a/src/wrapper-factory-esm.js b/src/wrapper-factory-esm.js index 9127d41e6..b7a202712 100644 --- a/src/wrapper-factory-esm.js +++ b/src/wrapper-factory-esm.js @@ -4,7 +4,7 @@ * * Copyright OpenJS Foundation and other contributors * Released under the MIT license - * https://jquery.org/license + * https://jquery.com/license/ * * Date: @DATE */ diff --git a/src/wrapper-factory.js b/src/wrapper-factory.js index 212ff33bf..4c2b0cfc8 100644 --- a/src/wrapper-factory.js +++ b/src/wrapper-factory.js @@ -4,7 +4,7 @@ * * Copyright OpenJS Foundation and other contributors * Released under the MIT license - * https://jquery.org/license + * https://jquery.com/license/ * * Date: @DATE */ diff --git a/src/wrapper.js b/src/wrapper.js index ce7637c63..a17aa8a0c 100644 --- a/src/wrapper.js +++ b/src/wrapper.js @@ -4,7 +4,7 @@ * * Copyright OpenJS Foundation and other contributors * Released under the MIT license - * https://jquery.org/license + * https://jquery.com/license/ * * Date: @DATE */ |