Skip to content

Commit d2a2d78

Browse files
committed
Changes after making ember-cli-cjs-transform configurable
1 parent 03af707 commit d2a2d78

File tree

3 files changed

+66
-20
lines changed

3 files changed

+66
-20
lines changed

ember-cli-build.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,15 @@ module.exports = function(defaults) {
102102
app.import('vendor/bootstrap-dropdown-submenu-fix.css');
103103
app.import('vendor/hint.css');
104104

105+
const nodeBuiltins = require('rollup-plugin-node-builtins');
106+
const json = require('rollup-plugin-json');
107+
105108
app.import('node_modules/babel-plugin-ember-modules-api-polyfill/src/index.js', {
106-
using: [{ transformation: 'cjs', as: 'babel-plugin-ember-modules-api-polyfill' }]
109+
using: [{
110+
transformation: 'cjs',
111+
as: 'babel-plugin-ember-modules-api-polyfill',
112+
plugins: [nodeBuiltins(), json()]
113+
}]
107114
});
108115

109116
let loaderTree = funnel(path.dirname(require.resolve('loader.js')), {

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@
8383
"moment": "^2.22.0",
8484
"moment-timezone": "~0.5.14",
8585
"path-browser": "^2.2.1",
86+
"rollup-plugin-json": "^2.3.0",
87+
"rollup-plugin-node-builtins": "^2.1.2",
8688
"torii": "~0.10.1"
8789
},
8890
"engines": {

yarn.lock

Lines changed: 56 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,31 @@ babel-core@^5.0.0, babel-core@^5.8.38:
543543
trim-right "^1.0.0"
544544
try-resolve "^1.0.0"
545545

546-
babel-core@^6.14.0, babel-core@^6.24.1, babel-core@^6.26.0:
546+
babel-core@^6.14.0, babel-core@^6.26.0:
547+
version "6.26.3"
548+
resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
549+
dependencies:
550+
babel-code-frame "^6.26.0"
551+
babel-generator "^6.26.0"
552+
babel-helpers "^6.24.1"
553+
babel-messages "^6.23.0"
554+
babel-register "^6.26.0"
555+
babel-runtime "^6.26.0"
556+
babel-template "^6.26.0"
557+
babel-traverse "^6.26.0"
558+
babel-types "^6.26.0"
559+
babylon "^6.18.0"
560+
convert-source-map "^1.5.1"
561+
debug "^2.6.9"
562+
json5 "^0.5.1"
563+
lodash "^4.17.4"
564+
minimatch "^3.0.4"
565+
path-is-absolute "^1.0.1"
566+
private "^0.1.8"
567+
slash "^1.0.0"
568+
source-map "^0.5.7"
569+
570+
babel-core@^6.24.1:
547571
version "6.26.0"
548572
resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
549573
dependencies:
@@ -882,8 +906,8 @@ babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015
882906
babel-template "^6.24.1"
883907

884908
babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
885-
version "6.26.0"
886-
resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a"
909+
version "6.26.2"
910+
resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3"
887911
dependencies:
888912
babel-plugin-transform-strict-mode "^6.24.1"
889913
babel-runtime "^6.26.0"
@@ -2025,8 +2049,8 @@ can-symlink@^1.0.0:
20252049
tmp "0.0.28"
20262050

20272051
caniuse-lite@^1.0.30000792:
2028-
version "1.0.30000823"
2029-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000823.tgz#b79842a5b5a48eaa416b73f5a5d7a23f52d26014"
2052+
version "1.0.30000835"
2053+
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000835.tgz#517c4d3807a8527b0cbce1d84c85d4487f877268"
20302054

20312055
caniuse-lite@^1.0.30000821:
20322056
version "1.0.30000828"
@@ -2235,8 +2259,8 @@ clone@^1.0.2:
22352259
resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
22362260

22372261
clone@^2.0.0:
2238-
version "2.1.2"
2239-
resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
2262+
version "2.1.1"
2263+
resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
22402264

22412265
clone@~0.1.9:
22422266
version "0.1.19"
@@ -2499,8 +2523,8 @@ core-js@^1.0.0:
24992523
resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
25002524

25012525
core-js@^2.4.0, core-js@^2.5.0:
2502-
version "2.5.4"
2503-
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.4.tgz#f2c8bf181f2a80b92f360121429ce63a2f0aeae0"
2526+
version "2.5.6"
2527+
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.6.tgz#0fe6d45bf3cac3ac364a9d72de7576f4eb221b9d"
25042528

25052529
25062530
version "2.0.6"
@@ -2638,7 +2662,7 @@ date-now@^0.1.4:
26382662
version "0.1.4"
26392663
resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
26402664

2641-
debug@2, [email protected], debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.4.0, debug@^2.6.8:
2665+
debug@2, [email protected], debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.4.0, debug@^2.6.8, debug@^2.6.9:
26422666
version "2.6.9"
26432667
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
26442668
dependencies:
@@ -2904,7 +2928,11 @@ [email protected]:
29042928
version "1.1.1"
29052929
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
29062930

2907-
electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.41:
2931+
electron-to-chromium@^1.3.30:
2932+
version "1.3.45"
2933+
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.45.tgz#458ac1b1c5c760ce8811a16d2bfbd97ec30bafb8"
2934+
2935+
electron-to-chromium@^1.3.41:
29082936
version "1.3.42"
29092937
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.42.tgz#95c33bf01d0cc405556aec899fe61fd4d76ea0f9"
29102938

@@ -3005,7 +3033,7 @@ ember-cli-build-notifications@~0.2.0:
30053033

30063034
ember-cli-cjs-transform@gaurav0/ember-cli-cjs-transform#json:
30073035
version "1.2.0"
3008-
resolved "https://codeload.github.com/gaurav0/ember-cli-cjs-transform/tar.gz/e8a15967667c9e8f9d54634173ed0f670a9435db"
3036+
resolved "https://codeload.github.com/gaurav0/ember-cli-cjs-transform/tar.gz/40fd8cccd1fb918508df8cd35a1924680a7fe864"
30093037
dependencies:
30103038
broccoli-debug "^0.6.4"
30113039
broccoli-plugin "^1.3.0"
@@ -3015,8 +3043,6 @@ ember-cli-cjs-transform@gaurav0/ember-cli-cjs-transform#json:
30153043
pkg-dir "^2.0.0"
30163044
rollup "^0.58.1"
30173045
rollup-plugin-commonjs "^9.1.0"
3018-
rollup-plugin-json "^2.3.0"
3019-
rollup-plugin-node-builtins "^2.1.2"
30203046
rollup-plugin-node-resolve "^3.3.0"
30213047
username "^3.0.0"
30223048

@@ -3499,13 +3525,20 @@ ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.7, ember-cli-ve
34993525
dependencies:
35003526
semver "^5.3.0"
35013527

3502-
ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0:
3528+
ember-cli-version-checker@^2.0.0:
35033529
version "2.1.0"
35043530
resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.1.0.tgz#fc79a56032f3717cf844ada7cbdec1a06fedb604"
35053531
dependencies:
35063532
resolve "^1.3.3"
35073533
semver "^5.3.0"
35083534

3535+
ember-cli-version-checker@^2.1.0:
3536+
version "2.1.2"
3537+
resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.1.2.tgz#305ce102390c66e4e0f1432dea9dc5c7c19fed98"
3538+
dependencies:
3539+
resolve "^1.3.3"
3540+
semver "^5.3.0"
3541+
35093542
35103543
version "2.16.2"
35113544
resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.16.2.tgz#53b922073a8e6f34255a6e0dcb1794a91ba3e1b7"
@@ -6607,10 +6640,14 @@ lodash@^3.10.0, lodash@^3.10.1, lodash@^3.9.3:
66076640
version "3.10.1"
66086641
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
66096642

6610-
lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.6.1, lodash@~4.17.4:
6643+
lodash@^4.0.0, lodash@^4.11.1, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.6.1, lodash@~4.17.4:
66116644
version "4.17.5"
66126645
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
66136646

6647+
lodash@^4.14.0, lodash@^4.17.4:
6648+
version "4.17.10"
6649+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
6650+
66146651
log-symbols@^2.2.0:
66156652
version "2.2.0"
66166653
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
@@ -7863,7 +7900,7 @@ printf@^0.2.3:
78637900
version "0.2.5"
78647901
resolved "https://registry.yarnpkg.com/printf/-/printf-0.2.5.tgz#c438ca2ca33e3927671db4ab69c0e52f936a4f0f"
78657902

7866-
private@^0.1.6, private@^0.1.7, private@~0.1.5:
7903+
private@^0.1.6, private@^0.1.7, private@^0.1.8, private@~0.1.5:
78677904
version "0.1.8"
78687905
resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
78697906

@@ -8511,13 +8548,13 @@ [email protected]:
85118548
dependencies:
85128549
path-parse "^1.0.5"
85138550

8514-
resolve@^1.1.2, resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0:
8551+
resolve@^1.1.2, resolve@^1.1.4, resolve@^1.1.7:
85158552
version "1.6.0"
85168553
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c"
85178554
dependencies:
85188555
path-parse "^1.0.5"
85198556

8520-
resolve@^1.3.0:
8557+
resolve@^1.1.6, resolve@^1.3.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0:
85218558
version "1.7.1"
85228559
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
85238560
dependencies:

0 commit comments

Comments
 (0)