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.

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

Ember cli 3 28 #174

Merged
merged 5 commits into from
Dec 6, 2021
Merged
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
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
# misc
/coverage/
!.*
.*/
.eslintcache

# ember-try
29 changes: 14 additions & 15 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -24,21 +24,15 @@ module.exports = {
// node files
{
files: [
'.eslintrc.js',
'.prettierrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'index.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'tests/dummy/config/**/*.js',
],
excludedFiles: [
'addon/**',
'addon-test-support/**',
'app/**',
'tests/dummy/app/**',
'./.eslintrc.js',
'./.prettierrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./index.js',
'./testem.js',
'./blueprints/*/index.js',
'./config/**/*.js',
'./tests/dummy/config/**/*.js',
],
parserOptions: {
sourceType: 'script',
@@ -50,5 +44,10 @@ module.exports = {
plugins: ['node'],
extends: ['plugin:node/recommended'],
},
{
// Test files:
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
},
],
};
5 changes: 2 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -55,16 +55,15 @@ jobs:
fail-fast: true
matrix:
ember-try-scenario:
- ember-lts-3.16
- ember-lts-3.20
- ember-lts-3.24
- ember-release
# - ember-beta
# - ember-canary
- ember-classic
- ember-default-with-jquery
- embroider-safe
- embroider-optimized
# - embroider-safe
# - embroider-optimized

steps:
- uses: actions/checkout@v2
3 changes: 3 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -15,6 +15,8 @@
/.eslintrc.js
/.git/
/.gitignore
/.prettierignore
/.prettierrc.js
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
@@ -24,6 +26,7 @@
/ember-cli-build.js
/testem.js
/tests/
/yarn-error.log
/yarn.lock
.gitkeep

2 changes: 1 addition & 1 deletion .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -2,5 +2,5 @@

module.exports = {
plugins: ['ember-template-lint-plugin-prettier'],
extends: ['octane', 'ember-template-lint-plugin-prettier:recommended'],
extends: ['recommended', 'ember-template-lint-plugin-prettier:recommended'],
};
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed
- Bump Ember.js requirement to v3.20 or above
- Bump Ember CLI requirement to v3.20 or above

## [2.0.0] - 2021-09-14

### Changed
5 changes: 2 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -8,9 +8,8 @@

## Linting

* `npm run lint:hbs`
* `npm run lint:js`
* `npm run lint:js -- --fix`
* `npm run lint`
* `npm run lint:fix`

## Running tests

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@ Ember addon that helps you integrate [TinyMCE](https://www.tiny.cloud/docs/) edi
Compatibility
------------------------------------------------------------------------------

* Ember.js v3.16 or above
* Ember CLI v2.13 or above
* Ember.js v3.20 or above
* Ember CLI v3.20 or above
* Node.js v12 or above
* ember-auto-import >= 2

2 changes: 1 addition & 1 deletion addon/modifiers/editor.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Modifier from 'ember-modifier';
import { next } from '@ember/runloop';

import tinymce from 'tinymce/tinymce';
import tinymce from 'tinymce';

const DEFAULT_CONFIG = {
base_url: 'tinymce',
11 changes: 7 additions & 4 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -7,18 +7,18 @@ module.exports = async function () {
return {
scenarios: [
{
name: 'ember-lts-3.16',
name: 'ember-lts-3.20',
npm: {
devDependencies: {
'ember-source': '~3.16.0',
'ember-source': '~3.20.5',
},
},
},
{
name: 'ember-lts-3.20',
name: 'ember-lts-3.24',
npm: {
devDependencies: {
'ember-source': '~3.20.5',
'ember-source': '~3.24.3',
},
},
},
@@ -77,6 +77,9 @@ module.exports = async function () {
}),
},
npm: {
devDependencies: {
'ember-source': '~3.28.0',
},
ember: {
edition: 'classic',
},
24 changes: 14 additions & 10 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -43,15 +43,19 @@ module.exports = function (defaults) {
destDir: '/tests/tinymce',
});

app.import('node_modules/tinymce/tinymce.js', {
using: [{ transformation: 'cjs', as: 'tinymce/tinymce' }],
const { maybeEmbroider } = require('@embroider/test-setup');
return maybeEmbroider(app, {
extraPublicTrees: [
tinymceTest,
tinymceIcons,
tinymcePlugins,
tinymceSkins,
tinymceThemes,
],
skipBabel: [
{
package: 'qunit',
},
],
});

return app.toTree([
tinymceTest,
tinymceIcons,
tinymcePlugins,
tinymceSkins,
tinymceThemes,
]);
};
Loading