Skip to content

Commit

Permalink
Merge pull request #1392 from jherdman/pretender-2
Browse files Browse the repository at this point in the history 
Support Pretender 2
  • Loading branch information
@samselikoff
samselikoff authored Oct 10, 2018
2 parents 49e8f4b + ca100b6 commit b0fd939
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 46 deletions.
45 changes: 32 additions & 13 deletions index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,23 @@ module.exports = {

options: {
nodeAssets: {
'@xg-wang/whatwg-fetch': npmAsset({
import: ['dist/fetch.umd.js']
}),
'route-recognizer': npmAsset({
path: 'dist/route-recognizer.js',
sourceMap: 'dist/route-recognizer.js.map'
srcDir: 'dist',
import: ['route-recognizer.js'],
vendor: ['route-recognizer.js.map']
}),
'fake-xml-http-request': npmAsset({
import: ['fake_xml_http_request.js']
}),
'fake-xml-http-request': npmAsset('fake_xml_http_request.js'),
'pretender': npmAsset('pretender.js'),
'faker': npmAsset('build/build/faker.js')
'pretender': npmAsset({
import: ['pretender.js']
}),
'faker': npmAsset({
import: ['build/build/faker.js']
})
}
},

Expand Down Expand Up @@ -144,15 +154,24 @@ module.exports = {
}
};

function npmAsset(filePath) {
function npmAsset(options = {}) {
let defaultOptions = {
// guard against usage in FastBoot 1.0, where process.env.EMBER_CLI_FASTBOOT is not available
_processTree(input) {
return map(input, content => `if (typeof FastBoot !== 'undefined') { ${content} }`);
}
};

let assetOptions = Object.assign(defaultOptions, options);

return function() {
return {
enabled: this._shouldIncludeFiles(),
import: [filePath],
// guard against usage in FastBoot 1.0, where process.env.EMBER_CLI_FASTBOOT is not available
_processTree(input) {
return map(input, content => `if (typeof FastBoot !== 'undefined') { ${content} }`);
let finalOptions = Object.assign(
assetOptions,
{
enabled: this._shouldIncludeFiles()
}
};
);

return finalOptions;
};
}
11 changes: 6 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,22 @@
"prepare": "./scripts/link.sh"
},
"dependencies": {
"@xg-wang/whatwg-fetch": "^3.0.0",
"broccoli-funnel": "^1.0.2",
"broccoli-merge-trees": "^1.1.0",
"broccoli-string-replace": "^0.1.2",
"broccoli-stew": "^1.5.0",
"broccoli-string-replace": "^0.1.2",
"chalk": "^1.1.1",
"ember-cli-babel": "^6.8.2",
"ember-cli-node-assets": "^0.1.4",
"ember-cli-node-assets": "^0.2.2",
"ember-get-config": "^0.2.2",
"ember-inflector": "^2.0.0",
"ember-lodash": "^4.17.3",
"fake-xml-http-request": "^1.4.0",
"fake-xml-http-request": "^2.0.0",
"faker": "^3.0.0",
"jsdom": "^11.12.0",
"pretender": "^1.6.1",
"route-recognizer": "^0.2.3"
"pretender": "2.1.0",
"route-recognizer": "^0.3.4"
},
"devDependencies": {
"active-model-adapter": "^2.0.3",
Expand Down
67 changes: 39 additions & 28 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@
dependencies:
"@glimmer/di" "^0.2.0"

"@xg-wang/whatwg-fetch@^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@xg-wang/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#f7b222c012a238e7d6e89ed3d72a1e0edb58453d"
integrity sha512-ULtqA6L75RLzTNW68IiOja0XYv4Ebc3OGMzfia1xxSEMpD0mk/pMvkQX0vbCFyQmKc5xGp80Ms2WiSlXLh8hbA==

abab@^1.0.3, abab@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
Expand Down Expand Up @@ -1752,13 +1757,6 @@ broccoli-uglify-sourcemap@^2.0.0:
uglify-es "^3.1.3"
walk-sync "^0.3.2"

broccoli-unwatched-tree@^0.1.1:
version "0.1.3"
resolved "https://registry.yarnpkg.com/broccoli-unwatched-tree/-/broccoli-unwatched-tree-0.1.3.tgz#ab0fb820f613845bf67a803baad820f68b1e3aae"
integrity sha1-qw+4IPYThFv2eoA7qtgg9oseOq4=
dependencies:
broccoli-source "^1.1.0"

broccoli-writer@~0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/broccoli-writer/-/broccoli-writer-0.1.1.tgz#d4d71aa8f2afbc67a3866b91a2da79084b96ab2d"
Expand Down Expand Up @@ -2867,14 +2865,14 @@ ember-cli-lodash-subset@^1.0.7:
resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-1.0.12.tgz#af2e77eba5dcb0d77f3308d3a6fd7d3450f6e537"
integrity sha1-ry5366XcsNd/MwjTpv19NFD25Tc=

ember-cli-node-assets@^0.1.4:
version "0.1.6"
resolved "https://registry.yarnpkg.com/ember-cli-node-assets/-/ember-cli-node-assets-0.1.6.tgz#6488a2949048c801ad6d9e33753c7bce32fc1146"
integrity sha1-ZIiilJBIyAGtbZ4zdTx7zjL8EUY=
ember-cli-node-assets@^0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/ember-cli-node-assets/-/ember-cli-node-assets-0.2.2.tgz#d2d55626e7cc6619f882d7fe55751f9266022708"
integrity sha1-0tVWJufMZhn4gtf+VXUfkmYCJwg=
dependencies:
broccoli-funnel "^1.0.1"
broccoli-merge-trees "^1.1.1"
broccoli-unwatched-tree "^0.1.1"
broccoli-source "^1.1.0"
debug "^2.2.0"
lodash "^4.5.1"
resolve "^1.1.7"
Expand Down Expand Up @@ -3756,10 +3754,10 @@ extsprintf@^1.2.0:
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=

fake-xml-http-request@^1.4.0, fake-xml-http-request@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/fake-xml-http-request/-/fake-xml-http-request-1.6.0.tgz#bd0ac79ae3e2660098282048a12c730a6f64d550"
integrity sha512-99XPwwSg89BfzPuv4XCpZxn3EbauMCgAQCxq9MzrvS6DFD73OON6AnUTicL4A0HZtYMBwCZBWVnRqGjZDgQkTg==
fake-xml-http-request@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/fake-xml-http-request/-/fake-xml-http-request-2.0.0.tgz#41a92f0ca539477700cb1dafd2df251d55dac8ff"
integrity sha512-UjNnynb6eLAB0lyh2PlTEkjRJORnNsVF1hbzU+PQv89/cyBV9GDRCy7JAcLQgeCLYT+3kaumWWZKEJvbaK74eQ==

faker@^3.0.0:
version "3.1.0"
Expand Down Expand Up @@ -5745,7 +5743,7 @@ lodash@^3.10.1:
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
integrity sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=

lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.6.1:
lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.6.1:
version "4.17.5"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
integrity sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==
Expand All @@ -5755,6 +5753,11 @@ lodash@^4.13.1, lodash@^4.2.0:
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==

lodash@^4.5.1:
version "4.17.11"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==

log-symbols@^2.1.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
Expand Down Expand Up @@ -6657,12 +6660,13 @@ preserve@^0.2.0:
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=

pretender@^1.6.1:
version "1.6.1"
resolved "https://registry.yarnpkg.com/pretender/-/pretender-1.6.1.tgz#77d1e42ac8c6b298f5cd43534a87645df035db8c"
integrity sha1-d9HkKsjGspj1zUNTSodkXfA124w=
pretender@2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/pretender/-/pretender-2.1.0.tgz#cd75bff9624e996bcfadbd7dbd023ca1f4f3033a"
integrity sha512-GG1ZtA2yjorrSf9x3DR4Pv5228s/H92itSnIAxRx2wsmz549BsuIuJN+jPJgj0p+tCJBfBlmVgJLFG6t64M+EA==
dependencies:
fake-xml-http-request "^1.6.0"
"@xg-wang/whatwg-fetch" "^3.0.0"
fake-xml-http-request "^2.0.0"
route-recognizer "^0.3.3"

printf@^0.2.3:
Expand Down Expand Up @@ -7119,13 +7123,20 @@ resolve-url@^0.2.1:
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=

resolve@1.5.0, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0:
resolve@1.5.0, resolve@^1.1.6, resolve@^1.3.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
integrity sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==
dependencies:
path-parse "^1.0.5"

resolve@^1.1.7:
version "1.8.1"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
dependencies:
path-parse "^1.0.5"

restore-cursor@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
Expand Down Expand Up @@ -7161,16 +7172,16 @@ rimraf@~2.2.6:
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=

route-recognizer@^0.2.3:
version "0.2.10"
resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.2.10.tgz#024b2283c2e68d13a7c7f5173a5924645e8902df"
integrity sha1-Aksig8LmjROnx/UXOlkkZF6JAt8=

route-recognizer@^0.3.3:
version "0.3.3"
resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.3.tgz#1d365e27fa6995e091675f7dc940a8c00353bd29"
integrity sha1-HTZeJ/ppleCRZ199yUCowANTvSk=

route-recognizer@^0.3.4:
version "0.3.4"
resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3"
integrity sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g==

rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0, rsvp@^3.2.1, rsvp@^3.3.1, rsvp@^3.3.3, rsvp@^3.5.0:
version "3.6.2"
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
Expand Down

0 comments on commit b0fd939

Please sign in to comment.