From dd509e9afe21f47511e86551ad15b0cbe2286332 Mon Sep 17 00:00:00 2001 From: Phil Freeman Date: Sat, 1 Apr 2017 11:10:05 -0700 Subject: [PATCH 1/3] Fix CI build? --- .travis.yml | 22 +++++++++------------- package.json | 3 +-- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 891a85c..9c5c056 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,21 +1,17 @@ language: node_js dist: trusty sudo: required -node_js: stable -env: - - PATH=$HOME/purescript:$PATH +node_js: 6 install: - - TAG=$(wget -q -O - https://github.com/purescript/purescript/releases/latest --server-response --max-redirect 0 2>&1 | sed -n -e 's/.*Location:.*tag\///p') - - wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz - - tar -xvf $HOME/purescript.tar.gz -C $HOME/ - - chmod a+x $HOME/purescript - - npm install -g bower + - npm install -g bower purescript@0.11.1 purescript-psa@0.5.0 - npm install - - bower install script: + - bower install --production - npm run -s build + - bower install + - npm -s test after_success: - - >- - test $TRAVIS_TAG && - echo $GITHUB_TOKEN | pulp login && - echo y | pulp publish --no-push +- >- + test $TRAVIS_TAG && + echo $GITHUB_TOKEN | pulp login && + echo y | pulp publish --no-push diff --git a/package.json b/package.json index 68f8999..13081d4 100644 --- a/package.json +++ b/package.json @@ -2,14 +2,13 @@ "private": true, "scripts": { "clean": "rimraf output && rimraf .pulp-cache", - "build": "jshint src && jscs src && pulp build --censor-lib --strict", + "build": "jshint src && jscs src && pulp build -- --censor-lib --strict", "test": "pulp test" }, "devDependencies": { "jscs": "^2.8.0", "jshint": "^2.9.1", "pulp": "^10.0.4", - "purescript-psa": "^0.3.9", "rimraf": "^2.5.0" } } From a2a91f50602eb6aba7e26c85cd7db82d46ef0f9a Mon Sep 17 00:00:00 2001 From: Gary Burgess Date: Sat, 1 Apr 2017 22:36:16 +0100 Subject: [PATCH 2/3] Fix CI build take 2? --- .eslintrc.json | 28 ++++++++++++++++++++++++++++ .gitignore | 3 +-- .jscsrc | 17 ----------------- .jshintrc | 19 ------------------- .travis.yml | 8 +++----- package.json | 9 +++++---- 6 files changed, 37 insertions(+), 47 deletions(-) create mode 100644 .eslintrc.json delete mode 100644 .jscsrc delete mode 100644 .jshintrc diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 0000000..39963d3 --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,28 @@ +{ + "parserOptions": { + "ecmaVersion": 5 + }, + "extends": "eslint:recommended", + "env": { + "commonjs": true + }, + "rules": { + "strict": [2, "global"], + "block-scoped-var": 2, + "consistent-return": 2, + "eqeqeq": [2, "smart"], + "guard-for-in": 2, + "no-caller": 2, + "no-extend-native": 2, + "no-loop-func": 2, + "no-new": 2, + "no-param-reassign": 2, + "no-return-assign": 2, + "no-unused-expressions": 2, + "no-use-before-define": 2, + "radix": [2, "always"], + "indent": [2, 2, { "SwitchCase": 1 }], + "quotes": [2, "double"], + "semi": [2, "always"] + } +} diff --git a/.gitignore b/.gitignore index e306283..7050558 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ /.* !/.gitignore -!/.jscsrc -!/.jshintrc +!/.eslintrc.json !/.travis.yml /bower_components/ /node_modules/ diff --git a/.jscsrc b/.jscsrc deleted file mode 100644 index 2561ce9..0000000 --- a/.jscsrc +++ /dev/null @@ -1,17 +0,0 @@ -{ - "preset": "grunt", - "disallowSpacesInFunctionExpression": null, - "requireSpacesInFunctionExpression": { - "beforeOpeningRoundBrace": true, - "beforeOpeningCurlyBrace": true - }, - "disallowSpacesInAnonymousFunctionExpression": null, - "requireSpacesInAnonymousFunctionExpression": { - "beforeOpeningRoundBrace": true, - "beforeOpeningCurlyBrace": true - }, - "disallowSpacesInsideObjectBrackets": null, - "requireSpacesInsideObjectBrackets": "all", - "validateQuoteMarks": "\"", - "requireCurlyBraces": null -} diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index 81e6de7..0000000 --- a/.jshintrc +++ /dev/null @@ -1,19 +0,0 @@ -{ - "bitwise": true, - "eqeqeq": true, - "forin": true, - "freeze": true, - "funcscope": true, - "futurehostile": true, - "strict": "global", - "latedef": true, - "noarg": true, - "nocomma": true, - "nonew": true, - "notypeof": true, - "singleGroups": true, - "undef": true, - "unused": true, - "eqnull": true, - "predef": ["exports"] -} diff --git a/.travis.yml b/.travis.yml index 9c5c056..968390b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,13 @@ language: node_js dist: trusty sudo: required -node_js: 6 +node_js: stable install: - - npm install -g bower purescript@0.11.1 purescript-psa@0.5.0 + - npm install -g bower - npm install + - bower install script: - - bower install --production - npm run -s build - - bower install - - npm -s test after_success: - >- test $TRAVIS_TAG && diff --git a/package.json b/package.json index 13081d4..77075c3 100644 --- a/package.json +++ b/package.json @@ -2,13 +2,14 @@ "private": true, "scripts": { "clean": "rimraf output && rimraf .pulp-cache", - "build": "jshint src && jscs src && pulp build -- --censor-lib --strict", + "build": "eslint src && pulp build -- --censor-lib --strict", "test": "pulp test" }, "devDependencies": { - "jscs": "^2.8.0", - "jshint": "^2.9.1", + "eslint": "^3.19.0", "pulp": "^10.0.4", - "rimraf": "^2.5.0" + "purescript": "^0.11.1", + "purescript-psa": "^0.5.0", + "rimraf": "^2.6.1" } } From 6b3f7d3fa35cff3758d729f3581f6b67ad3e45aa Mon Sep 17 00:00:00 2001 From: Phil Freeman Date: Sun, 2 Apr 2017 13:55:10 -0700 Subject: [PATCH 3/3] Use pulp-0.11.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 77075c3..b6361b9 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ }, "devDependencies": { "eslint": "^3.19.0", - "pulp": "^10.0.4", + "pulp": "^11.0.0", "purescript": "^0.11.1", "purescript-psa": "^0.5.0", "rimraf": "^2.6.1"