Skip to content

Commit

Permalink
chore(deps): update ember and dependencies
Browse files Browse the repository at this point in the history
BREAKING CHANGE: Drop support for Ember v3.
  • Loading branch information
anehx committed Apr 26, 2023
1 parent 95b87a3 commit fc26b0b
Show file tree
Hide file tree
Showing 32 changed files with 2,849 additions and 2,371 deletions.
4 changes: 2 additions & 2 deletions .ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"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.
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.
*/
"isTypeScriptProject": false
}
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use strict";

module.exports = {
extends: ["@adfinis-sygroup/eslint-config/ember-addon"],
extends: ["@adfinis/eslint-config/ember-addon"],
settings: {
"import/internal-regex": "^(ember-validated-form|dummy)/",
},
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 14
node-version: 18
cache: "yarn"

- name: Install Dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
token: ${{ secrets.GH_TOKEN }}
- uses: actions/setup-node@v3
with:
node-version: 14
node-version: 18
cache: "yarn"

- name: Install dependencies
run: yarn install

- name: Configure git
run: |
git config user.name "${GITHUB_ACTOR}"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- main

env:
NODE_VERSION: 14
NODE_VERSION: 18

concurrency:
group: test-${{ github.ref }}
Expand All @@ -23,7 +23,7 @@ jobs:

strategy:
matrix:
target: [js, hbs]
target: [js, hbs, css]

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -85,8 +85,8 @@ jobs:
fail-fast: false
matrix:
scenario:
- ember-lts-4.8
- ember-lts-4.4
- ember-lts-3.28
- ember-release
- ember-beta
- ember-canary
Expand Down
3 changes: 2 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@
/.gitignore
/.prettierignore
/.prettierrc.js
/.stylelintignore
/.stylelintrc.js
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/config/ember-try.js
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
Expand Down
8 changes: 8 additions & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# unconventional files
/blueprints/*/files/

# compiled output
/dist/

# addons
/.node_modules.ember-try/
5 changes: 5 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
"use strict";

module.exports = {
extends: ["stylelint-config-standard", "stylelint-prettier/recommended"],
};
6 changes: 6 additions & 0 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,10 @@
module.exports = {
plugins: ["ember-template-lint-plugin-prettier"],
extends: ["recommended", "ember-template-lint-plugin-prettier:recommended"],
overrides: [
{
files: ["tests/**/*"],
rules: { "require-input-label": false, "no-inline-styles": false },
},
],
};
6 changes: 3 additions & 3 deletions addon/components/validated-input/render.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@
@update={{@update}}
...attributes
/>
{{else if (and
(eq @type "date") (not-eq this.dateComponent this.inputComponent)
)}}
{{else if
(and (eq @type "date") (not-eq this.dateComponent this.inputComponent))
}}
<this.dateComponent
@autocomplete={{@autocomplete}}
@autofocus={{@autofocus}}
Expand Down
5 changes: 0 additions & 5 deletions config/environment.js

This file was deleted.

23 changes: 21 additions & 2 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

const EmberAddon = require("ember-cli/lib/broccoli/ember-addon");

const TEST_SCENARIO = process.env.TEST_SCENARIO ?? "THEME_DEFAULT";

// Configuration for test scenarios
const SCENARIO_CONFIGS = {
THEME_DEFAULT: { theme: null },
Expand Down Expand Up @@ -36,10 +38,10 @@ module.exports = function (defaults) {
defaults: {
hint: "dummy/components/permanent-custom-hint",
},
...(SCENARIO_CONFIGS[process.env.TEST_SCENARIO] ?? {}),
...(SCENARIO_CONFIGS[TEST_SCENARIO] ?? {}),
},
"@embroider/macros": {
setOwnConfig: { testScenario: process.env.TEST_SCENARIO },
setOwnConfig: { testScenario: TEST_SCENARIO },
},
});

Expand All @@ -57,5 +59,22 @@ module.exports = function (defaults) {
package: "qunit",
},
],
// https://github.com/embroider-build/embroider/issues/1322#issuecomment-1386857904
packageRules: [
{
package: "@ember-data/store",
addonModules: {
"-private.js": {
dependsOnModules: [],
},
"-private/system/core-store.js": {
dependsOnModules: [],
},
"-private/system/model/internal-model.js": {
dependsOnModules: [],
},
},
},
],
});
};
82 changes: 46 additions & 36 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,78 +20,87 @@
},
"scripts": {
"build": "ember build --environment=production",
"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": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint:css": "stylelint \"**/*.css\"",
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"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 --print-name \"lint\" \"test:*\"",
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
"test:ember": "ember test",
"test:ember-compatibility": "ember try:each",
"prepare": "husky install"
},
"dependencies": {
"@embroider/macros": "^1.8.3",
"@embroider/util": "^1.9.0",
"@embroider/macros": "^1.10.0",
"@embroider/util": "^1.10.0",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"ember-changeset": "^4.1.2",
"ember-changeset-validations": "^4.1.1",
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.1.1",
"ember-cli-htmlbars": "^6.2.0",
"ember-truth-helpers": "^3.1.1"
},
"devDependencies": {
"@adfinis-sygroup/eslint-config": "1.5.0",
"@adfinis/eslint-config": "2.0.0",
"@adfinis-sygroup/semantic-release-config": "3.4.0",
"@babel/eslint-parser": "7.21.3",
"@babel/plugin-proposal-decorators": "7.21.0",
"@ember/optional-features": "2.0.0",
"@ember/test-helpers": "2.8.1",
"@embroider/test-setup": "1.8.3",
"@ember/string": "3.0.1",
"@ember/test-helpers": "2.9.3",
"@embroider/test-setup": "2.1.1",
"@fortawesome/ember-fontawesome": "0.4.1",
"@fortawesome/free-solid-svg-icons": "6.2.0",
"babel-eslint": "10.1.0",
"@fortawesome/free-solid-svg-icons": "6.4.0",
"broccoli-asset-rev": "3.0.0",
"ember-auto-import": "2.4.3",
"ember-cli": "4.8.0",
"ember-cli-addon-docs": "5.0.0",
"concurrently": "8.0.1",
"ember-auto-import": "2.6.3",
"ember-cli": "4.12.1",
"ember-cli-addon-docs": "5.2.0",
"ember-cli-dependency-checker": "3.3.1",
"ember-cli-deploy": "1.0.2",
"ember-cli-deploy": "2.0.0",
"ember-cli-deploy-build": "2.0.0",
"ember-cli-deploy-git": "1.3.4",
"ember-cli-deploy-git-ci": "1.0.1",
"ember-cli-inject-live-reload": "2.1.0",
"ember-cli-sri": "2.1.1",
"ember-cli-terser": "4.0.2",
"ember-cli-test-loader": "3.0.0",
"ember-concurrency": "2.3.7",
"ember-data": "4.4.1",
"ember-disable-prototype-extensions": "1.1.3",
"ember-flatpickr": "3.2.3",
"ember-concurrency": "3.0.0",
"ember-data": "4.12.0",
"ember-flatpickr": "4.0.0",
"ember-load-initializers": "2.1.2",
"ember-qunit": "6.0.0",
"ember-resolver": "8.0.3",
"ember-source": "4.8.0",
"ember-qunit": "6.2.0",
"ember-resolver": "10.0.0",
"ember-source": "4.12.0",
"ember-source-channel-url": "3.0.0",
"ember-template-lint": "4.17.0",
"ember-template-lint-plugin-prettier": "4.0.0",
"ember-template-lint": "5.7.2",
"ember-template-lint-plugin-prettier": "4.1.0",
"ember-try": "2.0.0",
"eslint": "7.32.0",
"eslint-config-prettier": "8.5.0",
"eslint-plugin-ember": "11.2.0",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-node": "11.1.0",
"eslint": "8.39.0",
"eslint-config-prettier": "8.8.0",
"eslint-plugin-ember": "11.5.2",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-n": "15.7.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-qunit": "7.3.1",
"eslint-plugin-qunit": "7.3.4",
"husky": "8.0.3",
"lint-staged": "13.0.3",
"lint-staged": "13.2.1",
"loader.js": "4.7.0",
"npm-run-all": "4.1.5",
"prettier": "2.7.1",
"qunit": "2.19.3",
"prettier": "2.8.8",
"qunit": "2.19.4",
"qunit-dom": "2.0.0",
"webpack": "5.74.0"
"stylelint": "15.6.0",
"stylelint-config-standard": "33.0.0",
"stylelint-prettier": "3.0.0",
"webpack": "5.80.0"
},
"peerDependencies": {
"ember-source": "^4.0.0"
},
"engines": {
"node": "14.* || 16.* || >= 18"
Expand All @@ -109,7 +118,8 @@
"lint-staged": {
"*.js": "eslint --cache --fix",
"*.hbs": "ember-template-lint --fix",
"*.{scss,graphql,json,md,yml}": "prettier --write"
"*.css": "stylelint --fix",
"*.{json,md,yml}": "prettier --write"
},
"commitlint": {
"extends": [
Expand Down
6 changes: 3 additions & 3 deletions tests/dummy/app/components/x-custom-render.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<this.checkboxComponent />
{{else if (eq @type "textarea")}}
<this.textareaComponent />
{{else if (and
(eq @type "date") (not-eq this.dateComponent this.inputComponent)
)}}
{{else if
(and (eq @type "date") (not-eq this.dateComponent this.inputComponent))
}}
<this.dateComponent />
{{else}}
<this.inputComponent />
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/styles/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@

body {
font-family: "Source Sans Pro", sans-serif;
background-color: rgb(255, 255, 255);
background-color: rgb(255 255 255);
}
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.8.0",
"version": "4.12.1",
"blueprints": [
{
"name": "addon",
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ module.exports = function (environment) {
locationType: "history",
historySupportMiddleware: true,
EmberENV: {
EXTEND_PROTOTYPES: false,
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
Expand Down
Loading

0 comments on commit fc26b0b

Please sign in to comment.