Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dev dependencies and upgrade ember-showdown-prism (cherrypick from @nickschot) #77

Merged
merged 4 commits into from
Aug 19, 2020
Merged

Fix dev dependencies and upgrade ember-showdown-prism (cherrypick from @nickschot) #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
345bb91
Fix (dev)dependencies
nickschot Aug 15, 2020
4544776
Add /.idea/ to git & npmignore
nickschot Aug 15, 2020
1b8722a
Replace missing languages with working ones in dummy app content so i…
nickschot Aug 17, 2020
6131705
update ember-showdown-prism
mansona Aug 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@
/package.json.ember-try

/.changelog/

/.idea/
2 changes: 2 additions & 0 deletions .npmignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try

/.idea/
3,771 changes: 2,429 additions & 1,342 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,30 +30,32 @@
"ember-compatibility-test": "ember try:each"
},
"dependencies": {
"@glimmer/component": "^1.0.0",
"@glimmer/tracking": "^1.0.0",
"broccoli-concat": "^4.2.4",
"broccoli-funnel": "^3.0.2",
"ember-auto-import": "^1.5.3",
"ember-cli-babel": "^7.18.0",
"ember-cli-htmlbars": "^4.2.3",
"ember-composable-helpers": "^3.1.1",
"ember-concurrency": "^1.2.1",
"ember-concurrency-test-waiter": "^0.3.2",
"ember-moment": "^8.0.0",
"ember-showdown-prism": "^2.1.0",
"ember-styleguide": "^4.2.1",
"ember-svg-jar": "^2.2.3"
"ember-svg-jar": "^2.2.3",
"moment": "^2.27.0"
},
"devDependencies": {
"@ember/optional-features": "^1.3.0",
"@glimmer/component": "^1.0.0",
"@glimmer/tracking": "^1.0.0",
"@percy/ember": "^2.1.0",
"auto-changelog": "github:mansona/auto-changelog#epic",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^1.5.3",
"ember-cli": "~3.17.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-fastboot": "^2.2.1",
"ember-cli-inject-live-reload": "^2.0.2",
"ember-cli-moment-shim": "^3.7.1",
"ember-cli-sri": "^2.1.1",
"ember-cli-uglify": "^3.0.0",
"ember-data": "^3.17.0",
Expand All @@ -64,7 +66,6 @@
"ember-maybe-import-regenerator": "^0.1.6",
"ember-qunit": "^4.6.0",
"ember-resolver": "^7.0.0",
"ember-showdown-prism": "^1.0.1",
"ember-source": "~3.17.0",
"ember-source-channel-url": "^2.0.1",
"ember-template-lint": "^2.4.0",
Expand Down
4 changes: 2 additions & 2 deletions tests/dummy/content/ember-3-14-released.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ These motivations as well as the detailed design of this feature are described i

A template such as the following can now be refactored from using `this.model`:

```hbs
```handlebars
{{!-- The model for this route is the current user --}}

<div>
Expand All @@ -110,7 +110,7 @@ A template such as the following can now be refactored from using `this.model`:

To use `@model`:

```hbs
```handlebars
{{!-- The model for this route is the current user --}}

<div>
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/content/themes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The [empress-blog documentation](https://github.com/empress/empress-blog/blob/ma

If you are interested in writing your own theme for empress-blog you can get started using

```sh
```bash
npm init empress-blog-template <template-name>
```
and it will create a brand new template addon in the folder `empress-blog-template-name-template`! You can check out the documentation for [create-empress-blog-template here](https://github.com/empress/create-empress-blog-template#readme). As [Ghost](https://ghost.org/) uses handlebars it is not too difficult to port an existing Ghost template to use Ember templates, so if you have any requests for an existing open source Ghost template please let us know 👍
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/content/welcome.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ We know that first impressions are important, so we've populated your new site w

### Quick Start

```sh
```bash
# if you don't have ember-cli installed already
npm install -g ember-cli

Expand Down