Merge pull request #154 from ror-community/staging

Merge staging to master: Dependabot updates

.env.dev

@@ -1,2 +1,3 @@
 API_URL=https://api.dev.ror.org
 SENTRY_DSN=https://1c334995f85448b1afa561c8ccf13791@sentry.io/1422597
+BASE_URL=https://dev.ror.org

.env.production

@@ -1,2 +1,3 @@
 API_URL=https://api.ror.org
 SENTRY_DSN=https://1c334995f85448b1afa561c8ccf13791@sentry.io/1422597
+BASE_URL=https://ror.org

.env.staging

@@ -1,2 +1,3 @@
 API_URL=https://api.staging.ror.org
 SENTRY_DSN=https://1c334995f85448b1afa561c8ccf13791@sentry.io/1422597
+BASE_URL=https://staging.ror.org

app/index.html

@@ -18,7 +18,7 @@
 
     <link rel="stylesheet" href="{{rootURL}}assets/vendor.css" type='text/css'>
 
-    <link rel="stylesheet" href="https://ror.org/css/hugo-ror.css?v4">
+    <link rel="stylesheet" href="{{content-for 'baseURL'}}/css/hugo-ror.css?v4">
     <link rel="stylesheet" href="{{rootURL}}assets/ror-app.css" type='text/css'>
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">

config/environment.js

@@ -2,7 +2,7 @@
 
 module.exports = function(environment) {
   const pkg = require('../package.json');
-  
+
   let ENV = {
     modulePrefix: 'ror-app',
     environment,
@@ -20,6 +20,7 @@ module.exports = function(environment) {
     },
 
     API_URL: process.env.API_URL || "https://api.ror.org",
+    BASE_URL: process.env.BASE_URL || null,
     SENTRY_DSN: process.env.SENTRY_DSN || null,
     VERSION: pkg.version,
     APP_NAME: pkg.name,

lib/base-url/index.js

@@ -0,0 +1,15 @@
+'use strict';
+
+module.exports = {
+  name: require('./package').name,
+
+  isDevelopingAddon() {
+    return true;
+  },
+  contentFor: function(type, config){
+    if (type === 'baseURL'){
+      return `${config.BASE_URL}`
+      ;
+    }
+  }
+};

lib/base-url/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "base-url",
+  "keywords": [
+    "ember-addon"
+  ]
+}

package.json

@@ -22,7 +22,7 @@
   },
   "devDependencies": {
     "@ember/jquery": "^0.5.2",
-    "@ember/optional-features": "^0.6.3",
+    "@ember/optional-features": "^2.0.0",
     "bootstrap": "^4.2.1",
     "broccoli-asset-rev": "^3.0.0",
     "ember-ajax": "^5.1.2",
@@ -37,7 +37,7 @@
     "ember-cli-flash": "^1.7.1",
     "ember-cli-htmlbars": "^6.1.1",
     "ember-cli-htmlbars-inline-precompile": "^1.0.3",
-    "ember-cli-inject-live-reload": "^1.8.2",
+    "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sass": "^8.0.1",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-string-helpers": "^2.0.0",
@@ -50,7 +50,7 @@
     "ember-maybe-import-regenerator": "^1.0.0",
     "ember-moment": "^10.0.0",
     "ember-qunit": "^3.4.1",
-    "ember-resolver": "^5.0.1",
+    "ember-resolver": "^9.0.1",
     "ember-source": "~3.7.0",
     "ember-truth-helpers": "^2.1.0",
     "ember-welcome-page": "^3.2.0",
@@ -64,7 +64,12 @@
     "node": "6.* || 8.* || >= 10.*"
   },
   "dependencies": {
-    "@sentry/browser": "^5.10.2",
+    "@sentry/browser": "^7.29.0",
     "@sentry/integrations": "^5.10.2"
+  },
+  "ember-addon": {
+    "paths": [
+      "lib/base-url"
+    ]
   }
 }