Skip to content

Commit 46fb67d

Browse files
Add 'nodejs' buildback (Ref: rails/webpacker#739)
1 parent c0698cc commit 46fb67d

7 files changed

+35
-139
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
# Ignore the default SQLite database.
1111
/db/*.sqlite3
1212
/db/*.sqlite3-journal
13+
/config/database.yml
1314

1415
# Ignore all logfiles and tempfiles.
1516
/log/*

Procfile Procfile.dev

File renamed without changes.

app.json

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
{
22
"name": "elmsanity",
33
"description": "",
4-
"scripts": {
5-
"postdeploy": "cp config/database.yml.postgresql config/database.yml; bundle exec rails db:create; bundle exec rails db:migrate; NODE_ENV=production bundle exec rails webpacker:compile"
6-
},
4+
"scripts": {},
75
"env": {
86
"SECRET_KEY_BASE": {
97
"generator": "secret"
108
},
11-
"RACK_ENV": "staging",
12-
"RAILS_ENV": "staging",
13-
"LOG_LEVEL": "DEBUG",
14-
"HEROKU": "true"
9+
1510
},
1611
"formation": {
12+
"web": {
13+
"quantity": 1
14+
}
1715
},
18-
"addons": [
19-
20-
],
16+
"addons": [],
2117
"buildpacks": [
22-
18+
{
19+
"url": "heroku/nodejs"
20+
},
21+
{
22+
"url": "heroku/ruby"
23+
}
2324
]
2425
}

config/database.yml

-22
This file was deleted.

config/webpacker.yml

+2
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,6 @@ production:
6666
staging:
6767
<<: *default
6868
compile: false
69+
70+
# Cache manifest.json for performance
6971
cache_manifest: true

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"@rails/webpacker": "^3.0.2",
66
"coffeescript": "1.12.7",
77
"elm": "^0.18.0",
8-
"elm-webpack-loader": "^4.4.0"
8+
"elm-webpack-loader": "^4.4.0",
9+
"webpack-dev-server": "2.7.1"
910
},
1011
"devDependencies": {
11-
"elm-hot-loader": "^0.5.4",
12-
"webpack-dev-server": "^2.9.4"
12+
"elm-hot-loader": "^0.5.4"
1313
}
1414
}

yarn.lock

+17-103
Original file line numberDiff line numberDiff line change
@@ -177,13 +177,6 @@ array-flatten@^2.1.0:
177177
version "2.1.1"
178178
resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296"
179179

180-
array-includes@^3.0.3:
181-
version "3.0.3"
182-
resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
183-
dependencies:
184-
define-properties "^1.1.2"
185-
es-abstract "^1.7.0"
186-
187180
array-union@^1.0.1:
188181
version "1.0.2"
189182
resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -1553,13 +1546,6 @@ deep-extend@~0.4.0:
15531546
version "0.4.2"
15541547
resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
15551548

1556-
define-properties@^1.1.2:
1557-
version "1.1.2"
1558-
resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
1559-
dependencies:
1560-
foreach "^2.0.5"
1561-
object-keys "^1.0.8"
1562-
15631549
defined@^1.0.0:
15641550
version "1.0.0"
15651551
resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
@@ -1721,24 +1707,6 @@ error-ex@^1.2.0:
17211707
dependencies:
17221708
is-arrayish "^0.2.1"
17231709

1724-
es-abstract@^1.7.0:
1725-
version "1.9.0"
1726-
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.9.0.tgz#690829a07cae36b222e7fd9b75c0d0573eb25227"
1727-
dependencies:
1728-
es-to-primitive "^1.1.1"
1729-
function-bind "^1.1.1"
1730-
has "^1.0.1"
1731-
is-callable "^1.1.3"
1732-
is-regex "^1.0.4"
1733-
1734-
es-to-primitive@^1.1.1:
1735-
version "1.1.1"
1736-
resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
1737-
dependencies:
1738-
is-callable "^1.1.1"
1739-
is-date-object "^1.0.1"
1740-
is-symbol "^1.0.1"
1741-
17421710
es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
17431711
version "0.10.35"
17441712
resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.35.tgz#18ee858ce6a3c45c7d79e91c15fcca9ec568494f"
@@ -2057,10 +2025,6 @@ for-own@^1.0.0:
20572025
dependencies:
20582026
for-in "^1.0.1"
20592027

2060-
foreach@^2.0.5:
2061-
version "2.0.5"
2062-
resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
2063-
20642028
forever-agent@~0.6.1:
20652029
version "0.6.1"
20662030
resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -2139,7 +2103,7 @@ fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
21392103
mkdirp ">=0.5 0"
21402104
rimraf "2"
21412105

2142-
function-bind@^1.0.2, function-bind@^1.1.1:
2106+
function-bind@^1.0.2:
21432107
version "1.1.1"
21442108
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
21452109

@@ -2458,13 +2422,6 @@ ieee754@^1.1.4:
24582422
version "1.1.8"
24592423
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
24602424

2461-
import-local@^0.1.1:
2462-
version "0.1.1"
2463-
resolved "https://registry.yarnpkg.com/import-local/-/import-local-0.1.1.tgz#b1179572aacdc11c6a91009fb430dbcab5f668a8"
2464-
dependencies:
2465-
pkg-dir "^2.0.0"
2466-
resolve-cwd "^2.0.0"
2467-
24682425
in-publish@^2.0.0:
24692426
version "2.0.0"
24702427
resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
@@ -2502,7 +2459,7 @@ ini@~1.3.0:
25022459
version "1.3.4"
25032460
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
25042461

2505-
internal-ip@1.2.0:
2462+
internal-ip@^1.2.0:
25062463
version "1.2.0"
25072464
resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-1.2.0.tgz#ae9fbf93b984878785d50a8de1b356956058cf5c"
25082465
dependencies:
@@ -2558,14 +2515,6 @@ is-builtin-module@^1.0.0:
25582515
dependencies:
25592516
builtin-modules "^1.0.0"
25602517

2561-
is-callable@^1.1.1, is-callable@^1.1.3:
2562-
version "1.1.3"
2563-
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
2564-
2565-
is-date-object@^1.0.1:
2566-
version "1.0.1"
2567-
resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
2568-
25692518
is-directory@^0.3.1:
25702519
version "0.3.1"
25712520
resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
@@ -2679,12 +2628,6 @@ is-property@^1.0.0:
26792628
version "1.0.2"
26802629
resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
26812630

2682-
is-regex@^1.0.4:
2683-
version "1.0.4"
2684-
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
2685-
dependencies:
2686-
has "^1.0.1"
2687-
26882631
is-stream@^1.1.0:
26892632
version "1.1.0"
26902633
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -2695,10 +2638,6 @@ is-svg@^2.0.0:
26952638
dependencies:
26962639
html-comment-regex "^1.1.0"
26972640

2698-
is-symbol@^1.0.1:
2699-
version "1.0.1"
2700-
resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
2701-
27022641
is-typedarray@~1.0.0:
27032642
version "1.0.0"
27042643
resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -2707,10 +2646,6 @@ is-utf8@^0.2.0:
27072646
version "0.2.1"
27082647
resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
27092648

2710-
is-wsl@^1.1.0:
2711-
version "1.1.0"
2712-
resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
2713-
27142649
isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
27152650
version "1.0.0"
27162651
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -2828,10 +2763,6 @@ jsprim@^1.2.2:
28282763
json-schema "0.2.3"
28292764
verror "1.10.0"
28302765

2831-
killable@^1.0.0:
2832-
version "1.0.0"
2833-
resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.0.tgz#da8b84bd47de5395878f95d64d02f2449fe05e6b"
2834-
28352766
kind-of@^2.0.1:
28362767
version "2.0.1"
28372768
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5"
@@ -3428,10 +3359,6 @@ object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
34283359
version "4.1.1"
34293360
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
34303361

3431-
object-keys@^1.0.8:
3432-
version "1.0.11"
3433-
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
3434-
34353362
object-path@^0.9.2:
34363363
version "0.9.2"
34373364
resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.9.2.tgz#0fd9a74fc5fad1ae3968b586bda5c632bd6c05a5"
@@ -3467,11 +3394,12 @@ onecolor@^3.0.4:
34673394
version "3.0.4"
34683395
resolved "https://registry.yarnpkg.com/onecolor/-/onecolor-3.0.4.tgz#75a46f80da6c7aaa5b4daae17a47198bd9652494"
34693396

3470-
opn@^5.1.0:
3471-
version "5.1.0"
3472-
resolved "https://registry.yarnpkg.com/opn/-/opn-5.1.0.tgz#72ce2306a17dbea58ff1041853352b4a8fc77519"
3397+
opn@4.0.2:
3398+
version "4.0.2"
3399+
resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95"
34733400
dependencies:
3474-
is-wsl "^1.1.0"
3401+
object-assign "^4.0.1"
3402+
pinkie-promise "^2.0.0"
34753403

34763404
original@>=0.0.5:
34773405
version "1.0.0"
@@ -4629,16 +4557,6 @@ requires-port@1.0.x, requires-port@1.x.x, requires-port@~1.0.0:
46294557
version "1.0.0"
46304558
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
46314559

4632-
resolve-cwd@^2.0.0:
4633-
version "2.0.0"
4634-
resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
4635-
dependencies:
4636-
resolve-from "^3.0.0"
4637-
4638-
resolve-from@^3.0.0:
4639-
version "3.0.0"
4640-
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
4641-
46424560
resolve-url-loader@^2.1.0:
46434561
version "2.2.0"
46444562
resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-2.2.0.tgz#9662feaa11debf7cf8e3feb91dae9544aa7dee88"
@@ -5117,7 +5035,7 @@ supports-color@^2.0.0:
51175035
version "2.0.0"
51185036
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
51195037

5120-
supports-color@^3.2.3:
5038+
supports-color@^3.1.1, supports-color@^3.2.3:
51215039
version "3.2.3"
51225040
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
51235041
dependencies:
@@ -5396,37 +5314,33 @@ webpack-dev-middleware@^1.11.0:
53965314
range-parser "^1.0.3"
53975315
time-stamp "^2.0.0"
53985316

5399-
webpack-dev-server@^2.9.4:
5400-
version "2.9.4"
5401-
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.9.4.tgz#7883e61759c6a4b33e9b19ec4037bd4ab61428d1"
5317+
webpack-dev-server@2.7.1:
5318+
version "2.7.1"
5319+
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.7.1.tgz#21580f5a08cd065c71144cf6f61c345bca59a8b8"
54025320
dependencies:
54035321
ansi-html "0.0.7"
5404-
array-includes "^3.0.3"
54055322
bonjour "^3.5.0"
54065323
chokidar "^1.6.0"
54075324
compression "^1.5.2"
54085325
connect-history-api-fallback "^1.3.0"
5409-
debug "^3.1.0"
54105326
del "^3.0.0"
54115327
express "^4.13.3"
54125328
html-entities "^1.2.0"
54135329
http-proxy-middleware "~0.17.4"
5414-
import-local "^0.1.1"
5415-
internal-ip "1.2.0"
5330+
internal-ip "^1.2.0"
54165331
ip "^1.1.5"
5417-
killable "^1.0.0"
54185332
loglevel "^1.4.1"
5419-
opn "^5.1.0"
5333+
opn "4.0.2"
54205334
portfinder "^1.0.9"
54215335
selfsigned "^1.9.1"
54225336
serve-index "^1.7.2"
54235337
sockjs "0.3.18"
54245338
sockjs-client "1.1.4"
54255339
spdy "^3.4.1"
5426-
strip-ansi "^3.0.1"
5427-
supports-color "^4.2.1"
5340+
strip-ansi "^3.0.0"
5341+
supports-color "^3.1.1"
54285342
webpack-dev-middleware "^1.11.0"
5429-
yargs "^6.6.0"
5343+
yargs "^6.0.0"
54305344

54315345
webpack-manifest-plugin@^1.3.1:
54325346
version "1.3.2"
@@ -5553,7 +5467,7 @@ yargs-parser@^7.0.0:
55535467
dependencies:
55545468
camelcase "^4.1.0"
55555469

5556-
yargs@^6.5.0, yargs@^6.6.0:
5470+
yargs@^6.0.0, yargs@^6.5.0:
55575471
version "6.6.0"
55585472
resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
55595473
dependencies:

0 commit comments

Comments
 (0)