Skip to content

Commit

Permalink
Merge pull request miragejs#2407 from miragejs/extract-docs-app
Browse files Browse the repository at this point in the history
Extract docs into separate app
  • Loading branch information
SergeAstapov authored Apr 23, 2022
2 parents 36b7053 + e745ea3 commit e3eda06
Show file tree
Hide file tree
Showing 53 changed files with 13 additions and 5,077 deletions.
12 changes: 0 additions & 12 deletions packages/ember-cli-mirage/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,3 @@
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try

# custom
.floo
_site
jekyll-tmp

# IDE
/.idea/
/*.iml

### macOS ###
*.DS_Store
6 changes: 0 additions & 6 deletions packages/ember-cli-mirage/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
/.travis.yml
/.watchmanconfig
/bower.json
/config/addon-docs.js
/config/deploy.js
/config/ember-try.js
/CONTRIBUTING.md
/ember-cli-build.js
Expand All @@ -40,7 +38,3 @@
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try

/.sass-cache
/jekyll-tmp
*.md
2 changes: 1 addition & 1 deletion packages/ember-cli-mirage/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ A client-side server to develop, test and prototype your Ember CLI app.

* Ember.js v3.12 or above
* Ember CLI v3.12 or above
* Node.js v12 or above
* Node.js v14 or above

## Installation

Expand Down
13 changes: 0 additions & 13 deletions packages/ember-cli-mirage/config/addon-docs.js

This file was deleted.

31 changes: 0 additions & 31 deletions packages/ember-cli-mirage/config/deploy.js

This file was deleted.

1 change: 0 additions & 1 deletion packages/ember-cli-mirage/config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ module.exports = async function () {
name: 'ember-lts-3.12',
npm: {
devDependencies: {
'ember-cli-addon-docs': '~4.2.2',
'ember-cli': '~3.12.1',
'ember-data': '~3.12.6',
'ember-source': '~3.12.4',
Expand Down
9 changes: 0 additions & 9 deletions packages/ember-cli-mirage/ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,6 @@ module.exports = function (defaults) {
'ember-cli-babel': {
includePolyfill: true,
},
'ember-cli-addon-docs-esdoc': {
packages: [
'ember-cli-mirage',
{ name: 'miragejs', sourceDirectory: 'lib' },
],
},
'ember-composable-helpers': {
only: ['sort-by'],
},
addons: {
blacklist: ['ember-cli-fastboot'],
},
Expand Down
17 changes: 5 additions & 12 deletions packages/ember-cli-mirage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,29 +53,22 @@
"devDependencies": {
"@ember/jquery": "^2.0.0",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@ember/test-helpers": "^2.7.0",
"@embroider/test-setup": "^1.6.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@types/qunit": "^2.11.3",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~4.1.0",
"ember-cli-addon-docs": "github:ember-learn/ember-cli-addon-docs#36a989bd112e8c2ae27c375eef6f7796c8a5dc28",
"ember-cli-addon-docs-esdoc": "^0.4.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-deploy": "^1.0.2",
"ember-cli-deploy-build": "^2.0.0",
"ember-cli-deploy-git": "^1.3.3",
"ember-cli-deploy-git-ci": "^1.0.1",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-fastboot": "^3.3.0",
"ember-cli-favicon": "^3.0.0",
"ember-cli-htmlbars": "^6.0.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-moment-shim": "^3.8.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-composable-helpers": "^5.0.0",
"ember-data": "~4.1.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.1",
Expand All @@ -86,7 +79,7 @@
"ember-resolver": "^8.0.3",
"ember-source": "~4.1.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^4.0.0",
"ember-template-lint": "^4.5.0",
"ember-try": "^2.0.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/ember-cli-mirage/tests/dummy/app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>EmberCLI Mirage</title>
<title>Dummy</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">

Expand All @@ -14,7 +14,7 @@

{{content-for "head-footer"}}
</head>
<body class='docs-font-sans docs-text-black docs-leading-normal'>
<body>
{{content-for "body"}}

<script src="{{rootURL}}assets/vendor.js"></script>
Expand Down
58 changes: 3 additions & 55 deletions packages/ember-cli-mirage/tests/dummy/app/router.js
Original file line number Diff line number Diff line change
@@ -1,61 +1,9 @@
import AddonDocsRouter, { docsRoute } from 'ember-cli-addon-docs/router';
import EmberRouter from '@ember/routing/router';
import config from 'dummy/config/environment';

export default class Router extends AddonDocsRouter {
export default class Router extends EmberRouter {
location = config.locationType;
rootURL = config.rootURL;
}

Router.map(function () {
docsRoute(this, function () {
this.route('getting-started', function () {
this.route('what-is-mirage');
this.route('installation');
this.route('upgrade-guide');
this.route('overview');
});

this.route('route-handlers', function () {
this.route('functions');
this.route('shorthands');
});

this.route('data-layer', function () {
this.route('database');
this.route('orm');
this.route('models');
this.route('relationships');
this.route('factories');
this.route('fixtures');
this.route('serializers', function () {
this.route('ember-data-serializer');
});
});

this.route('testing', function () {
this.route('setup-mirage');
this.route('acceptance-tests');
this.route('integration-and-unit-tests');
this.route('assertions');
});

this.route('advanced', function () {
this.route('environment-options');
this.route('server-configuration');
this.route('simulating-cookie-responses');
this.route('mocking-guids');
this.route('customizing-the-inflector');
this.route('switching-between-scenarios');
});

this.route('api', function () {
this.route('class', { path: '/:class_id' });
});
});

this.route('blog', function () {
this.route('detail', { path: '/:post_slug_and_id' });
});

this.route('not-found', { path: '/*path' });
});
Router.map(function () {});
23 changes: 0 additions & 23 deletions packages/ember-cli-mirage/tests/dummy/app/routes/application.js

This file was deleted.

19 changes: 0 additions & 19 deletions packages/ember-cli-mirage/tests/dummy/app/routes/blog/detail.js

This file was deleted.

This file was deleted.

10 changes: 0 additions & 10 deletions packages/ember-cli-mirage/tests/dummy/app/routes/docs/index.js

This file was deleted.

Loading

0 comments on commit e3eda06

Please sign in to comment.