Skip to content

Commit 338b5f3

Browse files
mansonamansona
authored
Merge pull request #919 from ember-learn/merge-main
Merge main
2 parents 13f3b88 + f9c1ecd commit 338b5f3

File tree

23 files changed

+1072
-441
lines changed

23 files changed

+1072
-441
lines changed

‎app/components/class-field-description.hbs

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@
5454
<div class='parameter'>
5555
<dt>{{param.name}}</dt>
5656
<dd class='parameter-type'>{{param.type}}</dd>
57-
<dd>{{param.description}}</dd>
57+
<dd><MarkdownToHtml @markdown={{param.description}} /></dd>
5858
{{#if param.props}}
5959
<dl class='parameters'>
6060
{{#each param.props as |prop|}}
6161
<div class='prop'>
6262
<dt>{{prop.name}}</dt>
6363
<dd class='parameter-type'>{{prop.type}}</dd>
64-
<dd>{{prop.description}}</dd>
64+
<dd><MarkdownToHtml @markdown={{prop.description}} /></dd>
6565
</div>
6666
{{/each}}
6767
</dl>
@@ -72,9 +72,9 @@
7272
<div class='return'>
7373
<dt>returns</dt>
7474
<dd class='return-type'>{{@field.return.type}}</dd>
75-
<dd>{{@field.return.description}}</dd>
75+
<dd><MarkdownToHtml @markdown={{@field.return.description}} /></dd>
7676
</div>
7777
{{/if}}
7878
</dl>
79-
{{html-safe @field.description}}
79+
<MarkdownToHtml @markdown={{@field.description}} />
8080
</section>

‎app/components/import-example.hbs

+1-21
Original file line numberDiff line numberDiff line change
@@ -1,21 +1 @@
1-
<div class='highlight javascript'>
2-
<div class='ribbon'></div>
3-
{{#if (is-clipboard-supported)}}
4-
<div class='import-copy'>
5-
{{#if this.showClipboardSuccessIcon}}
6-
{{svg-jar 'success' width='24px' height='24px'}}
7-
{{else}}
8-
<CopyButton @clipboardText={{concat 'import ' @item " from '" @package "';"}} @title='Copy to clipboard' @success={{this.showSuccess}}>
9-
{{svg-jar 'copy' width='24px' height='24px'}}
10-
</CopyButton>
11-
{{/if}}
12-
</div>
13-
{{/if}}
14-
<table class='CodeRay'>
15-
<tbody>
16-
<tr>
17-
<td class='code'><pre><span class='wrapper'><span class='keyword'>import</span> {{@item}} <span class='keyword'>from</span> <span class='string'>'{{@package}}'</span>;</span></pre></td>
18-
</tr>
19-
</tbody>
20-
</table>
21-
</div>
1+
<MarkdownToHtml @markdown={{this.markdown}} />

‎app/components/import-example.js

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
import { action } from '@ember/object';
21
import Component from '@glimmer/component';
3-
import { later } from '@ember/runloop';
4-
import { tracked } from '@glimmer/tracking';
52

63
export default class ImportExample extends Component {
7-
@tracked showClipboardSuccessIcon = false;
8-
9-
@action
10-
showSuccess() {
11-
this.showClipboardSuccessIcon = true;
12-
later(this, () => (this.showClipboardSuccessIcon = false), 950);
4+
get markdown() {
5+
let md = `\`\`\`js
6+
import ${this.args.item} from '${this.args.package}';
7+
\`\`\``;
8+
return md;
139
}
1410
}

‎app/controllers/project-version/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Controller from '@ember/controller';
2-
import { htmlSafe } from '@ember/string';
2+
import { htmlSafe } from '@ember/template';
33

44
export default Controller.extend({
55
oldPackageImportSyntax: htmlSafe(

‎app/helpers/html-safe.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { helper } from '@ember/component/helper';
2-
import { htmlSafe as emberHtmlSafe } from '@ember/string';
2+
import { htmlSafe as emberHtmlSafe } from '@ember/template';
33

44
export function htmlSafe([content]) {
55
return emberHtmlSafe(content);

‎app/routes/project-version/modules/module.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export default class ModuleRoute extends ClassRoute.extend(ScrollTracker) {
1818

1919
// These modules should not have `ember-` tacked onto the front of them
2020
// when forming the ids and URLs.
21-
let isNotEmber = klass.match(/@glimmer|rsvp|jquery/);
21+
let isNotEmber = klass.match(/@warp-drive|@glimmer|rsvp|jquery/);
2222

2323
if (!~klass.indexOf(project) && !isNotEmber) {
2424
klass = `${project}-${klass}`;

‎app/templates/project-version/classes/class.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
{{#if (and (not (eq this.static 1)) this.hasImportExample)}}
6969
<ImportExample @item={{@model.name}} @package={{this.module}} />
7070
{{/if}}
71-
<p class="description">{{html-safe @model.description}}</p>
71+
<p class="description"><MarkdownToHtml @markdown={{@model.description}} /></p>
7272

7373
{{#if (or @model.methods @model.properties @model.events)}}
7474
<div class="tabbed-layout">

‎app/templates/project-version/modules/module.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
{{/if}}
2020
</p>
2121

22-
<p class="description">{{html-safe this.model.description}}</p>
22+
<p class="description"><MarkdownToHtml @markdown={{this.model.description}} /></p>
2323

2424
{{#if this.submodules}}
2525
<section>

‎config/fastboot.js

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
module.exports = function () {
2+
return {
3+
buildSandboxGlobals(defaultGlobals) {
4+
return Object.assign({}, defaultGlobals, {
5+
atob: atob,
6+
});
7+
},
8+
};
9+
};

‎ember-cli-build.js

+10-1
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,14 @@ module.exports = function (defaults) {
4444
destDir: '/assets/',
4545
});
4646

47-
return mergeTrees([app.toTree(), mappingsTree]);
47+
const { Webpack } = require('@embroider/webpack');
48+
const appTree = require('@embroider/compat').compatBuild(app, Webpack, {
49+
staticAddonTrees: true,
50+
staticAddonTestSupportTrees: true,
51+
staticHelpers: true,
52+
staticModifiers: true,
53+
staticComponents: true,
54+
});
55+
56+
return mergeTrees([require('prember').prerender(app, appTree), mappingsTree]);
4857
};

‎package.json

+11-7
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,15 @@
2929
"devDependencies": {
3030
"@ember/optional-features": "^2.0.0",
3131
"@ember/test-helpers": "^2.6.0",
32+
"@embroider/compat": "^3.4.3",
33+
"@embroider/core": "^3.4.3",
34+
"@embroider/webpack": "^3.2.1",
3235
"@glimmer/component": "^1.1.2",
3336
"@glimmer/tracking": "^1.1.2",
3437
"@glint/core": "^0.9.7",
3538
"@glint/environment-ember-loose": "^0.9.7",
36-
"@percy/cli": "^1.14.0",
37-
"@percy/ember": "^3.0.1",
39+
"@percy/cli": "^1.28.7",
40+
"@percy/ember": "^4.2.0",
3841
"@tsconfig/ember": "^1.0.1",
3942
"@types/ember": "^4.0.2",
4043
"@types/ember-qunit": "^5.0.2",
@@ -58,7 +61,7 @@
5861
"broccoli-merge-trees": "^2.0.0",
5962
"ember-a11y-testing": "^0.5.4",
6063
"ember-anchor": "^1.0.3",
61-
"ember-auto-import": "^2.7.0",
64+
"ember-auto-import": "^2.7.2",
6265
"ember-cli": "~3.28.6",
6366
"ember-cli-app-version": "^5.0.0",
6467
"ember-cli-autoprefixer": "^1.0.0",
@@ -75,25 +78,26 @@
7578
"ember-cli-htmlbars": "^6.1.1",
7679
"ember-cli-inject-live-reload": "^2.1.0",
7780
"ember-cli-meta-tags": "^7.0.0",
81+
"ember-cli-showdown": "^9.0.1",
7882
"ember-cli-terser": "^4.0.2",
7983
"ember-composable-helpers": "^3.1.1",
8084
"ember-concurrency": "^2.3.7",
8185
"ember-data": "~3.28.6",
8286
"ember-data-fastboot": "https://github.com/cardstack/ember-data-fastboot#6e6fb8bbf0b405ae174160cc1e4833c5582f68cd",
8387
"ember-decorators": "^6.1.1",
84-
"ember-exam": "^1.0.0",
8588
"ember-export-application-global": "^2.0.1",
8689
"ember-fetch": "^8.1.1",
8790
"ember-inflector": "^3.0.0",
8891
"ember-load-initializers": "^2.1.2",
8992
"ember-maybe-import-regenerator": "^0.1.6",
9093
"ember-metrics": "^1.5.2",
9194
"ember-page-title": "^6.2.2",
92-
"ember-power-select": "^4.1.6",
95+
"ember-power-select": "^6.0.1",
9396
"ember-qunit": "^5.1.5",
9497
"ember-resolver": "^8.0.3",
9598
"ember-rfc176-data": "^0.3.17",
9699
"ember-route-action-helper": "^2.0.5",
100+
"ember-showdown-shiki": "^1.2.1",
97101
"ember-sinon": "^4.1.1",
98102
"ember-source": "~3.28.8",
99103
"ember-styleguide": "^8.3.0",
@@ -125,7 +129,7 @@
125129
"node-sass": "^9.0.0",
126130
"normalize.css": "^8.0.1",
127131
"npm-run-all": "^4.1.5",
128-
"prember": "^2.0.0",
132+
"prember": "^2.1.0",
129133
"prettier": "^2.5.1",
130134
"qunit": "^2.17.2",
131135
"qunit-dom": "^1.6.0",
@@ -135,7 +139,7 @@
135139
"spawndamnit": "2.0.0",
136140
"testem": "^3.10.0",
137141
"typescript": "^4.9.3",
138-
"webpack": "^5.89.0"
142+
"webpack": "^5.90.0"
139143
},
140144
"engines": {
141145
"node": "16.* || 18.* || 20.*",

0 commit comments

Comments
 (0)