From 1701c541e0ec8e855990ab827dc3c80b5310d394 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Fri, 25 Jan 2019 13:36:02 -0500 Subject: [PATCH 1/3] Avoid jQuery in without application wrapper scenario. --- config/ember-try.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/config/ember-try.js b/config/ember-try.js index 846d68eaf..a0884ec95 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -141,9 +141,12 @@ module.exports = function() { }, { name: 'ember-without-application-wrapper', - env: Object.assign({}, envWithoutJQuery, { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'application-template-wrapper': false }), - }), + env: { + EMBER_OPTIONAL_FEATURES: JSON.stringify({ + 'application-template-wrapper': false, + 'jquery-integration': false, + }), + }, npm: { devDependencies: { 'ember-source': urls[2], From 3bb89771d87a7987faded92d938f9765a5dd3eab Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Fri, 25 Jan 2019 13:37:45 -0500 Subject: [PATCH 2/3] Update to ember-cli-babel@7.4.0 This will ensure that `import jQuery from 'jquery'` is _not_ overwritten to `Ember.$` (because `Ember.$` is deprecated). --- package.json | 2 +- yarn.lock | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 15ce796c0..ec2e5eab9 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "broccoli-debug": "^0.6.5", "broccoli-funnel": "^2.0.1", "ember-assign-polyfill": "^2.6.0", - "ember-cli-babel": "^7.2.0", + "ember-cli-babel": "^7.4.0", "ember-cli-htmlbars-inline-precompile": "^2.1.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index f5155c1d1..939dcf65f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -740,6 +740,16 @@ dependencies: regenerator-transform "^0.13.3" +"@babel/plugin-transform-runtime@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.2.0.tgz#566bc43f7d0aedc880eaddbd29168d0f248966ea" + integrity sha512-jIgkljDdq4RYDnJyQsiWbdvGeei/0MOTtSHKO/rfbd/mXBxNpdlulMx49L0HQ4pug1fXannxoqCI+fYSle9eSw== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/helper-plugin-utils" "^7.0.0" + resolve "^1.8.1" + semver "^5.5.1" + "@babel/plugin-transform-shorthand-properties@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0" @@ -865,6 +875,13 @@ resolved "https://registry.yarnpkg.com/@babel/preset-stage-0/-/preset-stage-0-7.0.0.tgz#999aaec79ee8f0a763042c68c06539c97c6e0646" integrity sha512-FBMd0IiARPtH5aaOFUVki6evHiJQiY0pFy7fizyRF7dtwc+el3nwpzvhb9qBNzceG1OIJModG1xpE0DDFjPXwA== +"@babel/runtime@^7.2.0": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.1.tgz#574b03e8e8a9898eaf4a872a92ea20b7846f6f2a" + integrity sha512-7jGW8ppV0ant637pIqAcFfQDDH1orEPGJb8aXfUozuCU3QqX7rX4DA8iwrbPrR1hcH0FTTHz47yQnk+bl5xHQA== + dependencies: + regenerator-runtime "^0.12.0" + "@babel/template@^7.1.0", "@babel/template@^7.1.2": version "7.1.2" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.2.tgz#090484a574fef5a2d2d7726a674eceda5c5b5644" @@ -3760,7 +3777,7 @@ ember-cli-babel@^6.16.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1, ember-c ember-cli-version-checker "^2.1.2" semver "^5.5.0" -ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.2.0: +ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3: version "7.2.0" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.2.0.tgz#5c5bd877fb73f6fb198c878d3127ba9e18e9b8a0" integrity sha512-vwx/AgPD7P4ebgTFJMqFovbrSNCA02UMuItlR/Il16njYjgN9ZzjUqgYxaylN7k8RF88wdJq3jrtqyMS/oOq8A== @@ -3782,6 +3799,30 @@ ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cl ensure-posix-path "^1.0.2" semver "^5.5.0" +ember-cli-babel@^7.4.0: + version "7.4.0" + resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.4.0.tgz#8fc38a650629c0408adf50a46deef91fcd9d0f1d" + integrity sha512-nCEniuWcZMZ12uJopHAMEzj0J55fDEKVEr0adoYZNl7e3E6Pz4WyixyddhhzNa+WcOl9ZULYbH/1R0AL4Tyzjg== + dependencies: + "@babel/core" "^7.0.0" + "@babel/plugin-transform-modules-amd" "^7.0.0" + "@babel/plugin-transform-runtime" "^7.2.0" + "@babel/polyfill" "^7.0.0" + "@babel/preset-env" "^7.0.0" + "@babel/runtime" "^7.2.0" + amd-name-resolver "^1.2.1" + babel-plugin-debug-macros "^0.2.0-beta.6" + babel-plugin-ember-modules-api-polyfill "^2.6.0" + babel-plugin-module-resolver "^3.1.1" + broccoli-babel-transpiler "^7.1.0" + broccoli-debug "^0.6.4" + broccoli-funnel "^2.0.1" + broccoli-source "^1.1.0" + clone "^2.1.2" + ember-cli-version-checker "^2.1.2" + ensure-posix-path "^1.0.2" + semver "^5.5.0" + ember-cli-broccoli-sane-watcher@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ember-cli-broccoli-sane-watcher/-/ember-cli-broccoli-sane-watcher-3.0.0.tgz#dc1812c047e1ceec4413d3c41b51a9ffc61b4cfe" @@ -8764,6 +8805,11 @@ regenerator-runtime@^0.11.0, regenerator-runtime@^0.11.1: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== +regenerator-runtime@^0.12.0: + version "0.12.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de" + integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg== + regenerator-runtime@^0.9.5: version "0.9.6" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz#d33eb95d0d2001a4be39659707c51b0cb71ce029" From 633dcec9b1850c8c4cbbc6de0df542d2d3da9ab6 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Fri, 25 Jan 2019 15:38:37 -0500 Subject: [PATCH 3/3] Use @ember/jquery@0.6.0 for jQuery specific scenarios --- config/ember-try.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/ember-try.js b/config/ember-try.js index a0884ec95..fcf0a881c 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -77,7 +77,7 @@ module.exports = function() { name: 'ember-lts-2.12', npm: { devDependencies: { - '@ember/jquery': '^0.5.2', + '@ember/jquery': '^0.6.0', 'ember-source': '~2.12.0', 'ember-fetch': null, }, @@ -160,6 +160,7 @@ module.exports = function() { }, npm: { devDependencies: { + '@ember/jquery': '^0.6.0', 'ember-fetch': null, }, },