Skip to content

Commit e97a6bf

Browse files
committed
Update eslint-plugin-ember and fix tests
1 parent 6222d57 commit e97a6bf

3 files changed

Lines changed: 23 additions & 75 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"ember-resolver": "^5.0.1",
6565
"ember-sinon": "^2.2.0",
6666
"ember-source": "~3.4.0",
67-
"eslint-plugin-ember": "^5.2.0",
67+
"eslint-plugin-ember": "^6.0.0",
6868
"eslint-plugin-node": "^7.0.1",
6969
"glob": "^7.1.3",
7070
"loader.js": "^4.7.0",

test/package-json-test.js

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ describe('generating package.json', function() {
4242
'foo': '1.0.0',
4343
'bar': '^0.1.2',
4444
'baz': '0.0.0',
45+
"najax": "^1.0.3",
4546
'rsvp': '3.2.1'
4647
});
4748
});
@@ -56,6 +57,8 @@ describe('generating package.json', function() {
5657
let pkg = fs.readJsonSync(app.filePath('/dist/package.json'));
5758

5859
expect(pkg.fastboot.moduleWhitelist).to.deep.equal([
60+
'najax',
61+
'url',
5962
'path',
6063
'foo',
6164
'bar',
@@ -97,9 +100,6 @@ describe('generating package.json', function() {
97100
modulePrefix: 'module-whitelist',
98101
environment: 'development',
99102
baseURL: '/',
100-
emberData: {
101-
enableRecordDataRFCBuild: false
102-
},
103103
locationType: 'auto',
104104
EmberENV: { FEATURES: {} },
105105
APP: { name: 'module-whitelist', version: '0.0.0', autoboot: false },
@@ -140,9 +140,6 @@ describe('generating package.json', function() {
140140
modulePrefix: 'fastboot-config',
141141
environment: 'development',
142142
baseURL: '/',
143-
emberData: {
144-
enableRecordDataRFCBuild: false
145-
},
146143
locationType: 'auto',
147144
EmberENV: { FEATURES: {} },
148145
APP: { name: 'fastboot-config', version: '0.0.0', autoboot: false },
@@ -159,9 +156,6 @@ describe('generating package.json', function() {
159156
return app.runEmberCommand('build', '--environment=production');
160157
});
161158

162-
// https://github.com/tildeio/ember-cli-fastboot/issues/102
163-
// production builds have a fingerprint added to them, which was not being
164-
// reflected in the manifest
165159
it('contains a manifest of FastBoot assets', function() {
166160
let pkg = fs.readJsonSync(app.filePath('/dist/package.json'));
167161

yarn.lock

Lines changed: 19 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1596,24 +1596,7 @@ broccoli-clean-css@^1.1.0:
15961596
inline-source-map-comment "^1.0.5"
15971597
json-stable-stringify "^1.0.0"
15981598

1599-
broccoli-concat@^3.2.2:
1600-
version "3.7.0"
1601-
resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.7.0.tgz#6407fd411bc0bdf70a1aa607e382a7fa214e55bb"
1602-
dependencies:
1603-
broccoli-debug "^0.6.4"
1604-
broccoli-kitchen-sink-helpers "^0.3.1"
1605-
broccoli-plugin "^1.3.0"
1606-
ensure-posix-path "^1.0.2"
1607-
fast-sourcemap-concat "^1.4.0"
1608-
find-index "^1.1.0"
1609-
fs-extra "^4.0.3"
1610-
fs-tree-diff "^0.5.7"
1611-
lodash.merge "^4.3.1"
1612-
lodash.omit "^4.1.0"
1613-
lodash.uniq "^4.2.0"
1614-
walk-sync "^0.3.2"
1615-
1616-
broccoli-concat@^3.7.1:
1599+
broccoli-concat@^3.2.2, broccoli-concat@^3.7.1:
16171600
version "3.7.1"
16181601
resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.7.1.tgz#22ba97420b33f5254549adc5bc41163f97bd1793"
16191602
dependencies:
@@ -2044,11 +2027,7 @@ can-symlink@^1.0.0:
20442027
dependencies:
20452028
tmp "0.0.28"
20462029

2047-
caniuse-lite@^1.0.30000844:
2048-
version "1.0.30000878"
2049-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000878.tgz#c644c39588dd42d3498e952234c372e5a40a4123"
2050-
2051-
caniuse-lite@^1.0.30000878:
2030+
caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000878:
20522031
version "1.0.30000883"
20532032
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000883.tgz#597c1eabfb379bd9fbeaa778632762eb574706ac"
20542033

@@ -2255,7 +2234,7 @@ [email protected]:
22552234
version "2.12.2"
22562235
resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
22572236

2258-
2237+
[email protected], commander@^2.5.0, commander@^2.6.0:
22592238
version "2.15.1"
22602239
resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
22612240

@@ -2265,10 +2244,6 @@ [email protected]:
22652244
dependencies:
22662245
graceful-readlink ">= 1.0.0"
22672246

2268-
commander@^2.5.0, commander@^2.6.0:
2269-
version "2.17.1"
2270-
resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
2271-
22722247
commander@~2.16.0:
22732248
version "2.16.0"
22742249
resolved "https://registry.yarnpkg.com/commander/-/commander-2.16.0.tgz#f16390593996ceb4f3eeb020b31d78528f7f8a50"
@@ -2595,11 +2570,7 @@ [email protected]:
25952570
version "1.1.1"
25962571
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
25972572

2598-
electron-to-chromium@^1.3.47:
2599-
version "1.3.61"
2600-
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.61.tgz#a8ac295b28d0f03d85e37326fd16b6b6b17a1795"
2601-
2602-
electron-to-chromium@^1.3.61:
2573+
electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.61:
26032574
version "1.3.62"
26042575
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.62.tgz#2e8e2dc070c800ec8ce23ff9dfcceb585d6f9ed8"
26052576

@@ -2946,10 +2917,14 @@ ember-resolver@^5.0.1:
29462917
ember-cli-version-checker "^2.0.0"
29472918
resolve "^1.3.3"
29482919

2949-
ember-rfc176-data@^0.3.0, ember-rfc176-data@^0.3.1, ember-rfc176-data@^0.3.3:
2920+
ember-rfc176-data@^0.3.0, ember-rfc176-data@^0.3.1:
29502921
version "0.3.3"
29512922
resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.3.tgz#27fba08d540a7463a4366c48eaa19c5a44971a39"
29522923

2924+
ember-rfc176-data@^0.3.5:
2925+
version "0.3.5"
2926+
resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.5.tgz#f630e550572c81a5e5c7220f864c0f06eee9e977"
2927+
29532928
ember-router-generator@^1.2.3:
29542929
version "1.2.3"
29552930
resolved "https://registry.yarnpkg.com/ember-router-generator/-/ember-router-generator-1.2.3.tgz#8ed2ca86ff323363120fc14278191e9e8f1315ee"
@@ -3058,11 +3033,11 @@ [email protected], escape-string-regexp@^1.0.2, escape-string-regexp@^1
30583033
version "1.0.5"
30593034
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
30603035

3061-
eslint-plugin-ember@^5.2.0:
3062-
version "5.2.0"
3063-
resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-5.2.0.tgz#fa436e0497dfc01d1d38608229cd616e7c5b6067"
3036+
eslint-plugin-ember@^6.0.0:
3037+
version "6.0.1"
3038+
resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-6.0.1.tgz#0d10a1c4d0f148005d8b2c2eec80a12ea236c792"
30643039
dependencies:
3065-
ember-rfc176-data "^0.3.3"
3040+
ember-rfc176-data "^0.3.5"
30663041
snake-case "^2.1.0"
30673042

30683043
eslint-plugin-es@^1.3.1:
@@ -3364,14 +3339,10 @@ extglob@^2.0.4:
33643339
snapdragon "^0.8.1"
33653340
to-regex "^3.0.1"
33663341

3367-
3342+
[email protected], extsprintf@^1.2.0:
33683343
version "1.3.0"
33693344
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
33703345

3371-
extsprintf@^1.2.0:
3372-
version "1.4.0"
3373-
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
3374-
33753346
fast-deep-equal@^1.0.0:
33763347
version "1.1.0"
33773348
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
@@ -3531,20 +3502,13 @@ find-up@^2.1.0:
35313502
dependencies:
35323503
locate-path "^2.0.0"
35333504

3534-
find-yarn-workspace-root@^1.0.0:
3505+
find-yarn-workspace-root@^1.0.0, find-yarn-workspace-root@^1.1.0:
35353506
version "1.2.1"
35363507
resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz#40eb8e6e7c2502ddfaa2577c176f221422f860db"
35373508
dependencies:
35383509
fs-extra "^4.0.3"
35393510
micromatch "^3.1.4"
35403511

3541-
find-yarn-workspace-root@^1.1.0:
3542-
version "1.2.0"
3543-
resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.0.tgz#c7468a8b42bf290b5d036cd3b0d5bf97b09ffc7e"
3544-
dependencies:
3545-
fs-extra "^4.0.3"
3546-
micromatch "^3.1.4"
3547-
35483512
[email protected], findup-sync@^2.0.0:
35493513
version "2.0.0"
35503514
resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
@@ -3778,7 +3742,7 @@ glob-to-regexp@^0.3.0:
37783742
version "0.3.0"
37793743
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
37803744

3781-
[email protected], glob@^7.0.3, glob@^7.0.4, glob@^7.0.5, glob@^7.1.2:
3745+
37823746
version "7.1.2"
37833747
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
37843748
dependencies:
@@ -3799,7 +3763,7 @@ glob@^5.0.10:
37993763
once "^1.3.0"
38003764
path-is-absolute "^1.0.0"
38013765

3802-
glob@^7.1.3:
3766+
glob@^7.0.3, glob@^7.0.4, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3:
38033767
version "7.1.3"
38043768
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
38053769
dependencies:
@@ -4047,18 +4011,12 @@ [email protected]:
40474011
version "0.4.19"
40484012
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
40494013

4050-
4014+
[email protected], iconv-lite@^0.4.17, iconv-lite@^0.4.4:
40514015
version "0.4.23"
40524016
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
40534017
dependencies:
40544018
safer-buffer ">= 2.1.2 < 3"
40554019

4056-
iconv-lite@^0.4.17, iconv-lite@^0.4.4:
4057-
version "0.4.24"
4058-
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
4059-
dependencies:
4060-
safer-buffer ">= 2.1.2 < 3"
4061-
40624020
ignore-walk@^3.0.1:
40634021
version "3.0.1"
40644022
resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
@@ -5142,18 +5100,14 @@ mimic-fn@^1.0.0:
51425100
dependencies:
51435101
brace-expansion "^1.1.7"
51445102

5145-
5103+
[email protected], minimist@~0.0.1:
51465104
version "0.0.8"
51475105
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
51485106

51495107
minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
51505108
version "1.2.0"
51515109
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
51525110

5153-
minimist@~0.0.1:
5154-
version "0.0.10"
5155-
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
5156-
51575111
minipass@^2.2.0, minipass@^2.2.1, minipass@^2.3.3:
51585112
version "2.3.4"
51595113
resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"

0 commit comments

Comments
 (0)