From 7f37bdbcb4638d13744cd4e26554b42176117474 Mon Sep 17 00:00:00 2001 From: Swaagie Date: Fri, 1 Apr 2016 14:17:20 +0200 Subject: [PATCH 1/4] [dist] update eslint and babel-eslint to fix the estraverse-fb dependency issue --- es5/fix.js | 1 + es5/paths.js | 2 ++ index.js | 2 ++ package.json | 4 ++-- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/es5/fix.js b/es5/fix.js index ab48c608..b4120069 100644 --- a/es5/fix.js +++ b/es5/fix.js @@ -1,4 +1,5 @@ /* eslint no-sync: 0, no-console: 0 */ +'use strict'; /** * This is a temporary workaround for ES5 users. babel-eslint does not support diff --git a/es5/paths.js b/es5/paths.js index 8bc3fcb6..93386c6b 100644 --- a/es5/paths.js +++ b/es5/paths.js @@ -1,3 +1,5 @@ +'use strict'; + var path = require('path'); /** diff --git a/index.js b/index.js index ecf40c04..4a0c7905 100644 --- a/index.js +++ b/index.js @@ -1,3 +1,5 @@ +'use strict'; + /** * Export our main distribution path. */ diff --git a/package.json b/package.json index 2104ffbb..bcc0e628 100644 --- a/package.json +++ b/package.json @@ -32,9 +32,9 @@ }, "license": "MIT", "dependencies": { - "babel-eslint": "^4.1.3", + "babel-eslint": "^6.0.2", "escope": "^3.4.0", - "eslint": "~2.2.0", + "eslint": "~2.5.3", "eslint-plugin-json": "^1.2.0", "eslint-plugin-mocha": "^2.0.0", "eslint-plugin-react": "^4.1.0", From 2a0f811db1d3c8be7d43b27f71a1c51e62d44692 Mon Sep 17 00:00:00 2001 From: Swaagie Date: Fri, 1 Apr 2016 14:58:55 +0200 Subject: [PATCH 2/4] [fix] use sourceType module --- dotfiles/.eslintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/.eslintrc b/dotfiles/.eslintrc index 7aec0da5..1d375a2b 100644 --- a/dotfiles/.eslintrc +++ b/dotfiles/.eslintrc @@ -12,7 +12,7 @@ "extends": ["eslint:recommended", "plugin:eslint-plugin-react/recommended"], "parserOptions": { "ecmaVersion": 6, - "sourceType": "script", + "sourceType": "module", "ecmaFeatures": { "globalReturn": true, "jsx": true From ca7b7e58f11953cf6a43716711ca2de3aa3f34b6 Mon Sep 17 00:00:00 2001 From: Swaagie Date: Mon, 4 Apr 2016 09:54:23 +0200 Subject: [PATCH 3/4] [dist] add changes --- dist/.eslintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/.eslintrc b/dist/.eslintrc index 672842ce..f58a3369 100644 --- a/dist/.eslintrc +++ b/dist/.eslintrc @@ -12,7 +12,7 @@ "extends": ["eslint:recommended","plugin:eslint-plugin-react/recommended"], "parserOptions": { "ecmaVersion": 6, - "sourceType": "script", + "sourceType": "module", "ecmaFeatures": {"globalReturn":true,"jsx":true} }, "rules": { From 3a03e60bc2a3ca3b98afb13a9f29eacfbd89a008 Mon Sep 17 00:00:00 2001 From: Swaagie Date: Mon, 4 Apr 2016 10:06:03 +0200 Subject: [PATCH 4/4] [fix] remove use strict errors caused by incorrect order in npm build --- es5/fix.js | 1 - es5/paths.js | 2 -- index.js | 2 -- package.json | 2 +- 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/es5/fix.js b/es5/fix.js index b4120069..ab48c608 100644 --- a/es5/fix.js +++ b/es5/fix.js @@ -1,5 +1,4 @@ /* eslint no-sync: 0, no-console: 0 */ -'use strict'; /** * This is a temporary workaround for ES5 users. babel-eslint does not support diff --git a/es5/paths.js b/es5/paths.js index 93386c6b..8bc3fcb6 100644 --- a/es5/paths.js +++ b/es5/paths.js @@ -1,5 +1,3 @@ -'use strict'; - var path = require('path'); /** diff --git a/index.js b/index.js index 4a0c7905..ecf40c04 100644 --- a/index.js +++ b/index.js @@ -1,5 +1,3 @@ -'use strict'; - /** * Export our main distribution path. */ diff --git a/package.json b/package.json index bcc0e628..05c166af 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "pretest": "./bin/lint bin *.js es5/*.js", "prepublish": "fashion-show-build -p && node es5/fix.js", - "build": "npm run pretest && npm run prepublish", + "build": "npm run prepublish && npm run pretest", "test": "echo ok" }, "repository": {