Merge pull request #582 from mkszepp/update-dependencies

Update dependencies & bring back green CI

.github/workflows/ci.yml

@@ -67,10 +67,12 @@ jobs:
           - ember-lts-4.8
           - ember-lts-4.12
           - ember-lts-5.4
+          - ember-lts-5.8
           - ember-release
           - ember-beta
           - ember-canary
-          - ember-modifier-4
+          - ember-modifier-3
+          - ember-test-helpers-2
           - ember-test-helpers-3
           - embroider-safe
           - embroider-optimized

.npmrc

@@ -0,0 +1,9 @@
+# Docs: https://pnpm.io/npmrc
+# https://github.com/emberjs/rfcs/pull/907
+
+# we don't want addons to be bad citizens of the ecosystem
+auto-install-peers=false
+
+# we want true isolation,
+# if a dependency is not declared, we want an error
+resolve-peers-from-workspace-root=false

addon/.eslintrc.js

@@ -2,20 +2,23 @@
 
 module.exports = {
   root: true,
-  parser: 'babel-eslint',
+  parser: '@babel/eslint-parser',
   parserOptions: {
-    ecmaVersion: 2018,
+    ecmaVersion: 'latest',
     sourceType: 'module',
-    ecmaFeatures: {
-      legacyDecorators: true,
+    requireConfigFile: false,
+    babelOptions: {
+      plugins: [['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }]],
     },
   },
   plugins: ['ember'],
   extends: ['eslint:recommended', 'plugin:ember/recommended', 'plugin:prettier/recommended'],
   env: {
     browser: true,
   },
-  rules: {},
+  rules: {
+    'ember/no-runloop': 0,
+  },
   overrides: [
     // node files
     {
@@ -35,7 +38,7 @@ module.exports = {
         browser: false,
         node: true,
       },
-      plugins: ['node'],
+      extends: ['plugin:n/recommended'],
     },
   ],
 };

addon/package.json

@@ -41,25 +41,31 @@
     "ember-source": "^3.28.0 || >= 4.0.0"
   },
   "dependencies": {
-    "@embroider/addon-shim": "^1.8.4"
+    "@embroider/addon-shim": "^1.8.9"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.12",
+    "@babel/core": "^7.25.2",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.20.7",
-    "@embroider/addon-dev": "^3.0.0",
-    "@rollup/plugin-babel": "^6.0.3",
-    "@babel/eslint-parser": "^7.11.0",
-    "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.4.0",
-    "eslint-plugin-ember": "^10.5.9",
-    "eslint-plugin-n": "^14.0.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-qunit": "^7.2.0",
-    "npm-run-all2": "^5.0.0",
-    "prettier": "^2.5.1",
-    "rollup": "^3.10.0",
-    "rollup-plugin-copy": "^3.4.0"
+    "@babel/plugin-proposal-decorators": "^7.24.7",
+    "@ember/test-helpers": "^4.0.4",
+    "@ember/test-waiters": "^3.1.0",
+    "@embroider/addon-dev": "^5.0.0",
+    "@glimmer/component": "^1.1.2",
+    "@rollup/plugin-babel": "^6.0.4",
+    "@babel/eslint-parser": "^7.25.1",
+    "ember-modifier": "^4.2.0",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-ember": "^12.2.0",
+    "eslint-plugin-n": "^17.10.3",
+    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-qunit": "^8.1.2",
+    "npm-run-all2": "^6.2.3",
+    "prettier": "^3.3.3",
+    "rollup": "^3.29.5",
+    "rollup-plugin-copy": "^3.5.0",
+    "typescript": "^5.6.2",
+    "webpack": "^5.94.0"
   },
   "engines": {
     "node": "14.* || >= 16"

addon/src/modifiers/sortable-group.js

@@ -789,7 +789,7 @@ export default class SortableGroupModifier extends Modifier {
         a.moveDirection,
         groupTopPos,
         groupLeftPos,
-        groupWidth
+        groupWidth,
       );
       position.ax = dragItemPos.x;
       position.ay = dragItemPos.y;
@@ -804,7 +804,7 @@ export default class SortableGroupModifier extends Modifier {
         b.moveDirection,
         groupTopPos,
         groupLeftPos,
-        groupWidth
+        groupWidth,
       );
       position.bx = dragItemPos.x;
       position.by = dragItemPos.y;

addon/src/modifiers/sortable-item.js

@@ -53,7 +53,7 @@ export default class SortableItemModifier extends Modifier {
       this._sortableGroup = this.sortableService.fetchGroup(this.groupName);
       assert(
         `No sortable group named ${this.groupName} found. Please check that the groups and items have the same groupName`,
-        this._sortableGroup !== undefined
+        this._sortableGroup !== undefined,
       );
     }
     return this._sortableGroup.groupModifier;
@@ -122,7 +122,7 @@ export default class SortableItemModifier extends Modifier {
           available: '2.2.6',
           enabled: '2.2.6',
         },
-      }
+      },
     );
 
     return this.groupDisabled || this.named.disabled || this.named.isDraggingDisabled || false;

addon/src/test-support/helpers/drag.js

@@ -113,6 +113,6 @@ export async function drag(mode, itemSelector, offsetFn, callbacks = {}) {
     () => {
       return !find('.is-dropping');
     },
-    { timeout: 2000 }
+    { timeout: 2000 },
   );
 }

docs/.ember-cli

@@ -1,9 +1,7 @@
 {
   /**
-    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.
+    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.
   */
-  "disableAnalytics": false
+  "isTypeScriptProject": false
 }

docs/.eslintignore

@@ -1,25 +1,14 @@
 # unconventional js
 /blueprints/*/files/
-/vendor/
 
 # compiled output
+/declarations/
 /dist/
-/tmp/
-
-# dependencies
-/bower_components/
-/node_modules/
 
 # misc
 /coverage/
 !.*
 .*/
-.eslintcache
 
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
-/npm-shrinkwrap.json.ember-try
-/package.json.ember-try
-/package-lock.json.ember-try
-/yarn.lock.ember-try

docs/.eslintrc.js

@@ -2,16 +2,23 @@
 
 module.exports = {
   root: true,
-  parser: 'babel-eslint',
+  parser: '@babel/eslint-parser',
   parserOptions: {
-    ecmaVersion: 2018,
+    ecmaVersion: 'latest',
     sourceType: 'module',
-    ecmaFeatures: {
-      legacyDecorators: true,
+    requireConfigFile: false,
+    babelOptions: {
+      plugins: [
+        ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
+      ],
     },
   },
   plugins: ['ember'],
-  extends: ['eslint:recommended', 'plugin:ember/recommended', 'plugin:prettier/recommended'],
+  extends: [
+    'eslint:recommended',
+    'plugin:ember/recommended',
+    'plugin:prettier/recommended',
+  ],
   env: {
     browser: true,
   },
@@ -23,6 +30,7 @@ module.exports = {
         './.eslintrc.js',
         './tests/.eslintrc.js',
         './.prettierrc.js',
+        './.stylelintrc.js',
         './.template-lintrc.js',
         './ember-cli-build.js',
         './index.js',
@@ -37,7 +45,7 @@ module.exports = {
         browser: false,
         node: true,
       },
-      plugins: ['node'],
+      extends: ['plugin:n/recommended'],
     },
     {
       // test files

docs/.gitignore

@@ -1,29 +1,25 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
 # compiled output
 /dist/
-/tmp/
+/declarations/
 
 # dependencies
-/bower_components/
 /node_modules/
 
 # misc
 /.env*
 /.pnp*
-/.sass-cache
 /.eslintcache
-/connect.lock
 /coverage/
-/libpeerconnection.log
 /npm-debug.log*
 /testem.log
 /yarn-error.log
 
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
 /npm-shrinkwrap.json.ember-try
 /package.json.ember-try
 /package-lock.json.ember-try
 /yarn.lock.ember-try
+
+# broccoli-debug
+/DEBUG/

docs/.prettierignore

@@ -1,25 +1,13 @@
 # unconventional js
 /blueprints/*/files/
-/vendor/
 
 # compiled output
 /dist/
-/tmp/
-
-# dependencies
-/bower_components/
-/node_modules/
 
 # misc
 /coverage/
 !.*
-.eslintcache
-.lint-todo/
+.*/
 
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
-/npm-shrinkwrap.json.ember-try
-/package.json.ember-try
-/package-lock.json.ember-try
-/yarn.lock.ember-try

docs/.prettierrc.js

@@ -1,6 +1,12 @@
 'use strict';
 
 module.exports = {
-  singleQuote: true,
-  printWidth: 120,
+  overrides: [
+    {
+      files: '*.{js,ts}',
+      options: {
+        singleQuote: true,
+      },
+    },
+  ],
 };

docs/.stylelintignore

@@ -0,0 +1,8 @@
+# unconventional files
+/blueprints/*/files/
+
+# compiled output
+/dist/
+
+# addons
+/.node_modules.ember-try/

docs/.stylelintrc.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
+};

docs/.watchmanconfig

@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp", "dist"]
+  "ignore_dirs": ["dist"]
 }

docs/app/index.html

@@ -1,11 +1,10 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta charset="utf-8">
     <title>Ember Sortable Demo</title>
-    <meta name="description" content="" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
 
     {{content-for "head"}}