Skip to content

Commit 40cebd7

Browse files
authored
Merge pull request #37 from simonihmig/jquery-shim
Update ember-cli-babel to include support for skipping jquery import transpilation
2 parents d5ff05c + 98e8322 commit 40cebd7

File tree

4 files changed

+45
-5
lines changed

4 files changed

+45
-5
lines changed

config/ember-try.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ module.exports = function() {
1818
},
1919
npm: {
2020
devDependencies: {
21-
'@ember/jquery': '^0.5.1',
2221
'ember-source': '~2.16.0'
2322
}
2423
}
@@ -30,7 +29,6 @@ module.exports = function() {
3029
},
3130
npm: {
3231
devDependencies: {
33-
'@ember/jquery': '^0.5.1',
3432
'ember-source': '~2.18.0'
3533
}
3634
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"dependencies": {
2323
"broccoli-funnel": "^2.0.1",
2424
"broccoli-merge-trees": "^3.0.2",
25-
"ember-cli-babel": "^7.1.2",
25+
"ember-cli-babel": "^7.4.0",
2626
"jquery": "^3.3.1",
2727
"resolve": "^1.10.0"
2828
},

vendor/shims/jquery.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'use strict';
44

55
return {
6-
'default': self['jquery'],
6+
'default': self['jQuery'],
77
__esModule: true,
88
};
99
}

yarn.lock

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,15 @@
402402
dependencies:
403403
regenerator-transform "^0.13.3"
404404

405+
"@babel/plugin-transform-runtime@^7.2.0":
406+
version "7.2.0"
407+
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.2.0.tgz#566bc43f7d0aedc880eaddbd29168d0f248966ea"
408+
dependencies:
409+
"@babel/helper-module-imports" "^7.0.0"
410+
"@babel/helper-plugin-utils" "^7.0.0"
411+
resolve "^1.8.1"
412+
semver "^5.5.1"
413+
405414
"@babel/plugin-transform-shorthand-properties@^7.2.0":
406415
version "7.2.0"
407416
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0"
@@ -495,6 +504,12 @@
495504
js-levenshtein "^1.1.3"
496505
semver "^5.3.0"
497506

507+
"@babel/runtime@^7.2.0":
508+
version "7.3.1"
509+
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.1.tgz#574b03e8e8a9898eaf4a872a92ea20b7846f6f2a"
510+
dependencies:
511+
regenerator-runtime "^0.12.0"
512+
498513
"@babel/template@^7.1.0", "@babel/template@^7.1.2", "@babel/template@^7.2.2":
499514
version "7.2.2"
500515
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907"
@@ -2620,7 +2635,7 @@ ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6
26202635
ember-cli-version-checker "^2.1.0"
26212636
semver "^5.4.1"
26222637

2623-
ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3:
2638+
ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.3:
26242639
version "7.2.0"
26252640
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.2.0.tgz#5c5bd877fb73f6fb198c878d3127ba9e18e9b8a0"
26262641
dependencies:
@@ -2641,6 +2656,29 @@ ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3:
26412656
ensure-posix-path "^1.0.2"
26422657
semver "^5.5.0"
26432658

2659+
ember-cli-babel@^7.4.0:
2660+
version "7.4.0"
2661+
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.4.0.tgz#8fc38a650629c0408adf50a46deef91fcd9d0f1d"
2662+
dependencies:
2663+
"@babel/core" "^7.0.0"
2664+
"@babel/plugin-transform-modules-amd" "^7.0.0"
2665+
"@babel/plugin-transform-runtime" "^7.2.0"
2666+
"@babel/polyfill" "^7.0.0"
2667+
"@babel/preset-env" "^7.0.0"
2668+
"@babel/runtime" "^7.2.0"
2669+
amd-name-resolver "^1.2.1"
2670+
babel-plugin-debug-macros "^0.2.0-beta.6"
2671+
babel-plugin-ember-modules-api-polyfill "^2.6.0"
2672+
babel-plugin-module-resolver "^3.1.1"
2673+
broccoli-babel-transpiler "^7.1.0"
2674+
broccoli-debug "^0.6.4"
2675+
broccoli-funnel "^2.0.1"
2676+
broccoli-source "^1.1.0"
2677+
clone "^2.1.2"
2678+
ember-cli-version-checker "^2.1.2"
2679+
ensure-posix-path "^1.0.2"
2680+
semver "^5.5.0"
2681+
26442682
ember-cli-broccoli-sane-watcher@^3.0.0:
26452683
version "3.0.0"
26462684
resolved "https://registry.yarnpkg.com/ember-cli-broccoli-sane-watcher/-/ember-cli-broccoli-sane-watcher-3.0.0.tgz#dc1812c047e1ceec4413d3c41b51a9ffc61b4cfe"
@@ -6252,6 +6290,10 @@ sax@^1.2.4:
62526290
version "5.5.0"
62536291
resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
62546292

6293+
semver@^5.5.1:
6294+
version "5.6.0"
6295+
resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
6296+
62556297
62566298
version "0.16.2"
62576299
resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"

0 commit comments

Comments
 (0)