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 dependencies & ember-cli to 5.10 #932

Merged
merged 9 commits into from
Jul 31, 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
41 changes: 20 additions & 21 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v3
with:
version: 8

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18.x
cache: pnpm
cache: 'pnpm'

- name: 'Install dependencies'
run: pnpm install --frozen-lockfile
Expand All @@ -40,17 +40,17 @@ jobs:
needs: lint

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v3
with:
version: 8

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18.x
cache: pnpm
cache: 'pnpm'

- name: Install Dependencies
run: pnpm install --frozen-lockfile
Expand All @@ -64,17 +64,17 @@ jobs:
needs: lint

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v3
with:
version: 8

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18.x
cache: pnpm
cache: 'pnpm'

- name: Install Dependencies
run: pnpm install --frozen-lockfile
Expand All @@ -88,17 +88,16 @@ jobs:
needs: lint

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v3
with:
version: 8

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18.x
args: "--no-lockfile"
cache: pnpm
cache: 'pnpm'

- name: Install Dependencies
run: pnpm install --frozen-lockfile
Expand Down Expand Up @@ -129,17 +128,17 @@ jobs:
- embroider-optimized

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v3
with:
version: 8

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18.x
cache: pnpm
cache: 'pnpm'

- name: Install Dependencies
run: pnpm install --frozen-lockfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push-dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: 18
cache: pnpm
cache: 'pnpm'
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- uses: kategengler/[email protected]
Expand Down
5 changes: 1 addition & 4 deletions config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,13 @@
"packages": [
{
"name": "@embroider/addon-blueprint",
"version": "2.16.0",
"version": "2.17.0",
"blueprints": [
{
"name": "@embroider/addon-blueprint",
"isBaseBlueprint": true,
"options": [
"--pnpm",
"--addon-location=ember-basic-dropdown",
"--test-app-location=test-app",
"--release-it",
"--typescript"
]
}
Expand Down
2 changes: 1 addition & 1 deletion docs/app/styles/_utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

// My own placeholders
%clearfix {
display: block;
&::after {
visibility: hidden;
display: block;
Expand All @@ -17,7 +18,6 @@
clear: both;
height: 0;
}
display: block;
}
%wrapper {
max-width: 1024px;
Expand Down
2 changes: 1 addition & 1 deletion docs/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.9.0",
"version": "5.10.0",
"blueprints": [
{
"name": "app",
Expand Down
46 changes: 23 additions & 23 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
"test:ember-compatibility": "ember try:each"
},
"devDependencies": {
"@babel/core": "^7.24.7",
"@babel/eslint-parser": "^7.24.7",
"@babel/core": "^7.25.2",
"@babel/eslint-parser": "^7.25.1",
"@babel/plugin-proposal-decorators": "^7.24.7",
"@ember/optional-features": "^2.1.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.3.0",
"@ember/string": "^4.0.0",
"@ember/test-helpers": "^3.3.1",
"@embroider/test-setup": "^4.0.0",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
Expand All @@ -56,7 +56,7 @@
"@types/ember__destroyable": "^4.0.5",
"@types/ember__engine": "^4.0.11",
"@types/ember__error": "^4.0.6",
"@types/ember__helper": "^4.0.7",
"@types/ember__helper": "^4.0.8",
"@types/ember__modifier": "^4.0.9",
"@types/ember__object": "^4.0.12",
"@types/ember__owner": "^4.0.9",
Expand All @@ -70,12 +70,12 @@
"@types/ember__utils": "^4.0.7",
"@types/qunit": "^2.19.10",
"@types/rsvp": "^4.0.9",
"@typescript-eslint/eslint-plugin": "^7.13.1",
"@typescript-eslint/parser": "^7.13.1",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.2.2",
"ember-auto-import": "^2.7.3",
"ember-cli": "~5.9.0",
"ember-auto-import": "^2.7.4",
"ember-cli": "~5.10.0",
"ember-cli-app-version": "^7.0.0",
"ember-cli-babel": "^8.2.0",
"ember-cli-clean-css": "^3.0.0",
Expand All @@ -91,36 +91,36 @@
"ember-fetch": "^8.1.2",
"ember-lifeline": "^7.0.0",
"ember-load-initializers": "^2.1.2",
"ember-modifier": "^4.1.0",
"ember-modifier": "^4.2.0",
"ember-page-title": "^8.2.3",
"ember-prism": "^0.13.0",
"ember-prism": "^1.0.0",
"ember-qunit": "^8.1.0",
"ember-resolver": "^12.0.1",
"ember-source": "~5.9.0",
"ember-source": "~5.10.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^6.0.0",
"ember-try": "^3.0.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^12.1.1",
"eslint-plugin-n": "^17.9.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-n": "^17.10.1",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-qunit": "^8.1.1",
"loader.js": "^4.7.0",
"prember": "~2.0.0",
"prember": "~2.1.0",
"prember-crawler": "^1.0.0",
"prettier": "^3.3.2",
"prettier": "^3.3.3",
"prettier-plugin-ember-template-tag": "^2.0.2",
"qunit": "^2.21.0",
"qunit-dom": "^3.1.2",
"qunit": "^2.21.1",
"qunit-dom": "^3.2.0",
"rsvp": "^4.8.5",
"sass": "^1.77.6",
"stylelint": "^16.6.1",
"sass": "^1.77.8",
"stylelint": "^16.8.1",
"stylelint-config-standard": "^36.0.1",
"stylelint-prettier": "^5.0.0",
"stylelint-prettier": "^5.0.2",
"tracked-built-ins": "^3.3.0",
"typescript": "^5.5.2",
"webpack": "^5.92.1"
"typescript": "^5.5.4",
"webpack": "^5.93.0"
},
"engines": {
"node": ">= 18"
Expand Down
2 changes: 1 addition & 1 deletion docs/tests/helpers/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function setupApplicationTest(hooks: NestedHooks, options?: SetupTestOptions) {
// This is also a good place to call test setup functions coming
// from other addons:
//
// setupIntl(hooks); // ember-intl
// setupIntl(hooks, 'en-us'); // ember-intl
// setupMirage(hooks); // ember-cli-mirage
}

Expand Down
79 changes: 61 additions & 18 deletions ember-basic-dropdown/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,76 @@

module.exports = {
root: true,
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 'latest',
},
plugins: ['ember', 'import'],
extends: [
'eslint:recommended',
'plugin:ember/recommended',
'plugin:prettier/recommended',
],
env: {
browser: true,
},
rules: {},
// Only use overrides
// https://github.com/ember-cli/eslint-plugin-ember?tab=readme-ov-file#gtsgjs
overrides: [
{
files: ['**/*.js', '**/*.ts'],
env: { browser: true },
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 'latest',
},
plugins: ['ember', 'import'],
extends: [
'eslint:recommended',
'plugin:ember/recommended',
'plugin:prettier/recommended',
],
rules: {
// require relative imports use full extensions
'import/extensions': ['error', 'always', { ignorePackages: true }],
// Add any custom rules here
},
},
// ts files
{
files: ['**/*.ts', '**/*.gts'],
files: ['**/*.ts'],
extends: [
'eslint:recommended',
'plugin:ember/recommended',
'plugin:@typescript-eslint/eslint-recommended',
'plugin:@typescript-eslint/recommended',
'plugin:prettier/recommended',
],
rules: {
// require relative imports use full extensions
'import/extensions': ['error', 'always', { ignorePackages: true }],
// Add any custom rules here
},
},
// require relative imports use full extensions
{
files: ['src/**/*.{js,ts,gjs,gts}'],
files: ['**/*.gts'],
parser: 'ember-eslint-parser',
plugins: ['ember', 'import'],
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/eslint-recommended',
'plugin:@typescript-eslint/recommended',
'plugin:ember/recommended',
'plugin:ember/recommended-gts',
'plugin:prettier/recommended',
],
rules: {
// require relative imports use full extensions
'import/extensions': ['error', 'always', { ignorePackages: true }],
// Add any custom rules here
},
},
{
files: ['**/*.gjs'],
parser: 'ember-eslint-parser',
plugins: ['ember', 'import'],
extends: [
'eslint:recommended',
'plugin:ember/recommended',
'plugin:ember/recommended-gjs',
'plugin:prettier/recommended',
],
rules: {
// require relative imports use full extensions
'import/extensions': ['error', 'always', { ignorePackages: true }],
// Add any custom rules here
},
},
// node files
Expand All @@ -51,7 +90,11 @@ module.exports = {
node: true,
},
plugins: ['n'],
extends: ['plugin:n/recommended'],
extends: [
'eslint:recommended',
'plugin:n/recommended',
'plugin:prettier/recommended',
],
},
],
};
Loading