Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use webpacker for bundling and transpiling javascript #484

Merged
merged 15 commits into from
Jun 14, 2018
Merged

Use webpacker for bundling and transpiling javascript #484

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9f038fe
Add webpacker
stardust66 Jun 11, 2018
e69de2e
Add all configurations for webpacker
stardust66 Jun 11, 2018
8404d70
Install what webpacker needs inside Docker
stardust66 Jun 11, 2018
82a9bab
Convert all coffeescript files to es6 javascript
stardust66 Mar 8, 2018
673f03b
Add javascript dependencies with yarn
stardust66 Jun 12, 2018
1d8c468
Replace old javascript tag with webpacker's
stardust66 Jun 12, 2018
fa0af01
Bundle and transpile all javascript with webpacker
stardust66 Jun 12, 2018
003101f
Merge branch 'develop' into webpacker
DeeDeeG Jun 14, 2018
89441a9
commit yarn
tkwidmer Jun 14, 2018
edbb4d4
add engine
tkwidmer Jun 14, 2018
685335c
review apps
tkwidmer Jun 14, 2018
9a398df
Update Yarn Lock
tkwidmer Jun 14, 2018
e4244ab
Update App.json
tkwidmer Jun 14, 2018
cf7af3e
remove trailing comma
tkwidmer Jun 14, 2018
0ccf47f
remove duplicate entry
tkwidmer Jun 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@
"postdeploy": "bundle exec rake db:setup"
},
"env": {
"DATABASE_URL": {
"required": true
},
"HEROKU_POSTGRESQL_CYAN_URL": {
"required": true
},
"HEROKU_POSTGRESQL_CYAN_URL": {
"required": true
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably doesn't make a difference, but this looks duplicated.

    "HEROKU_POSTGRESQL_CYAN_URL": {
      "required": true
    },

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch, we were missing a couple of these, and so they were not inheriting correctly.

"DEVISE_SECRET_KEY": {
"required": true
},
Expand Down Expand Up @@ -37,7 +46,6 @@
},
"addons": [
"heroku-postgresql",
"heroku-postgresql"
],
"buildpacks": [
{
Expand Down