Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: embroider-build/addon-blueprint
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3d00b095df2717513eb6299c6c3aaa845b723d73
Choose a base ref
..
head repository: embroider-build/addon-blueprint
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 353be423ea4e47401e648d108873ade827cd9b3c
Choose a head ref
Showing with 75 additions and 37 deletions.
  1. +1 −1 .release-plan.json
  2. +2 −1 CHANGELOG.md
  3. +62 −26 files/__addonLocation__/.eslintrc.cjs
  4. +10 −9 files/__addonLocation__/package.json
2 changes: 1 addition & 1 deletion .release-plan.json
Original file line number Diff line number Diff line change
@@ -17,5 +17,5 @@
"pkgJSONPath": "./package.json"
}
},
"description": "## Release (2024-04-27)\n\n@embroider/addon-blueprint 2.17.0 (minor)\n\n#### :rocket: Enhancement\n* `@embroider/addon-blueprint`\n * [#282](https://github.com/embroider-build/addon-blueprint/pull/282) Upgrade the build dependencies in the addon's package.json ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### :memo: Documentation\n* `@embroider/addon-blueprint`\n * [#285](https://github.com/embroider-build/addon-blueprint/pull/285) docs: update install instructions to use pnpm and remove `skip-npm` ([@IgnaceMaes](https://github.com/IgnaceMaes))\n\n#### Committers: 2\n- Ignace Maes ([@IgnaceMaes](https://github.com/IgnaceMaes))\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n"
"description": "## Release (2024-04-30)\n\n@embroider/addon-blueprint 2.17.0 (minor)\n\n#### :rocket: Enhancement\n* `@embroider/addon-blueprint`\n * [#284](https://github.com/embroider-build/addon-blueprint/pull/284) Update the linting packages and the eslint config ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n * [#282](https://github.com/embroider-build/addon-blueprint/pull/282) Upgrade the build dependencies in the addon's package.json ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### :memo: Documentation\n* `@embroider/addon-blueprint`\n * [#285](https://github.com/embroider-build/addon-blueprint/pull/285) docs: update install instructions to use pnpm and remove `skip-npm` ([@IgnaceMaes](https://github.com/IgnaceMaes))\n\n#### Committers: 2\n- Ignace Maes ([@IgnaceMaes](https://github.com/IgnaceMaes))\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n"
}
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# @embroider/addon-blueprint Changelog

## Release (2024-04-27)
## Release (2024-04-30)

@embroider/addon-blueprint 2.17.0 (minor)

#### :rocket: Enhancement
* `@embroider/addon-blueprint`
* [#284](https://github.com/embroider-build/addon-blueprint/pull/284) Update the linting packages and the eslint config ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
* [#282](https://github.com/embroider-build/addon-blueprint/pull/282) Upgrade the build dependencies in the addon's package.json ([@NullVoxPopuli](https://github.com/NullVoxPopuli))

#### :memo: Documentation
88 changes: 62 additions & 26 deletions files/__addonLocation__/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -2,51 +2,83 @@

module.exports = {
root: true,
parser: '<%= typescript ? '@typescript-eslint/parser' : '@babel/eslint-parser' %>',
parserOptions: {
ecmaVersion: 'latest',<% if (!typescript) { %>
sourceType: 'module',
babelOptions: {
root: __dirname,
},<% } %>
},
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'<%= typescript ? ", '**/*.ts'" : '' %>],
env: { browser: true },
parser: '<%= typescript ? '@typescript-eslint/parser' : '@babel/eslint-parser' %>',
parserOptions: {
ecmaVersion: 'latest',<% if (!typescript) { %>
sourceType: 'module',
babelOptions: {
root: __dirname,
},<% } %>
},
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
},
},
<% if (typescript) { %> // 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
},
},
<% } else { %> // require relative imports use full extensions
{
files: ['src/**/*.{js,gjs}'],
<% } %> {
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
// node files
{
files: [
'./.eslintrc.cjs',
@@ -62,7 +94,11 @@ module.exports = {
node: true,
},
plugins: ['n'],
extends: ['plugin:n/recommended'],
extends: [
'eslint:recommended',
'plugin:n/recommended',
'plugin:prettier/recommended',
],
},
],
};
19 changes: 10 additions & 9 deletions files/__addonLocation__/package.json
Original file line number Diff line number Diff line change
@@ -67,20 +67,21 @@
"@types/ember__modifier": "^4.0.8",
"@types/ember__helper": "^4.0.5",
"@types/ember__routing": "^4.0.19",
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.14.0",<% } %>
"@typescript-eslint/eslint-plugin": "^7.7.1",
"@typescript-eslint/parser": "^7.7.1",<% } %>
"@rollup/plugin-babel": "^6.0.4",
"babel-plugin-ember-template-compilation": "^2.2.2",
"concurrently": "^8.2.2",
"ember-template-lint": "^5.13.0",
"eslint": "^8.56.0",
"ember-template-lint": "^6.0.0",<% if (packageManager === 'npm') { %>
"ember-eslint-parser": "^0.4.2",
<% } %>"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^11.12.0",
"eslint-plugin-ember": "^12.0.2",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-n": "^16.4.0",
"eslint-plugin-prettier": "^5.0.1",
"prettier": "^3.1.1",
"prettier-plugin-ember-template-tag": "^1.1.0",
"eslint-plugin-n": "^17.3.1",
"eslint-plugin-prettier": "^5.1.3",
"prettier": "^3.2.5",
"prettier-plugin-ember-template-tag": "^2.0.2",
"rollup": "^4.16.4"<% if (!isExistingMonorepo) { %>,
"rollup-plugin-copy": "^3.5.0"<% } %><% if (typescript) { %>,
"typescript": "^5.4.5"<% } %>