Skip to content

Commit dd74085

Browse files
authored
Merge pull request #142 from xtian/0.19
Update for Elm 0.19
2 parents 7d1c6d9 + 1e6cb02 commit dd74085

File tree

15 files changed

+139
-8667
lines changed

15 files changed

+139
-8667
lines changed

.travis.yml

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,27 @@ sudo: false
33
cache:
44
directories:
55
- test/elm-stuff/build-artifacts
6-
- sysconfcpus
76

87
os:
98
- osx
109
- linux
1110

1211
env:
1312
matrix:
14-
- ELM_VERSION=0.18 TARGET_NODE_VERSION=node
15-
- ELM_VERSION=0.18 TARGET_NODE_VERSION=4.2
13+
- ELM_VERSION=0.19 TARGET_NODE_VERSION=node
14+
- ELM_VERSION=0.19 TARGET_NODE_VERSION=4.2
1615

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

3121
install:
3222
- nvm install $TARGET_NODE_VERSION
3323
- nvm use $TARGET_NODE_VERSION
3424
- node --version
3525
- npm --version
3626
- npm install -g elm@$ELM_VERSION
37-
- mv $(npm config get prefix)/bin/elm-make $(npm config get prefix)/bin/elm-make-old
38-
- 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
39-
- chmod +x $(npm config get prefix)/bin/elm-make
4027
- npm install
4128

4229
script:

example-wp2/elm-package.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

example-wp2/elm.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"version": "0.0.0",
3+
"type": "application",
4+
"summary": "Example using webpack 2",
5+
"repository": "https://github.com/elm-community/elm-webpack-loader.git",
6+
"license": "BSD-3-Clause",
7+
"source-directories": [
8+
"src"
9+
],
10+
"elm-version": "0.19.0",
11+
"dependencies": {
12+
"direct": {
13+
"elm/browser": "1.0.0",
14+
"elm/core": "1.0.0",
15+
"elm/html": "1.0.0"
16+
},
17+
"indirect": {
18+
"elm/json": "1.0.0",
19+
"elm/time": "1.0.0",
20+
"elm/url": "1.0.0",
21+
"elm/virtual-dom": "1.0.0"
22+
}
23+
},
24+
"test-dependencies": {
25+
"direct": {},
26+
"indirect": {}
27+
}
28+
}

example-wp2/webpack.config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ module.exports = {
2929
// loader: "elm-webpack-loader",
3030
loader: '../index.js',
3131
options: {
32-
debug: true,
33-
warn: true
32+
debug: true
3433
}
3534
}
3635
]

example-wp4/elm-package.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

example-wp4/elm.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"version": "0.0.0",
3+
"type": "application",
4+
"summary": "Example using webpack 4",
5+
"repository": "https://github.com/elm-community/elm-webpack-loader.git",
6+
"license": "BSD-3-Clause",
7+
"source-directories": [
8+
"src"
9+
],
10+
"elm-version": "0.19.0",
11+
"dependencies": {
12+
"direct": {
13+
"elm/browser": "1.0.0",
14+
"elm/core": "1.0.0",
15+
"elm/html": "1.0.0"
16+
},
17+
"indirect": {
18+
"elm/json": "1.0.0",
19+
"elm/time": "1.0.0",
20+
"elm/url": "1.0.0",
21+
"elm/virtual-dom": "1.0.0"
22+
}
23+
},
24+
"test-dependencies": {
25+
"direct": {},
26+
"indirect": {}
27+
}
28+
}

0 commit comments

Comments
 (0)