Skip to content

Commit

Permalink
Merge pull request #142 from xtian/0.19
Browse files Browse the repository at this point in the history
Update for Elm 0.19
  • Loading branch information
eeue56 authored Aug 29, 2018
2 parents 7d1c6d9 + 1e6cb02 commit dd74085
Show file tree
Hide file tree
Showing 15 changed files with 139 additions and 8,667 deletions.
17 changes: 2 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,27 @@ sudo: false
cache:
directories:
- test/elm-stuff/build-artifacts
- sysconfcpus

os:
- osx
- linux

env:
matrix:
- ELM_VERSION=0.18 TARGET_NODE_VERSION=node
- ELM_VERSION=0.18 TARGET_NODE_VERSION=4.2
- ELM_VERSION=0.19 TARGET_NODE_VERSION=node
- ELM_VERSION=0.19 TARGET_NODE_VERSION=4.2

before_install:
- if [ ${TRAVIS_OS_NAME} == "osx" ];
then brew update; brew install nvm; mkdir ~/.nvm; export NVM_DIR=~/.nvm; source $(brew --prefix nvm)/nvm.sh;
fi
- | # epic build time improvement - see https://github.com/elm-lang/elm-compiler/issues/1473#issuecomment-245704142
if [ ! -d sysconfcpus/bin ];
then
git clone https://github.com/obmarg/libsysconfcpus.git;
cd libsysconfcpus;
./configure --prefix=$TRAVIS_BUILD_DIR/sysconfcpus;
make && make install;
cd ..;
fi

install:
- nvm install $TARGET_NODE_VERSION
- nvm use $TARGET_NODE_VERSION
- node --version
- npm --version
- npm install -g elm@$ELM_VERSION
- mv $(npm config get prefix)/bin/elm-make $(npm config get prefix)/bin/elm-make-old
- printf "#\041/bin/bash\n\necho \"Running elm-make with sysconfcpus -n 2\"\n\n$TRAVIS_BUILD_DIR/sysconfcpus/bin/sysconfcpus -n 2 elm-make-old \"\$@\"" > $(npm config get prefix)/bin/elm-make
- chmod +x $(npm config get prefix)/bin/elm-make
- npm install

script:
Expand Down
15 changes: 0 additions & 15 deletions example-wp2/elm-package.json

This file was deleted.

28 changes: 28 additions & 0 deletions example-wp2/elm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"version": "0.0.0",
"type": "application",
"summary": "Example using webpack 2",
"repository": "https://github.com/elm-community/elm-webpack-loader.git",
"license": "BSD-3-Clause",
"source-directories": [
"src"
],
"elm-version": "0.19.0",
"dependencies": {
"direct": {
"elm/browser": "1.0.0",
"elm/core": "1.0.0",
"elm/html": "1.0.0"
},
"indirect": {
"elm/json": "1.0.0",
"elm/time": "1.0.0",
"elm/url": "1.0.0",
"elm/virtual-dom": "1.0.0"
}
},
"test-dependencies": {
"direct": {},
"indirect": {}
}
}
3 changes: 1 addition & 2 deletions example-wp2/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ module.exports = {
// loader: "elm-webpack-loader",
loader: '../index.js',
options: {
debug: true,
warn: true
debug: true
}
}
]
Expand Down
15 changes: 0 additions & 15 deletions example-wp4/elm-package.json

This file was deleted.

28 changes: 28 additions & 0 deletions example-wp4/elm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"version": "0.0.0",
"type": "application",
"summary": "Example using webpack 4",
"repository": "https://github.com/elm-community/elm-webpack-loader.git",
"license": "BSD-3-Clause",
"source-directories": [
"src"
],
"elm-version": "0.19.0",
"dependencies": {
"direct": {
"elm/browser": "1.0.0",
"elm/core": "1.0.0",
"elm/html": "1.0.0"
},
"indirect": {
"elm/json": "1.0.0",
"elm/time": "1.0.0",
"elm/url": "1.0.0",
"elm/virtual-dom": "1.0.0"
}
},
"test-dependencies": {
"direct": {},
"indirect": {}
}
}
Loading

0 comments on commit dd74085

Please sign in to comment.