From 11f5043355fa108f79947836e5998483c0f6c587 Mon Sep 17 00:00:00 2001 From: Brian Gantzler Date: Sun, 22 May 2022 10:40:59 -0400 Subject: [PATCH 1/4] Made miragejs a peer dependency --- .../blueprints/ember-cli-mirage/index.js | 15 +++------------ packages/ember-cli-mirage/package.json | 6 +++--- test-packages/01-basic-app/package.json | 1 + .../02-app-that-excludes-mirage/package.json | 1 + 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/packages/ember-cli-mirage/blueprints/ember-cli-mirage/index.js b/packages/ember-cli-mirage/blueprints/ember-cli-mirage/index.js index 848351cac..7d8596633 100644 --- a/packages/ember-cli-mirage/blueprints/ember-cli-mirage/index.js +++ b/packages/ember-cli-mirage/blueprints/ember-cli-mirage/index.js @@ -3,7 +3,6 @@ 'use strict'; var path = require('path'); -var fs = require('fs'); module.exports = { normalizeEntityName: function () { @@ -30,17 +29,9 @@ module.exports = { }; }, - insertShutdownIntoDestroyApp: function () { - if (fs.existsSync('tests/helpers/destroy-app.js')) { - var shutdownText = - ' if (window.server) {\n window.server.shutdown();\n }'; - return this.insertIntoFile('tests/helpers/destroy-app.js', shutdownText, { - after: "run(application, 'destroy');\n", - }); - } - }, - afterInstall: function () { - return this.insertShutdownIntoDestroyApp(); + return this.addPackagesToProject([ + { name: 'miragejs' }, + ]); }, }; diff --git a/packages/ember-cli-mirage/package.json b/packages/ember-cli-mirage/package.json index bd387f630..8b51285f4 100644 --- a/packages/ember-cli-mirage/package.json +++ b/packages/ember-cli-mirage/package.json @@ -47,8 +47,7 @@ "ember-destroyable-polyfill": "^2.0.3", "ember-get-config": "0.2.4 - 0.5.0 || ^1.0.0", "ember-inflector": "^2.0.0 || ^3.0.0 || ^4.0.2", - "lodash-es": "^4.17.11", - "miragejs": "^0.1.43" + "lodash-es": "^4.17.11" }, "devDependencies": { "@ember/jquery": "^2.0.0", @@ -101,7 +100,8 @@ "peerDependencies": { "@ember/test-helpers": "*", "ember-data": "*", - "ember-qunit": "*" + "ember-qunit": "*", + "miragejs": "~0.1.43" }, "peerDependenciesMeta": { "@ember/test-helpers": { diff --git a/test-packages/01-basic-app/package.json b/test-packages/01-basic-app/package.json index 331f81db0..ca54d3a0b 100644 --- a/test-packages/01-basic-app/package.json +++ b/test-packages/01-basic-app/package.json @@ -61,6 +61,7 @@ "fastboot": "^3.3.0", "jsdom": "^19.0.0", "loader.js": "^4.7.0", + "miragejs": "^0.1.43", "npm-run-all": "^4.1.5", "prettier": "^2.5.1", "qunit": "^2.17.2", diff --git a/test-packages/02-app-that-excludes-mirage/package.json b/test-packages/02-app-that-excludes-mirage/package.json index 50cc8babb..452cd4123 100644 --- a/test-packages/02-app-that-excludes-mirage/package.json +++ b/test-packages/02-app-that-excludes-mirage/package.json @@ -56,6 +56,7 @@ "eslint-plugin-prettier": "^4.0.0", "eslint-plugin-qunit": "^7.2.0", "loader.js": "^4.7.0", + "miragejs": "^0.1.43", "npm-run-all": "^4.1.5", "prettier": "^2.5.1", "qunit": "^2.17.2", From ee454bb9e2a15b3b8cb57cdc23723944f01b6993 Mon Sep 17 00:00:00 2001 From: Brian Gantzler Date: Sun, 22 May 2022 10:51:11 -0400 Subject: [PATCH 2/4] Updated documentation to denote MirageJS as a peerDependency --- README.md | 2 ++ .../app/templates/docs/getting-started/installation.md | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1a694aedb..10d23a0ce 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,8 @@ A client-side server to develop, test and prototype your Ember CLI app. ember install ember-cli-mirage ``` +Has a peer dependency on [MirageJS](https://miragejs.com/) which is added to your projects `package.json` during installation. + ## Feature requests Please open an issue and add a :+1: emoji reaction. We will use the number of reactions as votes to indicate community interest, which will in turn help us prioritize feature development. diff --git a/packages/ember-cli-mirage-docs/app/templates/docs/getting-started/installation.md b/packages/ember-cli-mirage-docs/app/templates/docs/getting-started/installation.md index 8d22ddc69..4d2e094dd 100644 --- a/packages/ember-cli-mirage-docs/app/templates/docs/getting-started/installation.md +++ b/packages/ember-cli-mirage-docs/app/templates/docs/getting-started/installation.md @@ -6,7 +6,8 @@ To install Mirage, run ember install ember-cli-mirage ``` -Ember should install the addon and add a `/mirage` directory to the root of your project. +Ember should install the addon and add a `/mirage` directory to the root of your project. +Ember-cli-mirage depends on [MirageJS](https://miragejs.com/) as a peer dependency and will add it to your applications `package.json`. Check out the {{docs-link 'upgrade guide' 'docs.getting-started.upgrade-guide'}} if you're coming from a previous version of Mirage. From 3977fee98eb3f8b994b06b1e6942d80e71187d48 Mon Sep 17 00:00:00 2001 From: Brian Gantzler Date: Sun, 22 May 2022 10:59:41 -0400 Subject: [PATCH 3/4] Fixed lint for prettier --- .../ember-cli-mirage/blueprints/ember-cli-mirage/index.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/ember-cli-mirage/blueprints/ember-cli-mirage/index.js b/packages/ember-cli-mirage/blueprints/ember-cli-mirage/index.js index 7d8596633..d2707f57c 100644 --- a/packages/ember-cli-mirage/blueprints/ember-cli-mirage/index.js +++ b/packages/ember-cli-mirage/blueprints/ember-cli-mirage/index.js @@ -30,8 +30,6 @@ module.exports = { }, afterInstall: function () { - return this.addPackagesToProject([ - { name: 'miragejs' }, - ]); + return this.addPackagesToProject([{ name: 'miragejs' }]); }, }; From 585d9598521b77b6989cab39e9b5b42113df6666 Mon Sep 17 00:00:00 2001 From: Sergey Astapov Date: Tue, 12 Sep 2023 22:00:30 -0400 Subject: [PATCH 4/4] added miragejs as devDependency --- packages/ember-cli-mirage/package.json | 3 +- pnpm-lock.yaml | 41 ++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/packages/ember-cli-mirage/package.json b/packages/ember-cli-mirage/package.json index 3d607824b..036c457b3 100644 --- a/packages/ember-cli-mirage/package.json +++ b/packages/ember-cli-mirage/package.json @@ -90,6 +90,7 @@ "fastboot": "^3.3.0", "js-yaml": "^4.0.0", "loader.js": "^4.7.0", + "miragejs": "^0.1.47", "prettier": "^2.8.7", "qunit": "^2.19.4", "qunit-dom": "^2.0.0", @@ -101,7 +102,7 @@ "ember-data": "*", "ember-qunit": "*", "ember-source": "^3.28.0 || ^4.0.0 || ^5.0.0", - "miragejs": "~0.1.43" + "miragejs": "^0.1.43" }, "peerDependenciesMeta": { "@ember/test-helpers": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d3e988564..130880859 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -44,9 +44,6 @@ importers: ember-inflector: specifier: ^2.0.0 || ^3.0.0 || ^4.0.2 version: 4.0.2 - miragejs: - specifier: ^0.1.47 - version: 0.1.47 devDependencies: '@babel/core': specifier: ^7.22.10 @@ -174,6 +171,9 @@ importers: loader.js: specifier: ^4.7.0 version: 4.7.0 + miragejs: + specifier: ^0.1.47 + version: 0.1.47 prettier: specifier: ^2.8.7 version: 2.8.7 @@ -483,6 +483,9 @@ importers: loader.js: specifier: ^4.7.0 version: 4.7.0 + miragejs: + specifier: ^0.1.47 + version: 0.1.47 prettier: specifier: ^2.8.4 version: 2.8.7 @@ -609,6 +612,9 @@ importers: loader.js: specifier: ^4.7.0 version: 4.7.0 + miragejs: + specifier: ^0.1.47 + version: 0.1.47 prettier: specifier: ^2.8.4 version: 2.8.7 @@ -3174,6 +3180,7 @@ packages: /@miragejs/pretender-node-polyfill@0.1.2: resolution: {integrity: sha512-M/BexG/p05C5lFfMunxo/QcgIJnMT2vDVCd00wNqK2ImZONIlEETZwWJu1QtLxtmYlSHlCFl3JNzp0tLe7OJ5g==} + dev: true /@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1: resolution: {integrity: sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==} @@ -11117,6 +11124,7 @@ packages: /fake-xml-http-request@2.1.2: resolution: {integrity: sha512-HaFMBi7r+oEC9iJNpc3bvcW7Z7iLmM26hPDmlb0mFwyANSsOQAtJxbdWsXITKOzZUyMYK0zYCv3h5yDj9TsiXg==} + dev: true /fast-deep-equal@3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} @@ -12740,6 +12748,7 @@ packages: /inflected@2.1.0: resolution: {integrity: sha512-hAEKNxvHf2Iq3H60oMBHkB4wl5jn3TPF3+fXek/sRwAB5gP9xWs4r7aweSF95f99HFoz69pnZTcu8f0SIHV18w==} + dev: true /inflection@1.13.4: resolution: {integrity: sha512-6I/HUDeYFfuNCVS3td055BaXBwKYuzw7K3ExVMStBowKo9oOAMJIXIHvdyR3iboTCp1b+1i5DSkIZTcwIktuDw==} @@ -13938,6 +13947,7 @@ packages: /lodash.assign@4.2.0: resolution: {integrity: sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw==} + dev: true /lodash.assignin@4.2.0: resolution: {integrity: sha512-yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg==} @@ -13949,6 +13959,7 @@ packages: /lodash.camelcase@4.3.0: resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==} + dev: true /lodash.castarray@4.4.0: resolution: {integrity: sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==} @@ -13956,9 +13967,11 @@ packages: /lodash.clonedeep@4.5.0: resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==} + dev: true /lodash.compact@3.0.1: resolution: {integrity: sha512-2ozeiPi+5eBXW1CLtzjk8XQFhQOEMwwfxblqeq6EGyTxZJ1bPATqilY0e6g2SLQpP4KuMeuioBhEnWz5Pr7ICQ==} + dev: true /lodash.debounce@3.1.1: resolution: {integrity: sha512-lcmJwMpdPAtChA4hfiwxTtgFeNAaow701wWUgVUqeD0XJF7vMXIN+bu/2FJSGxT0NUbZy9g9VFrlOFfPjl+0Ew==} @@ -13983,6 +13996,7 @@ packages: /lodash.find@4.6.0: resolution: {integrity: sha512-yaRZoAV3Xq28F1iafWN1+a0rflOej93l1DQUejs3SZ41h2O9UJBoS9aueGjPDgAl4B6tPC0NuuchLKaDQQ3Isg==} + dev: true /lodash.flatten@3.0.2: resolution: {integrity: sha512-jCXLoNcqQRbnT/KWZq2fIREHWeczrzpTR0vsycm96l/pu5hGeAntVBG0t7GuM/2wFqmnZs3d1eGptnAH2E8+xQ==} @@ -13993,6 +14007,7 @@ packages: /lodash.flatten@4.4.0: resolution: {integrity: sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==} + dev: true /lodash.foreach@4.5.0: resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==} @@ -14000,15 +14015,19 @@ packages: /lodash.forin@4.4.0: resolution: {integrity: sha512-APldePP4yvGhMcplVxv9L+exdLHMRHRhH1Q9O70zRJMm9HbTm6zxaihXtNl+ICOBApeFWoH7jNmFr/L4XfWeiQ==} + dev: true /lodash.get@4.4.2: resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==} + dev: true /lodash.has@4.5.2: resolution: {integrity: sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g==} + dev: true /lodash.invokemap@4.6.0: resolution: {integrity: sha512-CfkycNtMqgUlfjfdh2BhKO/ZXrP8ePOX5lEU/g0R3ItJcnuxWDwokMGKx1hWcfOikmyOVx6X9IwWnDGlgKl61w==} + dev: true /lodash.isarguments@3.1.0: resolution: {integrity: sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==} @@ -14020,18 +14039,23 @@ packages: /lodash.isempty@4.4.0: resolution: {integrity: sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg==} + dev: true /lodash.isequal@4.5.0: resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==} + dev: true /lodash.isfunction@3.0.9: resolution: {integrity: sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==} + dev: true /lodash.isinteger@4.0.4: resolution: {integrity: sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==} + dev: true /lodash.isplainobject@4.0.6: resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==} + dev: true /lodash.kebabcase@4.1.1: resolution: {integrity: sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==} @@ -14047,12 +14071,15 @@ packages: /lodash.lowerfirst@4.3.1: resolution: {integrity: sha512-UUKX7VhP1/JL54NXg2aq/E1Sfnjjes8fNYTNkPU8ZmsaVeBvPHKdbNaN79Re5XRL01u6wbq3j0cbYZj71Fcu5w==} + dev: true /lodash.map@4.6.0: resolution: {integrity: sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q==} + dev: true /lodash.mapvalues@4.6.0: resolution: {integrity: sha512-JPFqXFeZQ7BfS00H58kClY7SPVeHertPE0lNuCyZ26/XlN8TvakYD7b9bGyNmXbT/D3BbtPAAmq90gPWqLkxlQ==} + dev: true /lodash.memoize@4.1.2: resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==} @@ -14068,6 +14095,7 @@ packages: /lodash.pick@4.4.0: resolution: {integrity: sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==} + dev: true /lodash.reduce@4.6.0: resolution: {integrity: sha512-6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw==} @@ -14083,6 +14111,7 @@ packages: /lodash.snakecase@4.1.1: resolution: {integrity: sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==} + dev: true /lodash.some@4.6.0: resolution: {integrity: sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==} @@ -14107,12 +14136,15 @@ packages: /lodash.uniq@4.5.0: resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==} + dev: true /lodash.uniqby@4.7.0: resolution: {integrity: sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww==} + dev: true /lodash.values@4.3.0: resolution: {integrity: sha512-r0RwvdCv8id9TUblb/O7rYPwVy6lerCbcawrfdo9iC/1t1wsNMJknO79WNBgwkH0hIeJ08jmvvESbFpNb4jH0Q==} + dev: true /lodash@4.17.21: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} @@ -14931,6 +14963,7 @@ packages: lodash.uniqby: 4.7.0 lodash.values: 4.3.0 pretender: 3.4.7 + dev: true /mississippi@3.0.0: resolution: {integrity: sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==} @@ -16212,6 +16245,7 @@ packages: dependencies: fake-xml-http-request: 2.1.2 route-recognizer: 0.3.4 + dev: true /prettier-linter-helpers@1.0.0: resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==} @@ -17194,6 +17228,7 @@ packages: /route-recognizer@0.3.4: resolution: {integrity: sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g==} + dev: true /rsvp@3.2.1: resolution: {integrity: sha512-Rf4YVNYpKjZ6ASAmibcwTNciQ5Co5Ztq6iZPEykHpkoflnD/K5ryE/rHehFsTm4NJj8nKDhbi3eKBWGogmNnkg==}