Skip to content

Commit

Permalink
Update froala-editor to 4.1.4 and ember to 5.4 (#152)
Browse files Browse the repository at this point in the history
* Update froala-editor to 4.1.4
* Update ember to 5.4
* Ember 5.4 addon changes
  • Loading branch information
Panman82 authored Dec 7, 2023
1 parent 5c36bb1 commit 9a3e8e3
Show file tree
Hide file tree
Showing 5 changed files with 137 additions and 247 deletions.
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Compatibility

* Ember.js v3.20 or above
* Ember CLI v3.20 or above
* Node.js v16, or v18 and above
* Node.js v18 and above
* _`ember-auto-import` v2 or above_

#### Note on `ember-auto-import` version requirement
Expand Down
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,25 +50,25 @@
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"@babel/core": "^7.22.20",
"@babel/core": "^7.23.5",
"@ember/render-modifiers": "^2.1.0",
"@embroider/macros": "^1.13.1",
"@glimmer/component": "^1.1.2",
"ember-auto-import": "^2.6.3",
"ember-cli-babel": "^8.0.0",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0",
"froala-editor": "^4.1.2"
"froala-editor": "^4.1.4"
},
"devDependencies": {
"@babel/eslint-parser": "^7.22.15",
"@babel/plugin-proposal-decorators": "^7.22.15",
"@babel/plugin-proposal-decorators": "^7.23.5",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^3.2.0",
"@embroider/test-setup": "^3.0.1",
"@embroider/test-setup": "^3.0.3",
"@glimmer/tracking": "^1.1.2",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.2.1",
"ember-cli": "~5.3.0",
"concurrently": "^8.2.2",
"ember-cli": "~5.4.1",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-inject-live-reload": "^2.1.0",
Expand All @@ -78,30 +78,30 @@
"ember-load-initializers": "^2.1.2",
"ember-qunit": "^8.0.1",
"ember-resolver": "^11.0.1",
"ember-source": "~5.3.0",
"ember-source": "~5.4.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.11.2",
"ember-try": "^3.0.0",
"eslint": "^8.49.0",
"eslint": "^8.55.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-ember": "^11.11.1",
"eslint-plugin-n": "^16.1.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-qunit": "^8.0.0",
"eslint-plugin-n": "^16.3.1",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-qunit": "^8.0.1",
"loader.js": "^4.7.0",
"prettier": "^3.0.3",
"qunit": "^2.19.4",
"qunit": "^2.20.0",
"qunit-dom": "^2.0.0",
"stylelint": "^15.10.3",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-prettier": "^4.0.2",
"webpack": "^5.88.2"
"webpack": "^5.89.0"
},
"peerDependencies": {
"ember-source": ">=3.20.0"
},
"engines": {
"node": "16.* || >= 18"
"node": ">= 18"
},
"ember": {
"edition": "octane"
Expand Down
Loading

0 comments on commit 9a3e8e3

Please sign in to comment.