Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions .ember-cli
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
{
/**
Ember CLI sends analytics information by default. The data is completely
anonymous, but there are times when you might want to disable this behavior.

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
Expand Down
13 changes: 1 addition & 12 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,14 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/declarations/
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.*/
.eslintcache

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ jobs:
- ember-lts-3.28
- ember-lts-4.4
- ember-lts-4.8
- ember-lts-4.12
- ember-lts-5.4
- ember-lts-5.8
- ember-release
- ember-beta
- ember-canary
Expand Down
9 changes: 1 addition & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,21 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/
/declarations/

# dependencies
/bower_components/
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try

Expand Down
8 changes: 2 additions & 6 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.env*
Expand All @@ -23,18 +19,18 @@
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
/tests/
/tsconfig.declarations.json
/tsconfig.json
/yarn-error.log
/yarn.lock
.gitkeep

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try

Expand Down
14 changes: 1 addition & 13 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache
.lint-todo/
.*/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
2 changes: 1 addition & 1 deletion .watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
"ignore_dirs": ["dist"]
}
20 changes: 10 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

## Installation

* `git clone <repository-url>`
* `cd empress-blog-ember-template`
* `npm install`
- `git clone <repository-url>`
- `cd empress-blog-ember-template`
- `pnpm install`

## Linting

* `npm run lint`
* `npm run lint:fix`
- `pnpm lint`
- `pnpm lint:fix`

## Running tests

* `ember test` – Runs the test suite on the current Ember version
* `ember test --server` – Runs the test suite in "watch mode"
* `ember try:each` – Runs the test suite against multiple Ember versions
- `pnpm test` – Runs the test suite on the current Ember version
- `pnpm test:ember --server` – Runs the test suite in "watch mode"
- `pnpm test:ember-compatibility` – Runs the test suite against multiple Ember versions

## Running the dummy application

* `ember serve`
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
- `pnpm start`
- Visit the dummy application at [http://localhost:4200](http://localhost:4200).

For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ For more information about empress-blog [read the empress-blog
documentation](https://github.com/empress/empress-blog/blob/master/README.md) but if you want to
get started straight away, try the quick start below.


## Compatibility

* Ember.js v3.16 or above
Expand Down Expand Up @@ -35,7 +34,6 @@ be able to navigate to [http://localhost:4200](http://localhost:4200) to see th

See the [Contributing](CONTRIBUTING.md) guide for details.


## License

This project is licensed under the [MIT License](LICENSE.md).
1 change: 1 addition & 0 deletions addon/components/comments.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{! template-lint-disable no-at-ember-render-modifiers }}
<section class="post-content-comments mt-5" {{did-update this.rerenderComments @post}}>
{{#if this.commentsEnabled}}
{{#if this.renderComments}}
Expand Down
1 change: 1 addition & 0 deletions addon/components/load-posts.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{! template-lint-disable no-at-ember-render-modifiers }}
<div {{did-update (fn this.loadInitial @model) @model}}>
{{#if this.loadInitialTask.isRunning}}
<SkeletonLoader class="text-center">
Expand Down
67 changes: 34 additions & 33 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,84 +21,85 @@
"scripts": {
"build": "ember build --environment=production",
"changelog": "auto-changelog --template changelog.template --unreleased-only --prepend --load-github-issue-data --github-cache-dir .changelog",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
"lint:css": "stylelint \"**/*.css\"",
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint:css:fix": "concurrently \"pnpm:lint:css -- --fix\"",
"lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"start": "ember serve",
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
"test": "concurrently \"pnpm:lint\" \"pnpm:test:*\" --names \"lint,test:\"",
"test:ember": "ember test"
},
"dependencies": {
"@babel/core": "^7.25.2",
"@ember/test-waiters": "^3.0.0",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"broccoli-concat": "^4.2.4",
"broccoli-funnel": "^3.0.3",
"ember-auto-import": "^2.6.3",
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.2.0",
"ember-auto-import": "^2.8.1",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0",
"ember-composable-helpers": "^3.2.0",
"ember-concurrency": "^2.2.0",
"ember-showdown-prism": "^3.0.0",
"ember-styleguide": "^8.0.0",
"ember-svg-jar": "^2.3.3"
},
"devDependencies": {
"@babel/eslint-parser": "^7.21.3",
"@babel/plugin-proposal-decorators": "^7.21.0",
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.0.1",
"@ember/test-helpers": "^2.9.3",
"@babel/eslint-parser": "^7.25.1",
"@babel/plugin-proposal-decorators": "^7.24.7",
"@ember/optional-features": "^2.1.0",
"@ember/test-helpers": "^3.3.1",
"@embroider/test-setup": "^4.0.0",
"@percy/cli": "^1.21.0",
"@percy/ember": "^3.0.1",
"auto-changelog": "github:mansona/auto-changelog#epic",
"babel-plugin-ember-template-compilation": "^2.0.1",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.0.1",
"ember-cli": "~4.12.3",
"ember-cli-dependency-checker": "^3.3.1",
"concurrently": "^8.2.2",
"ember-cli": "~5.12.0",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-fastboot": "^4.1.0",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-data": "~3.28.0",
"ember-fetch": "^8.1.1",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^7.0.0",
"ember-qunit": "^6.2.0",
"ember-resolver": "^10.0.0",
"ember-source": "~4.12.0",
"ember-page-title": "^8.2.3",
"ember-qunit": "^8.1.0",
"ember-resolver": "^12.0.1",
"ember-source": "~5.12.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.7.2",
"ember-template-lint": "^6.0.0",
"ember-test-selectors": "^6.0.0",
"ember-try": "^4.0.0",
"empress-blog": "^4.0.0",
"eslint": "^8.37.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-ember": "^11.5.0",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.4",
"eslint": "^8.57.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^12.2.1",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-qunit": "^8.1.2",
"lint-to-the-future": "^2.6.4",
"lint-to-the-future-ember-template": "^3.1.0",
"lint-to-the-future-eslint": "^3.2.0",
"lint-to-the-future-stylelint": "^2.1.0",
"loader.js": "^4.7.0",
"normalize.css": "^8.0.1",
"prember": "^1.1.1",
"prettier": "^2.8.7",
"qunit": "^2.19.4",
"qunit-dom": "^2.0.0",
"stylelint": "^15.4.0",
"stylelint-config-standard": "^32.0.0",
"stylelint-prettier": "^3.0.0",
"webpack": "^5.78.0"
"prettier": "^3.3.3",
"qunit": "^2.22.0",
"qunit-dom": "^3.2.1",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-prettier": "^4.1.0",
"webpack": "^5.95.0"
},
"packageManager": "pnpm@10.18.2+sha512.9fb969fa749b3ade6035e0f109f0b8a60b5d08a1a87fdf72e337da90dcc93336e2280ca4e44f2358a649b83c17959e9993e777c2080879f3801e6f0d999ad3dd",
"peerDependencies": {
Expand Down
37 changes: 37 additions & 0 deletions patches/@ember-data__adapter.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
diff --git a/addon/error.js b/addon/error.js
index 4e2c0a28ae80c4d1821be9bb4063665201013078..d1b2620a6adf1bbb189683384247a63ef2aacb71 100644
--- a/addon/error.js
+++ b/addon/error.js
@@ -2,7 +2,7 @@
@module @ember-data/adapter/error
*/
import { assert } from '@ember/debug';
-import EmberError from '@ember/error';
+const EmberError = Error;

/**
A `AdapterError` is used by an adapter to signal that an error occurred
diff --git a/addon/rest.ts b/addon/rest.ts
index dbf44eab1e0b4e51e67b4b6cacee136c6107f4c2..f0f65a98b1f1a65f8ba168626047921596837aa9 100644
--- a/addon/rest.ts
+++ b/addon/rest.ts
@@ -4,7 +4,7 @@
import { getOwner } from '@ember/application';
import { deprecate, warn } from '@ember/debug';
import { computed } from '@ember/object';
-import { assign } from '@ember/polyfills';
+const assign = Object.assign;
import { join } from '@ember/runloop';
import { DEBUG } from '@glimmer/env';

@@ -1303,8 +1303,8 @@ class RESTAdapter extends Adapter.extend(BuildURLMixin) {

/**
Used by `findAll` and `findRecord` to build the query's `data` hash
- supplied to the ajax method.
-
+ supplied to the ajax method.
+
@method buildQuery
@since 2.5.0
@public
26 changes: 26 additions & 0 deletions patches/@ember-data__model.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
diff --git a/addon/-private/model.js b/addon/-private/model.js
index 1e10c4f6215bf1ef57fb49217b29515b09034797..85149c88a5f9e5de862791c770b0dff34f31ec89 100644
--- a/addon/-private/model.js
+++ b/addon/-private/model.js
@@ -3,7 +3,7 @@
*/

import { assert, deprecate, warn } from '@ember/debug';
-import EmberError from '@ember/error';
+const EmberError = Error;
import EmberObject, { get } from '@ember/object';
import { dependentKeyCompat } from '@ember/object/compat';
import { run } from '@ember/runloop';
@@ -104,10 +104,10 @@ function computeOnce(target, key, desc) {

/**
Base class from which Models can be define.
-
+
```js
import Model, { attr } from '@ember-data/model';
-
+
export default class User extends Model {
@attr name;
}
Loading
Loading