🔨 Ember-Cli-Update + Some Fixes

cybertoothca · Mar 30, 2022 · 84268f7 · 84268f7
1 parent 32a0119
commit 84268f7
Show file tree

Hide file tree

Showing 6 changed files with 3,003 additions and 124 deletions.
diff --git a/.dependabot/config.yml b/.dependabot/config.yml
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: npm
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 15
+    target-branch: master
+    reviewers:
+      - nadnoslen
+    labels:
+      - dependencies
diff --git a/.tool-versions b/.tool-versions
@@ -1 +1 @@
-nodejs 10.16.3
+nodejs 10.24.1
diff --git a/package.json b/package.json
@@ -37,11 +37,14 @@
   },
   "scripts": {
     "build": "ember build",
+    "ember-cli-update": "ember-cli-update",
+    "ember-cli-update:codemods": "ember-cli-update --run-codemods",
     "lint:hbs": "ember-template-lint .",
     "lint:js": "eslint .",
     "start": "ember serve",
     "test": "ember test",
-    "test:all": "ember try:each"
+    "test:all": "ember try:each",
+    "update-browserslist": "npx browserslist@latest --update-db"
   },
   "dependencies": {
     "ember-cli-babel": "^7.13.2",
@@ -71,6 +74,7 @@
     "ember-cli-sri": "^2.1.1",
     "ember-cli-template-lint": "^2.0.0",
     "ember-cli-uglify": "^3.0.0",
+    "ember-cli-update": "0.54.6",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^2.1.1",

diff --git a/tests/dummy/app/styles/app.scss b/tests/dummy/app/styles/app.scss
@@ -1,13 +1,13 @@
-@import "../../../../node_modules/bootswatch/spacelab/variables";
-@import "../../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables";
-@import "../../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
-@import "../../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/theme";
-@import "../../../../node_modules/bootswatch/spacelab/bootswatch";
+@import "node_modules/bootswatch/spacelab/variables";
+@import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables";
+@import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
+@import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap/theme";
+@import "node_modules/bootswatch/spacelab/bootswatch";
 
-$fa-font-path: '/assets/font-awesome/fonts' !default;
+$fa-font-path: "/assets/font-awesome/fonts" !default;
 
-@import "../../../../node_modules/font-awesome/scss/variables";
-@import "../../../../node_modules/font-awesome/scss/font-awesome";
+@import "node_modules/font-awesome/scss/variables";
+@import "node_modules/font-awesome/scss/font-awesome";
 
 body {
   margin-bottom: 50%; // to allow scrolling beyond the end of the last example