Skip to content
This repository was archived by the owner on Oct 9, 2024. It is now read-only.

Drop support for node < 18 and ember < 4.8 #892

Merged
merged 3 commits into from
Feb 21, 2024
Merged
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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
cache: yarn
- name: Install Dependencies
run: yarn install --frozen-lockfile
Expand All @@ -40,7 +40,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
cache: yarn
- name: Install Dependencies
run: yarn install --no-lockfile
Expand All @@ -57,8 +57,8 @@ jobs:
fail-fast: false
matrix:
try-scenario:
- ember-lts-4.4
- ember-lts-4.8
- ember-lts-4.12
- ember-release
- ember-beta
- ember-canary
Expand All @@ -70,7 +70,7 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
cache: yarn
- name: Install Dependencies
run: yarn install --frozen-lockfile
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# compiled output
/dist/
/declarations/

# dependencies
/node_modules/
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@

## 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
* `yarn test` – Runs the test suite on the current Ember version
* `yarn test:ember --server` – Runs the test suite in "watch mode"
* `yarn test:ember-compatibility` – Runs the test suite against multiple Ember versions

## Running the dummy application

* `ember serve`
* `yarn 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/).
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ This project is packaged as an [EmberCLI](http://www.ember-cli.com) addon.

## Compatibility

* Ember.js v4.4 or above
* Ember CLI v4.4 or above
* Node.js v16 or above
* Ember.js v4.8 or above
* Ember CLI v4.8 or above
* Node.js v18 or above

For Ember <= 3.12 use version 0.7.0 of ember-prism.

Expand Down
2 changes: 1 addition & 1 deletion addon/components/code-inline.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default class CodeInlineComponent extends Component {

assert(
"ember-prism's <CodeBlock/> and <CodeInline/> components require a `code` parameter to be passed in.",
code !== undefined
code !== undefined,
);
if (Prism?.plugins?.NormalizeWhitespace) {
return Prism.plugins.NormalizeWhitespace.normalize(code);
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ module.exports = {
return {
import: ['prism.js', this.theme].concat(
this.components,
this.plugins
this.plugins,
),
};
},
Expand Down
52 changes: 26 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,61 +39,61 @@
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"@babel/core": "^7.23.7",
"@ember/render-modifiers": "^2.0.0",
"ember-auto-import": "^2.6.3",
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.2.0",
"ember-auto-import": "^2.7.2",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-node-assets": "^0.2.2",
"prismjs": "^1.22.0",
"prismjs-glimmer": "^1.1.1"
},
"devDependencies": {
"@babel/eslint-parser": "^7.22.5",
"@babel/plugin-proposal-decorators": "^7.22.5",
"@babel/eslint-parser": "^7.23.3",
"@babel/plugin-proposal-decorators": "^7.23.7",
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.1.0",
"@embroider/test-setup": "^3.0.1",
"@ember/test-helpers": "^3.2.1",
"@embroider/test-setup": "^3.0.3",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.2.0",
"ember-cli": "~5.1.0",
"concurrently": "^8.2.2",
"ember-cli": "~5.6.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-load-initializers": "^2.1.2",
"ember-page-title": "^8.0.0",
"ember-qunit": "^8.0.1",
"ember-resolver": "^11.0.0",
"ember-page-title": "^8.2.0",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.6.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.11.0",
"ember-template-lint": "^5.13.0",
"ember-try": "^3.0.0",
"eslint": "^8.43.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-ember": "^11.9.0",
"eslint-plugin-n": "^16.0.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^8.0.0",
"eslint": "^8.56.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.0.1",
"loader.js": "^4.7.0",
"prettier": "^2.8.8",
"qunit": "^2.19.4",
"prettier": "^3.2.4",
"qunit": "^2.20.0",
"qunit-dom": "^3.0.0",
"release-it": "^15.5.0",
"release-it-lerna-changelog": "^5.0.0",
"stylelint": "^15.9.0",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-prettier": "^3.0.0",
"webpack": "^5.88.1"
"stylelint-prettier": "^4.1.0",
"webpack": "^5.89.0"
},
"peerDependencies": {
"ember-source": "^4.0.0"
},
"engines": {
"node": "16.* || >= 18"
"node": ">= 18"
},
"publishConfig": {
"registry": "https://registry.npmjs.org"
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/code-block-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module('Acceptance | code block', function (hooks) {

assert.deepEqual(
find('pre code.can-you-dig-it').innerHTML.split('\n').length,
3
3,
);
});
});
2 changes: 1 addition & 1 deletion tests/dummy/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "5.1.0",
"version": "5.6.0",
"blueprints": [
{
"name": "addon",
Expand Down
8 changes: 4 additions & 4 deletions tests/dummy/config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ module.exports = async function () {
useYarn: true,
scenarios: [
{
name: 'ember-lts-4.4',
name: 'ember-lts-4.8',
npm: {
devDependencies: {
'ember-source': '~4.4.0',
'ember-source': '~4.8.0',
},
},
},
{
name: 'ember-lts-4.8',
name: 'ember-lts-4.12',
npm: {
devDependencies: {
'ember-source': '~4.8.0',
'ember-source': '~4.12.0',
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion tests/helpers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
setupTest as upstreamSetupTest,
} from 'ember-qunit';

// This file exists to provide wrappers around ember-qunit's / ember-mocha's
// This file exists to provide wrappers around ember-qunit's
// test setup functions. This way, you can easily extend the setup that is
// needed per test type.

Expand Down
10 changes: 10 additions & 0 deletions tsconfig.declarations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"declarationDir": "declarations",
"emitDeclarationOnly": true,
"noEmit": false,
"rootDir": "."
},
"include": ["addon", "addon-test-support"]
}
Loading