Skip to content

Commit 146bcc3

Browse files
committed
sitewide: replace RACK_ENV with JEKYLL_ENV
Signed-off-by: Ruby Iris Juric <[email protected]>
1 parent c3a807f commit 146bcc3

File tree

6 files changed

+9
-10
lines changed

6 files changed

+9
-10
lines changed

.env.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ ALGOLIA_SEARCH_KEY=
88
ALGOLIA_PREFIX=devsite-dev-
99
GOOGLE_ANALYTICS=
1010
ROLLBAR_CLIENT_TOKEN=
11-
RACK_ENV=development
11+
JEKYLL_ENV=development
1212
SKIP_DOCS=false

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
env:
2323
URL: http://developer.rebble.io
2424
HTTPS_URL: https://developer.rebble.io
25-
RACK_ENV: production
25+
JEKYLL_ENV: production
2626
SKIP_DOCS: true # TODO: setup docs generation
2727

2828
- name: Upload artifact

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ENV URL=http://developer.rebble.io
2020
ENV HTTPS_URL=https://developer.rebble.io
2121
ENV EXTERNAL_SERVER=https://example.com
2222
ENV SKIP_DOCS=true
23-
ENV RACK_ENV=production
23+
ENV JEKYLL_ENV=production
2424

2525
EXPOSE 4000
2626

plugins/generator_minify_js.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ def initialize(_)
2424
end
2525

2626
def generate(site)
27-
return if site.config['rack_env'] == 'development'
27+
return if Jekyll.env == 'development'
28+
2829
@site = site
2930
@tmp_dir = File.join(site.source, '../tmp/')
3031
@js_dir = 'assets/js/'

source/_data/env.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,5 @@
4040
env: SDK_BUCKET
4141
- config: rollbar_client_token
4242
env: ROLLBAR_CLIENT_TOKEN
43-
- config: rack_env
44-
env: RACK_ENV
4543
- config: skip_docs
4644
env: SKIP_DOCS

source/_layouts/master.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
<noscript>
3434
<link rel="stylesheet" type="text/css" href="{{ site.asset_path }}/css/noscript.css">
3535
</noscript>
36-
{% unless site.rack_env == 'development' %}
36+
{% unless jekyll.environment == 'development' %}
3737
<script type="text/javascript" >
3838
var _rollbarConfig = {
3939
accessToken: '{{ site.rollbar_client_token }}',
4040
captureUncaught: true,
4141
payload: {
42-
environment: '{{ site.rack_env }}'
42+
environment: '{{ jekyll.environment }}'
4343
}
4444
};
4545
!function(a,b){function c(b){this.shimId=++h,this.notifier=null,this.parentShim=b,this.logger=function(){},a.console&&void 0===a.console.shimId&&(this.logger=a.console.log)}function d(b,c,d){a._rollbarWrappedError&&(d[4]||(d[4]=a._rollbarWrappedError),d[5]||(d[5]=a._rollbarWrappedError._rollbarContext),a._rollbarWrappedError=null),b.uncaughtError.apply(b,d),c&&c.apply(a,d)}function e(b){var d=c;return g(function(){if(this.notifier)return this.notifier[b].apply(this.notifier,arguments);var c=this,e="scope"===b;e&&(c=new d(this));var f=Array.prototype.slice.call(arguments,0),g={shim:c,method:b,args:f,ts:new Date};return a._rollbarShimQueue.push(g),e?c:void 0})}function f(a,b){if(b.hasOwnProperty&&b.hasOwnProperty("addEventListener")){var c=b.addEventListener;b.addEventListener=function(b,d,e){c.call(this,b,a.wrap(d),e)};var d=b.removeEventListener;b.removeEventListener=function(a,b,c){d.call(this,a,b&&b._wrapped?b._wrapped:b,c)}}}function g(a,b){return b=b||this.logger,function(){try{return a.apply(this,arguments)}catch(c){b("Rollbar internal error:",c)}}}var h=0;c.init=function(a,b){var e=b.globalAlias||"Rollbar";if("object"==typeof a[e])return a[e];a._rollbarShimQueue=[],a._rollbarWrappedError=null,b=b||{};var h=new c;return g(function(){if(h.configure(b),b.captureUncaught){var c=a.onerror;a.onerror=function(){var a=Array.prototype.slice.call(arguments,0);d(h,c,a)};var g,i,j="EventTarget,Window,Node,ApplicationCache,AudioTrackList,ChannelMergerNode,CryptoOperation,EventSource,FileReader,HTMLUnknownElement,IDBDatabase,IDBRequest,IDBTransaction,KeyOperation,MediaController,MessagePort,ModalWindow,Notification,SVGElementInstance,Screen,TextTrack,TextTrackCue,TextTrackList,WebSocket,WebSocketWorker,Worker,XMLHttpRequest,XMLHttpRequestEventTarget,XMLHttpRequestUpload".split(",");for(g=0;g<j.length;++g)i=j[g],a[i]&&a[i].prototype&&f(h,a[i].prototype)}return a[e]=h,h},h.logger)()},c.prototype.loadFull=function(a,b,c,d,e){var f=g(function(){var a=b.createElement("script"),e=b.getElementsByTagName("script")[0];a.src=d.rollbarJsUrl,a.async=!c,a.onload=h,e.parentNode.insertBefore(a,e)},this.logger),h=g(function(){var b;if(void 0===a._rollbarPayloadQueue){var c,d,f,g;for(b=new Error("rollbar.js did not load");c=a._rollbarShimQueue.shift();)for(f=c.args,g=0;g<f.length;++g)if(d=f[g],"function"==typeof d){d(b);break}}"function"==typeof e&&e(b)},this.logger);g(function(){c?f():a.addEventListener?a.addEventListener("load",f,!1):a.attachEvent("onload",f)},this.logger)()},c.prototype.wrap=function(b,c){try{var d;if(d="function"==typeof c?c:function(){return c||{}},"function"!=typeof b)return b;if(b._isWrap)return b;if(!b._wrapped){b._wrapped=function(){try{return b.apply(this,arguments)}catch(c){throw c._rollbarContext=d(),c._rollbarContext._wrappedSource=b.toString(),a._rollbarWrappedError=c,c}},b._wrapped._isWrap=!0;for(var e in b)b.hasOwnProperty(e)&&(b._wrapped[e]=b[e])}return b._wrapped}catch(f){return b}};for(var i="log,debug,info,warn,warning,error,critical,global,configure,scope,uncaughtError".split(","),j=0;j<i.length;++j)c.prototype[i[j]]=e(i[j]);var k="//d37gvrvc0wt4s1.cloudfront.net/js/v1.1/rollbar.min.js";_rollbarConfig.rollbarJsUrl=_rollbarConfig.rollbarJsUrl||k;var l=c.init(a,_rollbarConfig);l.loadFull(a,b,!1,_rollbarConfig)}(window,document);
@@ -57,7 +57,7 @@
5757
<body class="{{ page.page_class }}">
5858
<div class="mmenu__wrapper">
5959
{{ content }}
60-
{% if site.rack_env == 'development' %}
60+
{% if jekyll.environment == 'development' %}
6161
<p class="size-helper">
6262
<span class="visible-xs">x-small</span>
6363
<span class="visible-s">small</span>
@@ -69,7 +69,7 @@
6969
<script type="text/javascript">
7070
var searchPrimary = '{{ page.search_primary }}';
7171
</script>
72-
{% if site.rack_env == 'development' %}
72+
{% if jekyll.environment == 'development' %}
7373
{% for script in site.data.js.libs %}
7474
<script type="text/javascript" src="{{ script.path | assetify }}"></script>
7575
{% endfor %}

0 commit comments

Comments
 (0)