Merge pull request #1261 from ember-learn/jw-cm-urls-versions

Make individual pages for deprecations

.eslintrc.js

@@ -54,5 +54,19 @@ module.exports = {
       files: ['tests/**/*-test.{js,ts}'],
       extends: ['plugin:qunit/recommended'],
     },
+    {
+      // mocha tests
+      files: ['node-tests/**/*.mjs'],
+      env: {
+        browser: false,
+        node: true,
+        mocha: true,
+      },
+      plugins: ['node'],
+      extends: ['plugin:node/recommended'],
+      rules: {
+        'node/no-unpublished-import': 'off',
+      },
+    },
   ],
 };

app/adapters/application.js

@@ -1,42 +1,10 @@
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
-import { inject as service } from '@ember/service';
-import config from 'deprecation-app/config/environment';
-
 export default class ApplicationAdapter extends JSONAPIAdapter {
-  @service fastboot;
-
-  /**
-   *  FastBoot shouldn't know the host since we use prember
-   *  & it can't find the resources at the API host during build time.
-   */
-  get host() {
-    let isFastBoot = this.fastboot.isFastBoot;
-    return isFastBoot ? '' : config.apiHost;
+  urlForFindRecord(id, modelName) {
+    return `/${modelName}/${id}.json`;
   }
 
-  buildURL(modelName, id, snapshot, requestType, query) {
-    let url;
-
-    if (requestType === 'queryRecord') {
-      url = [modelName, `${query.path}.json`];
-    } else if (requestType === 'query') {
-      url = [modelName, `${query.path}-${query.version}.json`];
-    } else {
-      return this.super;
-    }
-
-    let host = this.host;
-    let prefix = this.urlPrefix();
-
-    if (prefix) {
-      url.unshift(prefix);
-    }
-
-    url = url.join('/');
-    if (!host && url && url.charAt(0) !== '/') {
-      url = '/' + url;
-    }
-
-    return url;
+  urlForQuery(query, modelName) {
+    return `/${modelName}/${query.path}-${query.version}.json`;
   }
 }

app/controllers/show.js

@@ -23,13 +23,6 @@ export default class ShowController extends Controller {
     return PROJECTS[this.content.query.path];
   }
 
-  get renderIdOrUntil() {
-    let version = this.content.query.version;
-    let versionsWithoutId = ['v1.x'];
-
-    return !versionsWithoutId.includes(version);
-  }
-
   @action
   toggleToc() {
     this.displayMobileToc = !this.displayMobileToc;

app/models/content.js

@@ -6,4 +6,10 @@ export default class ContentModel extends Model {
   @attr until;
   @attr since;
   @attr anchor;
+  @attr displayId;
+
+  // v1 has different meta, so conditionally render it
+  get renderUntil() {
+    return !this.since.startsWith('1.');
+  }
 }

app/router.js

@@ -14,4 +14,6 @@ Router.map(function () {
   this.route('show', {
     path: ':project/:version',
   });
+
+  this.route('id', { path: 'id/:id' });
 });

app/routes/id.js

@@ -0,0 +1,10 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+
+export default class IdPRoute extends Route {
+  @service store;
+
+  model(params) {
+    return this.store.findRecord('content', params.id);
+  }
+}

app/serializers/application.js

@@ -1,3 +1,7 @@
 import JSONAPISerializer from '@ember-data/serializer/json-api';
 
-export default class ApplicationSerializer extends JSONAPISerializer {}
+export default class ApplicationSerializer extends JSONAPISerializer {
+  keyForAttribute(key) {
+    return key;
+  }
+}

app/templates/components/deprecation-article.hbs

@@ -1,20 +1,9 @@
 <div class="padding-vertical-small bg-light-muted rounded-sm">
-  <h3 id="{{id-for-deprecation @model.id @model.anchor}}">
-    <a href="#{{id-for-deprecation @model.id @model.anchor}}" title={{@model.title}} class="toc-anchor">
-      §
-    </a>
-    {{markdown-to-html
-      @model.title
-      extensions="no-wrapper"
-      tagName=""
-    }}
-  </h3>
+  {{yield}}
   <div class="my-2">
-    {{#if @renderIdOrUntil}}
+    {{#if @model.renderUntil}}
       <div><span class="bold">until: </span>{{@model.until}}</div>
-    {{/if}}
-    {{#if @renderIdOrUntil}}
-      <div><span class="bold">id: </span>{{@model.id}}</div>
+      <div><span class="bold">id: </span>{{or @model.displayId @model.id}}</div>
     {{/if}}
   </div>
   <section>

app/templates/components/main-layout.hbs

@@ -10,7 +10,18 @@
     {{#each @sortedGroupedResults as |result|}}
       <h2 class="anchorable-toc rounded-lg padding-small">Deprecations Added in {{result.since}} </h2>
       {{#each result.contents as |content|}}
-        <DeprecationArticle @model={{content}} @renderIdOrUntil={{@renderIdOrUntil}} />
+        <DeprecationArticle @model={{content}}>
+          <h3 id="{{id-for-deprecation (or content.displayId content.id) content.anchor}}">
+            <a href="#{{id-for-deprecation (or content.displayId content.id) content.anchor}}" title={{content.title}} class="toc-anchor">
+              §
+            </a>
+            {{markdown-to-html
+              content.title
+              extensions="no-wrapper"
+              tagName=""
+            }}
+          </h3>
+        </DeprecationArticle>
       {{/each}}
     {{/each}}
   {{/if}}

app/templates/id.hbs

@@ -0,0 +1,13 @@
+{{page-title @model.title}}
+<LinkTo @route="index">&laquo; All deprecation guides</LinkTo>
+<h1>
+  Deprecation Guide for
+  {{markdown-to-html
+    @model.title
+    extensions="no-wrapper"
+    tagName=""
+  }}
+</h1>
+<DeprecationArticle @model={{@model}} />
+
+{{outlet}}

app/templates/show.hbs

@@ -18,7 +18,6 @@
     @sortedGroupedResults={{@model.sorted}}
     @version={{this.version}}
     @project={{this.project}}
-    @renderIdOrUntil={{this.renderIdOrUntil}}
     @displayMobileToc={{this.displayMobileToc}}
   />
 </div>

config/environment.js

@@ -55,11 +55,6 @@ module.exports = function (environment) {
 
   if (environment === 'production') {
     // here you can enable a production-specific feature
-
-    let fastlyDomain = process.env.FASTLY_DOMAIN;
-    if (fastlyDomain) {
-      ENV.apiHost = `https://${fastlyDomain}`;
-    }
   }
 
   return ENV;

content/ember-cli/v2/cli-base-url.md → content/ember-cli/v2/base-url.md

@@ -1,10 +1,10 @@
 ---
-id: base-url
 title: Base URL
-until: '3.0.0'
-since: '2.7.0'
+until: 3.0.0
+since: 2.7.0
 ---
 
+
 The usage of `baseURL` setting in `config/environments.js` has been deprecated in favor of using
 an explicit `rootURL`. A detailed explanation of the problem and the migration path can be found in
 [this blog post](/blog/2016/04/28/baseURL.html).

content/ember-cli/v2/clobbering-addon-options.md

@@ -1,9 +1,9 @@
 ---
-id: clobbering-addon-options
 title: Clobbering Addon#options
-since: '2.12.0'
+since: 2.12.0
 ---
 
+
 Clobbering `this.options` within an addon has been deprecated. If you would like to use `this.options`
 for internal options within your addon, you must preserve the intitial options object that is present.
 

content/ember-cli/v2/cli-ui-deprecate.md → content/ember-cli/v2/deprecate-utility.md

@@ -1,10 +1,10 @@
 ---
-id: deprecate-utility
 title: Deprecate Utility
-until: '3.0.0'
-since: '2.2.0'
+until: 3.0.0
+since: 2.2.0
 ---
 
+
 Using the `ember-cli/lib/utlities/deprecate` module to issue deprecations has been deprecated
 in favor of using `.writeDeprecateLine` method on the `ui` object (which is available on both
 addons and project instances).

content/ember-cli/v2/migrate-from-brocfile.md → content/ember-cli/v2/migrate-from-brocfile-js-to-ember-cli-build-js.md

@@ -1,10 +1,10 @@
 ---
-id: migrate-from-brocfile-js-to-ember-cli-build-js
 title: Migrate from Brocfile.js to ember-cli-build.js
-until: '3.0.0'
-since: '2.0.0'
+until: 3.0.0
+since: 2.0.0
 ---
 
+
 Early versions of Ember CLI utilized the default build file of Broccoli: `Brocfile.js`. Over time
 we began realizing that this was not a tenable solution (we could not pass high fidelity objects
 into the build pipeline, and therefore created two instances of all addons, etc), and introduced a

content/ember-cli/v4/blacklist-whitelist-build-options.md → content/ember-cli/v4/ember-cli-blacklist-whitelist-build-options.md

@@ -1,10 +1,11 @@
 ---
-id: ember-cli.blacklist-whitelist-build-options
 title: blacklist and whitelist build options
-until: '5.0.0'
-since: '4.4.0'
+until: 5.0.0
+since: 4.4.0
+displayId: ember-cli.blacklist-whitelist-build-options
 ---
 
+
 Using the `blacklist` and `whitelist` build options has been deprecated. Please 
 use `exclude` and `include` respectively instead.
 

content/ember-cli/v4/blueprint.add-bower-package-to-project.md → content/ember-cli/v4/ember-cli-blueprint-add-bower-package-to-project.md

@@ -1,10 +1,11 @@
 ---
-id: ember-cli.blueprint.add-bower-package-to-project
 title: Blueprint::addBowerPackageToProject
-until: '5.0.0'
-since: '4.3.0'
+until: 5.0.0
+since: 4.3.0
+displayId: ember-cli.blueprint.add-bower-package-to-project
 ---
 
+
 `addBowerPackageToProject` has been deprecated. If the package is also available
 on the npm registry, please use `addPackageToProject` instead. If not, please
 suggest your users to install the Bower package manually by running:

content/ember-cli/v4/blueprint.add-bower-packages-to-project.md → content/ember-cli/v4/ember-cli-blueprint-add-bower-packages-to-project.md

@@ -1,10 +1,11 @@
 ---
-id: ember-cli.blueprint.add-bower-packages-to-project
 title: Blueprint::addBowerPackagesToProject
-until: '5.0.0'
-since: '4.3.0'
+until: 5.0.0
+since: 4.3.0
+displayId: ember-cli.blueprint.add-bower-packages-to-project
 ---
 
+
 `addBowerPackagesToProject` has been deprecated. If the packages are also available
 on the npm registry, please use `addPackagesToProject` instead. If not, please
 suggest your users to install the Bower packages manually by running:

content/ember-cli/v4/building-bower-packages.md → content/ember-cli/v4/ember-cli-building-bower-packages.md

@@ -1,10 +1,11 @@
 ---
-id: ember-cli.building-bower-packages
 title: Building Bower Packages
-until: '5.0.0'
-since: '4.3.0'
+until: 5.0.0
+since: 4.3.0
+displayId: ember-cli.building-bower-packages
 ---
 
+
 Building Bower packages has been deprecated.
 
 Please consider one of the following alternatives:

content/ember-cli/v4/ember-cli-jshint-support.md → content/ember-cli/v4/ember-cli-ember-cli-jshint-support.md

@@ -1,10 +1,11 @@
 ---
-id: ember-cli.ember-cli-jshint-support
 title: ember-cli-jshint support
-until: '5.0.0'
-since: '4.6.0'
+until: 5.0.0
+since: 4.6.0
+displayId: ember-cli.ember-cli-jshint-support
 ---
 
+
 Support for [ember-cli-jshint](https://github.com/ember-cli/ember-cli-jshint) has been deprecated. 
 Please use [ESLint](https://eslint.org/) directly instead. Please refer to the 
 default [app blueprint](https://github.com/ember-cli/ember-cli/tree/master/blueprints/app/files) 

content/ember-cli/v4/project.bower-dependencies.md → content/ember-cli/v4/ember-cli-project-bower-dependencies.md

@@ -1,10 +1,11 @@
 ---
-id: ember-cli.project.bower-dependencies
 title: Project::bowerDependencies
-until: '5.0.0'
-since: '4.3.0'
+until: 5.0.0
+since: 4.3.0
+displayId: ember-cli.project.bower-dependencies
 ---
 
+
 `bowerDependencies` has been deprecated. If you still need access to the
 project's Bower dependencies, you will have to manually resolve the project's
 `bower.json` file instead:

content/ember-cli/v4/project.bower-directory.md → content/ember-cli/v4/ember-cli-project-bower-directory.md

@@ -1,10 +1,11 @@
 ---
-id: ember-cli.project.bower-directory
 title: Project::bowerDirectory
-until: '5.0.0'
-since: '4.3.0'
+until: 5.0.0
+since: 4.3.0
+displayId: ember-cli.project.bower-directory
 ---
 
+
 `bowerDirectory` has been deprecated. If you still need access to the
 project's Bower directory, you will have to manually resolve the project's
 `.bowerrc` file and read the `directory` property instead:

content/ember-cli/v4/vendor-shim-blueprint.md → content/ember-cli/v4/ember-cli-vendor-shim-blueprint.md

@@ -1,9 +1,10 @@
 ---
-id: ember-cli.vendor-shim-blueprint
 title: vendor-shim blueprint
-until: '5.0.0'
-since: '4.6.0'
+until: 5.0.0
+since: 4.6.0
+displayId: ember-cli.vendor-shim-blueprint
 ---
 
+
 The `vendor-shim` blueprint has been deprecated. Please use [ember-auto-import](https://github.com/ef4/ember-auto-import) 
 instead to import normal npm packages.

content/ember-data/v2/date-parse-deprecate.md → content/ember-data/v2/date-prototype-extension.md

@@ -1,10 +1,10 @@
 ---
-id: date-prototype-extension
 title: Date Prototype Extension
-until: '3.0.0'
-since: '2.7'
+until: 3.0.0
+since: "2.7"
 ---
 
+
 In previous versions of Ember Data, the native `Date.parse` function was
 replaced with `Ember.Date.parse`, a [progressive enhancement for ISO
 8601](https://github.com/csnover/js-iso8601) support in browsers that do not