Skip to content

Commit f010143

Browse files
committed
Massive update to dependencies which then necessitated all sorts of updates to tests and the build process
1 parent 78b84af commit f010143

32 files changed

+155
-18695
lines changed

.github/pull_request_template.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ _**TODO: describe it...**_
1212

1313
## How can someone test that the problem was solved?
1414

15+
_**TODO: describe specific testing that a reviewer should perform...**_
16+
1517
- [ ] I have run the unit tests locally
1618
- [ ] I have tested this change with all supported versions of jQuery
1719
- [ ] I have tested this change on at least 2 browsers
1820

19-
_**TODO: describe additional testing scenarios...**_

.jshintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
"browser": true,
5757
"jquery": true,
5858
"node": true,
59+
"esversion": 6,
5960
"globals": {
6061
"define": true,
6162
"ActiveXObject": true

.travis.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## 2024-02-17 v2.6.1
2+
* Changed license from dual (MIT & GPL) to only be MIT
3+
* Updated authorship to myself (creator of all v2 changes) and moved JD Sharp to contributor
4+
* Massive (long needed) update to dev dependencies, and thus most of the test and build infrastructure
5+
* NO source code changes, but the minified version will change due to dependency updates
6+
* Remove support for IE 11 and requirejs
7+
* Remove support for older versions of jQuery (supporting latest on each major branch)
8+
19
## 2020-08-22 v2.6.0
210
* Removed support for IE 9 & 10
311
* Removed unused config for code climate

Gruntfile.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11

22
/* jshint ignore:start */
3-
var testRunner = require('./qunit-puppeteer.js');
3+
const testRunner = require('./lib/qunit-puppeteer.js');
44
/* jshint ignore:end */
55

66
module.exports = function(grunt) {
77
'use strict';
88

99
/* jshint ignore:start */
1010
/* This is used in an await statement, which apaprently JSHint doesn't like */
11-
var PORT = 4000;
11+
const PORT = 4000;
1212
/* jshint ignore:end */
1313

1414
// Project configuration
15-
var config = require('./grunt-config-options');
15+
const config = require('./grunt-config-options');
1616
config.pkg = grunt.file.readJSON('package.json');
1717

1818
grunt.initConfig(config);
@@ -26,13 +26,11 @@ module.exports = function(grunt) {
2626
/* jshint ignore:start */
2727
grunt.registerTask('test', 'Executes QUnit tests with all supported jQuery versions', async function() {
2828
/* jshint ignore:end */
29-
var done = this.async();
30-
var i;
31-
32-
var versionUrls = require('./test/build-version-urls')(grunt.config, arguments[0], arguments[1], arguments[2]);
29+
const done = this.async();
30+
const versionUrls = require('./test/build-version-urls')(grunt.config, arguments[0], arguments[1], arguments[2]);
3331

3432
console.log(versionUrls);
35-
for (i=0; i<versionUrls.length; ++i) {
33+
for (let i=0; i<versionUrls.length; ++i) {
3634
try {
3735
console.log('LOADING', versionUrls[i]);
3836
/* jshint ignore:start */

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ You may report any issues you may find [in the github issue tracking](https://gi
3737
* [Miscellaneous Information](#miscellaneous-information)
3838
* [jQuery Version Support](#jquery-version-support)
3939
* [Browsers Tested](#browsers-tested)
40-
* [Using Mockjax in Other Ways (Node, require, browserify, etc)](#using-mockjax-in-other-ways)
40+
* [Using Mockjax in Other Ways (Node, browserify, etc)](#using-mockjax-in-other-ways)
4141
* [Logging](#logging)
4242
* [Release History](#release-history)
4343
* [License](#license)
@@ -826,7 +826,7 @@ code is merged into master to ensure we do not introduce regressions.
826826

827827
### Using Mockjax in Other Ways ###
828828

829-
You can use Mockjax as a Node module, with require.js, or with Browserify... and
829+
You can use Mockjax as a Node module or with Browserify... and
830830
presumably in other ways as well. We have tests for each of the methods above.
831831

832832
When using Mockjax as a Node module (including with Browserify), **you must

bower.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,23 @@
22
"name": "jquery-mockjax",
33
"main": "dist/jquery.mockjax.js",
44
"dependencies": {
5-
"jquery": ">=1.5.0"
5+
"jquery": ">=1.12.4"
66
},
77
"ignore": [
88
".editorconfig",
9+
".github",
910
".gitignore",
1011
".jshintrc",
11-
"*.md",
12-
"*.json",
12+
".jshintrc",
13+
"browserstack-config.js",
14+
"browserstack.js",
15+
"grunt-config-options.js",
16+
"Gruntfile.js",
1317
"lib",
14-
"test"
18+
"package.json",
19+
"qunit-puppeteer.js",
20+
"test",
21+
"*.json",
22+
"*.md"
1523
]
1624
}

browserstack-config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ module.exports = {
1313
"chrome_latest",
1414
"firefox_latest",
1515
"safari_latest",
16-
"edge_latest",
17-
"ie_11"
16+
"edge_latest"
1817
]
1918
};

dist/jquery.mockjax.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
*
44
* Version: 2.6.0
55
* Home: https://github.com/jakerella/jquery-mockjax
6-
* Copyright (c) 2020 Jordan Kasper, formerly appendTo;
6+
* Copyright (c) 2024 Jordan Kasper, formerly appendTo;
77
* NOTE: This repository was taken over by Jordan Kasper (@jakerella) October, 2014
88
*
9-
* Dual licensed under the MIT or GPL licenses.
10-
* http://opensource.org/licenses/MIT OR http://www.gnu.org/licenses/gpl-2.0.html
9+
* Licensed under the MIT license: http://opensource.org/licenses/MIT
1110
*/
1211
(function(root, factory) {
1312
'use strict';

dist/jquery.mockjax.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

grunt-config-options.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var PORT = 4000;
1+
const PORT = 4000;
22

33
module.exports = {
44
banner: [
@@ -41,8 +41,7 @@ module.exports = {
4141
all: [
4242
'src/**/*.js',
4343
'Gruntfile.js',
44-
'test/test.js',
45-
'test/requirejs/*.js',
44+
'test/**/test-*.js',
4645
'test/nodejs/*.js',
4746
'test/browserify/main.js',
4847
'test/browserify/test.js'

qunit-puppeteer.js renamed to lib/qunit-puppeteer.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
/**
33
* This file was modified from the original located at:
44
* https://github.com/davidtaylorhq/qunit-puppeteer
5+
* in order to support usage in a grunt task (or any
6+
* sort of orchestration tool)
57
*
68
* ORIGINAL LICENSE:
79
MIT License
@@ -168,4 +170,4 @@ module.exports = async function testRunner(targetURL, port) {
168170
throw err;
169171
}
170172

171-
};
173+
};

0 commit comments

Comments
 (0)