Skip to content

Commit

Permalink
Upgrade frontend dependencies (#77)
Browse files Browse the repository at this point in the history
* fix(*): rm clean from make bootstrap

* chore(*): heavy wip, start elm 0.19 upgrade

* chore(*): update  and

* fix/chore(*): elm-graphql versions/update  callsites

* chore(*): still WIP, get elm code compiling

* chore(*): final cleanup before  error search

* fix(*): gen graphql to elm-stuff

* fix(*): vendorize elm-graphql, compiling with debug flag

* fix(*): update the way icon sprite is injected into the dom

* chore(*): still wip, absinthe/graphql working with updates

* chore(Network.*): socket cleanup

* chore(*): upgrade webpack deps

* fix(scripts): clean npm cache after install

* fix(*): rel builds for local and docker
  • Loading branch information
tbash authored Feb 1, 2019
2 parents bdf85cf + 3a54f81 commit a45637b
Show file tree
Hide file tree
Showing 117 changed files with 7,650 additions and 5,610 deletions.
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ help:

compile: ## Build the application
mix do deps.get, compile
mix do loadpaths, absinthe.schema.json priv/graphql/schema.json
mix generate_schema
cd assets && \
npm install && \
npm run graphql && \
Expand All @@ -32,7 +32,7 @@ image: ## Mimic CodeBuild build

release: ## Build a release of the application with MIX_ENV=prod
MIX_ENV=prod mix do deps.get, compile
MIX_ENV=prod mix do loadpaths, absinthe.schema.json priv/graphql/schema.json
mix generate_schema
cd assets && \
NODE_ENV=production npm install && \
NODE_ENV=production npm run graphql && \
Expand All @@ -42,8 +42,7 @@ release: ## Build a release of the application with MIX_ENV=prod
@cp _build/prod/rel/$(IMAGE_NAME)/releases/$(VERSION)/$(IMAGE_NAME).tar.gz $(IMAGE_NAME).tar.gz

bootstrap: ## Setup the app dev
$(MAKE) clean
scripts/bootstrap

server: ## Run the app locally for dev
serve: ## Run the app locally for dev
scripts/server
32 changes: 0 additions & 32 deletions assets/elm-package.json

This file was deleted.

39 changes: 39 additions & 0 deletions assets/elm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"type": "application",
"source-directories": [
"src",
"vendor",
"elm-stuff/generated/dillonkearns/graphql"
],
"elm-version": "0.19.0",
"dependencies": {
"direct": {
"Skinney/murmur3": "2.0.8",
"elm/browser": "1.0.1",
"elm/core": "1.0.0",
"elm/html": "1.0.0",
"elm/http": "1.0.0",
"elm/json": "1.1.2",
"elm/parser": "1.1.0",
"elm/regex": "1.0.0",
"elm/svg": "1.0.1",
"elm/time": "1.0.0",
"elm/url": "1.0.0",
"elm-community/list-extra": "8.1.0",
"folkertdev/elm-deque": "3.0.0",
"jinjor/elm-debounce": "3.0.0",
"lukewestby/elm-http-builder": "6.0.0",
"lukewestby/elm-string-interpolate": "1.0.3",
"lukewestby/http-extra": "2.0.1",
"rtfeldman/elm-css": "16.0.0"
},
"indirect": {
"elm/virtual-dom": "1.0.2",
"rtfeldman/elm-hex": "1.0.0"
}
},
"test-dependencies": {
"direct": {},
"indirect": {}
}
}
7,317 changes: 4,293 additions & 3,024 deletions assets/package-lock.json

Large diffs are not rendered by default.

39 changes: 17 additions & 22 deletions assets/package.json
Original file line number Diff line number Diff line change
@@ -1,46 +1,41 @@
{
"name": "ellie",
"description": "ellie-app.com",
"repository": "https://github.com/lukewestby/ellie.git",
"repository": "https://github.com/ellie-app/ellie.git",
"version": "1.0.0",
"license": "BSD-3-Clause",
"scripts": {
"build": "webpack --mode production --config webpack.prod.config.js",
"start": "webpack-dev-server --mode development --config webpack.dev.config.js",
"graphql": "elm-graphql --introspection-file ../priv/graphql/schema.json --base Ellie.Api --output ./elm-stuff/generated/dillonkearns/graphql"
},
"dependencies": {
"@absinthe/socket": "^0.2.0",
"@babel/core": "7.0.0-beta.46",
"@babel/preset-env": "7.0.0-beta.46",
"@babel/preset-stage-2": "7.0.0-beta.46",
"@dillonkearns/elm-graphql": "^1.0.7",
"@webcomponents/custom-elements": "1.1.0",
"babel-loader": "8.0.0-beta.4",
"babel-plugin-elm-pre-minify": "0.1.2",
"codemirror": "5.27.4",
"compression-webpack-plugin": "1.1.11",
"compression-webpack-plugin": "^1.1.11",
"copy-webpack-plugin": "4.5.1",
"css-loader": "0.28.4",
"elm": "0.18.0",
"elm-webpack-loader": "https://github.com/lukewestby/elm-webpack-loader.git",
"graphqelm": "3.1.11",
"elm": "^0.19.0-bugfix6",
"elm-format": "^0.8.1",
"elm-webpack-loader": "^5.0.0",
"jszip": "3.1.5",
"marked": "0.3.17",
"newless": "0.3.0",
"opbeat-js": "3.1.4",
"phoenix": "1.3.0",
"ric": "1.3.0",
"serviceworker-loader": "0.1.0",
"string-replace-webpack-plugin": "0.1.3",
"style-loader": "0.18.2",
"svg-inline-loader": "0.8.0",
"sw-toolbox": "3.6.0",
"uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony-v2.8.22",
"webpack": "3.3.0",
"webpack-dev-server": "2.5.1",
"webpack-manifest-plugin": "2.0.2"
},
"scripts": {
"start": "yarn run watch",
"watch": "MIX_ENV=dev webpack-dev-server --watch --config ./webpack.dev.config.js",
"build": "webpack --config ./webpack.prod.config.js",
"graphql": "graphqelm --introspection-file ../priv/graphql/schema.json --base Ellie.Api --output elm-stuff/generated/dillonkearns/graphqelm"
},
"devDependencies": {
"chokidar-cli": "1.2.0"
"terser-webpack-plugin": "^1.1.0",
"webpack": "^4.20.2",
"webpack-cli": "^3.2.1",
"webpack-dev-server": "^3.1.9",
"webpack-manifest-plugin": "^2.0.4"
}
}
2 changes: 1 addition & 1 deletion assets/src/Colors.elm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Colors exposing (..)
module Colors exposing (BoxShadow, blue, boxShadow, darkGray, darkMediumGray, green, lightGray, lightMediumGray, mediumGray, pink, red, yellow)

import Css exposing (..)

Expand Down
19 changes: 9 additions & 10 deletions assets/src/Data/Either.elm
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
module Data.Either
exposing
( Either(..)
, andMap
, andThen
, map
, mapBoth
, mapLeft
, mapRight
)
module Data.Either exposing
( Either(..)
, andMap
, andThen
, map
, mapBoth
, mapLeft
, mapRight
)


type Either l r
Expand Down
17 changes: 8 additions & 9 deletions assets/src/Data/Entity.elm
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
module Data.Entity
exposing
( Entity(..)
, decoder
, encoder
, key
, map
, record
)
module Data.Entity exposing
( Entity(..)
, decoder
, encoder
, key
, map
, record
)

{-| A representation of some data that is stored based on some unique ID.
This is a much nicer way to represent this situation than by putting an
Expand Down
13 changes: 6 additions & 7 deletions assets/src/Data/Group.elm
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
module Data.Group
exposing
( Group
, batch
, none
, one
)
module Data.Group exposing
( Group
, batch
, none
, one
)


type Group a
Expand Down
12 changes: 6 additions & 6 deletions assets/src/Data/Jwt.elm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module Data.Jwt exposing (Jwt, decoder, encoder, field, fromString, toString, withTokenHeader)

import Graphqelm.Field
import Graphqelm.Http
import Graphql.Field
import Graphql.Http
import Json.Decode as Decode exposing (Decoder)
import Json.Encode as Encode exposing (Value)

Expand Down Expand Up @@ -30,11 +30,11 @@ decoder =
Decode.map Jwt Decode.string


withTokenHeader : Jwt -> Graphqelm.Http.Request a -> Graphqelm.Http.Request a
withTokenHeader : Jwt -> Graphql.Http.Request a -> Graphql.Http.Request a
withTokenHeader (Jwt token) =
Graphqelm.Http.withHeader "authorization" ("Bearer " ++ token)
Graphql.Http.withHeader "authorization" ("Bearer " ++ token)


field : Graphqelm.Field.Field String a -> Graphqelm.Field.Field Jwt a
field : Graphql.Field.Field String a -> Graphql.Field.Field Jwt a
field stringField =
Graphqelm.Field.map Jwt stringField
Graphql.Field.map Jwt stringField
2 changes: 1 addition & 1 deletion assets/src/Data/Replaceable.elm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Data.Replaceable exposing (..)
module Data.Replaceable exposing (Replaceable(..), fromMaybe, inject, loading, reset, toMaybe)


type Replaceable k v
Expand Down
2 changes: 1 addition & 1 deletion assets/src/Data/Transition.elm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Data.Transition exposing (..)
module Data.Transition exposing (Transition(..), exit, fold, step)


type Transition a b
Expand Down
35 changes: 0 additions & 35 deletions assets/src/Data/Url.elm

This file was deleted.

Loading

0 comments on commit a45637b

Please sign in to comment.