Skip to content

Commit

Permalink
Merge pull request #156 from froala/ember-57-froala-42
Browse files Browse the repository at this point in the history
Update froala-editor to 4.2 and ember to 5.7
  • Loading branch information
Panman82 authored Mar 21, 2024
2 parents dc4f2c4 + 19aaebd commit 565bdf4
Show file tree
Hide file tree
Showing 7 changed files with 978 additions and 692 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ jobs:
try-scenario:
- ember-lts-4.8
- ember-lts-4.12
- ember-lts-5.4
- ember-release
- ember-beta
- ember-canary
Expand Down
15 changes: 7 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,17 @@ commit message for clarification as needed.
* `pnpm install`


### Running Docs Server
### Running Tests

* `ember server`
* Visit the docs at http://localhost:4200
* `pnpm run test` - Runs the test suite on the current Ember version
* `pnpm run test:ember --server` - Runs the test suite in "watch mode"
* `pnpm run test:ember-compatibility` - Runs the test suite against multiple Ember versions


### Running Tests
### Running the dummy application

* `pnpm test` (Runs `ember try:each` to test against multiple Ember versions)
* `ember test`
* `ember test --server`
* `ember server` (Visit tests at http://localhost:4200/tests)
* `pnpm run start`
* Visit the dummy application at [http://localhost:4200](http://localhost:4200)


For more information on using ember-cli, visit
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016-2023
Copyright (c) 2016-2024

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,52 +50,52 @@
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"@babel/core": "^7.23.5",
"@babel/core": "^7.24.0",
"@ember/render-modifiers": "^2.1.0",
"@embroider/macros": "^1.13.1",
"@glimmer/component": "^1.1.2",
"ember-auto-import": "^2.6.3",
"ember-auto-import": "^2.7.2",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0",
"froala-editor": "^4.1.4"
"froala-editor": "^4.2.0"
},
"devDependencies": {
"@babel/eslint-parser": "^7.22.15",
"@babel/plugin-proposal-decorators": "^7.23.5",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^3.2.0",
"@babel/eslint-parser": "^7.23.10",
"@babel/plugin-proposal-decorators": "^7.24.0",
"@ember/optional-features": "^2.1.0",
"@ember/test-helpers": "^3.3.0",
"@embroider/test-setup": "^3.0.3",
"@glimmer/tracking": "^1.1.2",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.2.2",
"ember-cli": "~5.4.1",
"ember-cli": "~5.7.0",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-cli-update": "^1.0.1",
"ember-load-initializers": "^2.1.2",
"ember-qunit": "^8.0.1",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.4.0",
"ember-source": "~5.7.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.11.2",
"ember-template-lint": "^5.13.0",
"ember-try": "^3.0.0",
"eslint": "^8.55.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-ember": "^11.11.1",
"eslint-plugin-n": "^16.3.1",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-qunit": "^8.0.1",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^11.12.0",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-qunit": "^8.1.1",
"loader.js": "^4.7.0",
"prettier": "^3.0.3",
"qunit": "^2.20.0",
"prettier": "^3.2.5",
"qunit": "^2.20.1",
"qunit-dom": "^2.0.0",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-prettier": "^4.0.2",
"webpack": "^5.89.0"
"stylelint-prettier": "^4.1.0",
"webpack": "^5.90.3"
},
"peerDependencies": {
"ember-source": ">=3.20.0"
Expand Down
Loading

0 comments on commit 565bdf4

Please sign in to comment.