Skip to content

Commit

Permalink
rewrite on es6
Browse files Browse the repository at this point in the history
  • Loading branch information
fanatid committed Aug 8, 2015
1 parent 369f403 commit beb91a6
Show file tree
Hide file tree
Showing 8 changed files with 202 additions and 197 deletions.
3 changes: 3 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"stage": 0
}
10 changes: 10 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"extends": "standard",
"parser": "babel-eslint",
"env": {
"browser": true,
"node": true,
"mocha": true,
"es6": true
}
}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
coverage
lib
node_modules

npm-debug.log
tests.browser.js
124 changes: 0 additions & 124 deletions index.js

This file was deleted.

37 changes: 26 additions & 11 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,39 @@
module.exports = function (config) {
config.set({
browsers: ['Firefox'],
frameworks: ['detectBrowsers', 'mocha'],
frameworks: ['browserify', 'detectBrowsers', 'mocha'],
files: [
'test/*.js'
],
preprocessors: {
'test/*.js': ['browserify']
},
singleRun: true,
plugins: [
'karma-browserify',
'karma-chrome-launcher',
'karma-firefox-launcher',
'karma-detect-browsers',
'karma-mocha'
],
browserify: {
debug: true,
transform: [
['babelify']
]
},
detectBrowsers: {
enabled: true,
usePhantomJS: false,
postDetection: function (availableBrowser) {
if (process.env.TRAVIS) {
return ['Firefox']
}

var browsers = ['Chrome', 'Firefox']
return browsers.filter(function (browser) {
return availableBrowser.indexOf(browser) !== -1
})
}
},
singleRun: true,
files: ['tests.browser.js'],
plugins: [
'karma-mocha',
'karma-chrome-launcher',
'karma-firefox-launcher',
'karma-detect-browsers'
]
}
})
}
83 changes: 47 additions & 36 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,54 +1,65 @@
{
"name": "ready-mixin",
"version": "0.0.5",
"main": "./index.js",
"version": "0.1.0",
"description": "Ready mixin for classes with async constructor",
"author": "Fomichev Kirill <fanatid@ya.ru>",
"repository": {
"url": "git://github.com/fanatid/ready-mixin",
"type": "git"
},
"bugs": {
"url": "https://github.com/fanatid/ready-mixin/issues"
},
"license": "MIT",
"keywords": [
"ready",
"mixin",
"promise"
],
"bugs": {
"url": "https://github.com/fanatid/ready-mixin/issues"
},
"license": "MIT",
"author": {
"name": "Kirill Fomichev",
"email": "fanatid@ya.ru"
},
"files": [
"index.js",
"lib",
"src",
"LICENSE",
"README.md"
],
"dependencies": {},
"devDependencies": {
"bluebird": "^2.9.25",
"browserify": "^9.0.3",
"chai": "^2.3.0",
"coveralls": "^2.11.2",
"es6-promise": "^2.1.1",
"istanbul": "^0.3.14",
"karma": "^0.12.31",
"karma-chrome-launcher": "^0.1.12",
"karma-detect-browsers": "^2.0.0",
"karma-firefox-launcher": "^0.1.6",
"karma-mocha": "^0.1.10",
"lie": "^2.8.1",
"mocha": "^2.2.4",
"q": "^1.4.0",
"standard": "^3.8.0"
"main": "./index.js",
"repository": {
"type": "git",
"url": "https://github.com/fanatid/ready-mixin.git"
},
"scripts": {
"compile:test": "browserify -o tests.browser.js tests.js",
"coverage": "istanbul cover _mocha -- tests.js",
"prepublish": "npm run clean && npm run compile",
"compile": "babel --optional runtime -d lib src",
"coverage": "istanbul cover _mocha -- --compilers js:babel/register test/*.js",
"coveralls": "npm run coverage && coveralls <coverage/lcov.info",
"clean": "rm -f tests.browser.js",
"karma": "./node_modules/karma/bin/karma start karma.conf.js",
"lint": "standard",
"clean": "rm -f lib/*",
"lint": "eslint src test",
"test": "npm run test:node && npm run test:browser",
"test:node": "istanbul test mocha -- --reporter spec tests.js",
"test:browser": "npm run compile:test && npm run karma"
"test:browser": "karma start karma.conf.js",
"test:node": "istanbul test mocha -- --compilers js:babel/register --reporter spec test/*.js"
},
"dependencies": {
"babel-runtime": "^5.8.20",
"custom-promise-for-package": "0.0.1"
},
"devDependencies": {
"babel": "^5.8.21",
"babel-eslint": "^4.0.5",
"babelify": "^6.1.3",
"bluebird": "^2.9.34",
"chai": "^3.2.0",
"coveralls": "^2.11.3",
"eslint": "^1.0.0",
"eslint-config-standard": "^4.0.0",
"eslint-plugin-standard": "^1.2.0",
"istanbul": "^0.3.17",
"karma": "^0.13.8",
"karma-browserify": "^4.3.0",
"karma-chrome-launcher": "^0.2.0",
"karma-detect-browsers": "^2.0.1",
"karma-firefox-launcher": "^0.1.6",
"karma-mocha": "^0.2.0",
"lie": "^3.0.1",
"mocha": "^2.2.5",
"q": "^2.0.3"
}
}

0 comments on commit beb91a6

Please sign in to comment.