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

Update ember-cli to v4.8 - drops Node 12 #378

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
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
9 changes: 3 additions & 6 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: 14
node-version: 14.x
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: 14
node-version: 14.x
cache: yarn
- name: Install Dependencies
run: yarn install --no-lockfile
Expand All @@ -57,9 +57,6 @@ jobs:
fail-fast: false
matrix:
try-scenario:
- ember-lts-3.16
- ember-lts-3.20
- ember-lts-3.24
- ember-lts-3.28
- ember-4
- ember-lts-4.4
Expand All @@ -77,7 +74,7 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 14
node-version: 14.x
cache: yarn
- name: Install Dependencies
run: yarn install --frozen-lockfile
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ this.store.query('user', { filter: { pets: { type: /cats|dogs/ } } }); // you ne

You can use `queryRecord` to return only one record. See the [guides](https://guides.emberjs.com/v2.0.0/models/finding-records/#toc_querying-for-a-single-record) for an example.

#### Import & Export
#### Import & Export

The addon ships with utility functions that enables export and import of you LocalStorage data.
You have to add `fileExport` option to the `environment.js`:
Expand Down
35 changes: 0 additions & 35 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,6 @@ module.exports = async function () {
return {
useYarn: true,
scenarios: [
{
name: 'ember-lts-3.16',
npm: {
devDependencies: {
'ember-data': '~3.16.0',
'ember-source': '~3.16.0',
},
},
},
{
name: 'ember-lts-3.20',
npm: {
devDependencies: {
'ember-data': '~3.20.0',
'ember-source': '~3.20.5',
},
},
},
{
name: 'ember-lts-3.24',
npm: {
devDependencies: {
'ember-data': '~3.24.0',
'ember-source': '~3.24.3',
},
},
},
{
name: 'ember-lts-3.28',
npm: {
Expand All @@ -47,7 +20,6 @@ module.exports = async function () {
name: 'ember-4',
npm: {
devDependencies: {
'ember-auto-import': '^2.2.0',
'ember-data': '~4.0.0',
'ember-source': '~4.0.0',
},
Expand All @@ -57,7 +29,6 @@ module.exports = async function () {
name: 'ember-lts-4.4',
npm: {
devDependencies: {
'ember-auto-import': '^2.2.0',
'ember-data': '~4.4.0',
'ember-source': '~4.4.0',
},
Expand All @@ -67,7 +38,6 @@ module.exports = async function () {
name: 'ember-lts-4.8',
npm: {
devDependencies: {
'ember-auto-import': '^2.2.0',
'ember-data': '~4.8.0',
'ember-source': '~4.8.0',
},
Expand All @@ -77,7 +47,6 @@ module.exports = async function () {
name: 'ember-4.11',
npm: {
devDependencies: {
'ember-auto-import': '^2.2.0',
'ember-data': '~4.11.0',
'ember-source': '~4.11.0',
},
Expand All @@ -87,7 +56,6 @@ module.exports = async function () {
name: 'ember-lts-4.12',
npm: {
devDependencies: {
'ember-auto-import': '^2.2.0',
'ember-data': '~4.12.0',
'ember-source': '~4.12.0',
},
Expand All @@ -97,7 +65,6 @@ module.exports = async function () {
name: 'ember-release',
npm: {
devDependencies: {
'ember-auto-import': '^2.2.0',
'ember-data': 'latest',
'ember-source': await getChannelURL('release'),
'ember-resolver': '10.0.0',
Expand All @@ -109,7 +76,6 @@ module.exports = async function () {
name: 'ember-beta',
npm: {
devDependencies: {
'ember-auto-import': '^2.2.0',
'ember-data': 'beta',
'ember-source': await getChannelURL('beta'),
'ember-resolver': '10.0.0',
Expand All @@ -121,7 +87,6 @@ module.exports = async function () {
name: 'ember-canary',
npm: {
devDependencies: {
'ember-auto-import': '^2.2.0',
'ember-data': 'canary',
'ember-source': await getChannelURL('canary'),
'ember-resolver': '10.0.0',
Expand Down
2 changes: 1 addition & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function (defaults) {
let app = new EmberAddon(defaults, {
const app = new EmberAddon(defaults, {
// Add options here
sassOptions: {
includePaths: ['node_modules'],
Expand Down
39 changes: 19 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
},
"scripts": {
"build": "ember build --environment=production",
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
"lint": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
"lint:fix": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:*: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": "npm-run-all lint test:*",
"test": "npm-run-all --print-name \"lint\" \"test:*\"",
"test:ember": "ember test",
"test:ember-compatibility": "ember try:each"
},
Expand All @@ -49,50 +49,49 @@
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/render-modifiers": "^2.0.4",
"@ember/test-helpers": "^2.7.0",
"@embroider/test-setup": "^1.6.0",
"@ember/test-helpers": "^2.8.1",
"@embroider/test-setup": "^1.8.3",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^2.4.1",
"ember-cli": "~4.4.1",
"ember-auto-import": "^2.4.3",
"ember-cli": "~4.8.1",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-htmlbars": "^6.0.1",
"ember-cli-htmlbars": "^6.1.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sass": "^10.0.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-data": "~4.4.0",
"ember-data": "~4.8.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.1",
"ember-load-initializers": "^2.1.2",
"ember-qunit": "^5.1.5",
"ember-qunit": "^6.0.0",
"ember-resolver": "^8.0.3",
"ember-source": "~4.4.0",
"ember-source": "~4.8.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^4.8.0",
"ember-template-lint": "^4.16.1",
"ember-try": "^2.0.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "^10.6.1",
"eslint-plugin-ember": "^11.1.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-qunit": "^7.2.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.1",
"highlight.js": "^11.6.0",
"inuitcss": "^6.0.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.6.2",
"qunit": "^2.19.1",
"prettier": "^2.7.1",
"qunit": "^2.19.2",
"qunit-dom": "^2.0.0",
"release-it": "^14.2.1",
"release-it-lerna-changelog": "^3.1.0",
"sass": "^1.42.1",
"webpack": "^5.72.1"
"webpack": "^5.74.0"
},
"engines": {
"node": "12.* || 14.* || >= 16"
"node": "14.* || 16.* || >= 18"
},
"publishConfig": {
"registry": "https://registry.npmjs.org"
Expand Down
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": "4.4.1",
"version": "4.8.1",
"blueprints": [
{
"name": "addon",
Expand Down
6 changes: 1 addition & 5 deletions tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

module.exports = function (environment) {
let ENV = {
const ENV = {
modulePrefix: 'dummy',
environment,
rootURL: '/',
Expand All @@ -11,10 +11,6 @@ module.exports = function (environment) {
// Here you can enable experimental features on an ember canary build
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
},
EXTEND_PROTOTYPES: {
// Prevent Ember Data from overriding Date.parse.
Date: false,
},
},

APP: {
Expand Down
Loading
Loading