ember-cli-update-action

ember-cli-update -p @kellyselden/node-template -b @kellyselden/node-template --to 6.11.0

Author: renovate[bot]

.mocharc.js

@@ -7,6 +7,9 @@ module.exports = {
   ignore: [
     'test/fixtures/**',
   ],
+<<<<<<< HEAD
 
   retries: 2,
+=======
+>>>>>>> d29cc16 (v6.9.0...v6.11.0)
 };

config/ember-cli-update.json

@@ -13,7 +13,7 @@
     },
     {
       "name": "@kellyselden/node-template",
-      "version": "6.9.0",
+      "version": "6.11.0",
       "blueprints": [
         {
           "name": "@kellyselden/node-template",

eslint.config.js

@@ -2,13 +2,12 @@
 
 const {
   defineConfig,
-  globalIgnores,
 } = require('eslint/config');
 
-const mocha = require('eslint-plugin-mocha');
-const saneNode = require('eslint-config-sane-node');
+const config = require('@kellyselden/eslint-config');
 
 module.exports = defineConfig([
+<<<<<<< HEAD
   saneNode,
   {
     files: [
@@ -32,4 +31,7 @@ module.exports = defineConfig([
   globalIgnores([
     'test/fixtures/',
   ]),
+=======
+  config,
+>>>>>>> d29cc16 (v6.9.0...v6.11.0)
 ]);

package-lock.json

@@ -37,11 +37,10 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
+    "@kellyselden/eslint-config": "^1.0.0",
     "@kellyselden/node-template": "6.11.0",
     "chai": "^4.5.0",
     "eslint": "^9.34.0",
-    "eslint-config-sane-node": "^6.0.0",
-    "eslint-plugin-mocha": "^10.5.0",
     "git-fixtures": "^9.0.0",
     "mocha": "^11.7.1",
     "mocha-helpers": "^10.2.1",

package.json

@@ -1,5 +1,14 @@
 {
   "extends": [
     "standard"
+  ],
+  "packageRules": [
+    {
+      "matchPackageNames": [
+        "standard-node-template",
+        "@kellyselden/node-template"
+      ],
+      "separateMinorPatch": true
+    }
   ]
 }