diff --git a/circle.yml b/circle.yml index 5bb2c8a56..5808da7e4 100644 --- a/circle.yml +++ b/circle.yml @@ -20,7 +20,7 @@ test: override: # - tests/test-runner/test-all.sh: # parallel: true - - METEOR_COMMAND=/tmp/meteor/meteor tests/test-runner/test-all.sh: + - METEOR_COMMAND=/tmp/meteor/meteor METEOR_COMMAND_EXTRA_ARGS="--test-app-path test-app" tests/test-runner/test-all.sh: parallel: true - cd site; npm run generate deployment: diff --git a/packages/blaze/attrs.js b/packages/blaze/attrs.js index e49d3e73b..97369cd0b 100644 --- a/packages/blaze/attrs.js +++ b/packages/blaze/attrs.js @@ -171,9 +171,7 @@ var StyleHandler = Blaze._DiffingAttributeHandler.extend({ tokens.remove(match[1]); } - // XXX No `String.trim` on Safari 4. Swap out $.trim if we want to - // remove strong dep on jquery. - tokens.append(match[1], match[0].trim ? match[0].trim() : $.trim(match[0])); + tokens.append(match[1], match[0].trim()); match = regex.exec(attrString); } diff --git a/packages/blaze/package.js b/packages/blaze/package.js index 35572eb1d..5efa5f24a 100644 --- a/packages/blaze/package.js +++ b/packages/blaze/package.js @@ -6,13 +6,14 @@ Package.describe({ }); Package.onUse(function (api) { - api.use('jquery@1.11.9'); // should be a weak dep, by having multiple "DOM backends" + api.use('jquery@1.11.9 || 3.0.0', { weak: true }); // should be a weak dep, by having multiple "DOM backends" api.use('tracker@1.1.0'); api.use('check@1.2.3'); api.use('underscore@1.0.9'); api.use('observe-sequence@1.0.12'); api.use('reactive-var@1.0.10'); api.use('ordered-dict@1.0.9'); + api.user('ecmascript@0.12.7'); api.export([ 'Blaze', @@ -50,7 +51,7 @@ Package.onUse(function (api) { Package.onTest(function (api) { api.use('tinytest@1.0.11'); api.use('test-helpers@1.0.10'); - api.use('jquery@1.11.9'); // strong dependency, for testing jQuery backend + api.use('jquery@1.11.9 || 3.0.0'); // strong dependency, for testing jQuery backend api.use('underscore@1.0.9'); api.use('reactive-var@1.0.10'); api.use('tracker@1.1.0'); diff --git a/packages/spacebars-tests/package.js b/packages/spacebars-tests/package.js index 497deb97c..c0bfd5fd1 100644 --- a/packages/spacebars-tests/package.js +++ b/packages/spacebars-tests/package.js @@ -12,7 +12,7 @@ Package.onTest(function (api) { 'es5-shim@4.6.14', 'underscore@1.0.9', 'tinytest@1.0.11', - 'jquery@1.11.9', + 'jquery@1.11.9 || 3.0.0', 'test-helpers@1.0.10', 'reactive-var@1.0.10', 'markdown@1.0.10', diff --git a/test-app/package.json b/test-app/package.json new file mode 100644 index 000000000..1e87ae04f --- /dev/null +++ b/test-app/package.json @@ -0,0 +1,18 @@ +{ + "name": "blaze-test-app", + "version": "1.0.0", + "main": "index.js", + "directories": { + "test": "tests" + }, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "ISC", + "dependencies": { + "jquery": "^3.4.1", + "@babel/runtime": "^7.6.0", + "meteor-node-stubs": "^1.0.0" + } +} diff --git a/tests/test-runner b/tests/test-runner index 5a1e5b01b..04cc86f63 160000 --- a/tests/test-runner +++ b/tests/test-runner @@ -1 +1 @@ -Subproject commit 5a1e5b01b39504bfbf4a42193ca56eade85224f2 +Subproject commit 04cc86f6300cf07cde785461af6a2ff3bacaf26c