Skip to content

Commit

Permalink
release 0.3.8
Browse files Browse the repository at this point in the history
  • Loading branch information
kof committed Nov 17, 2016
1 parent cc93918 commit 4948b19
Show file tree
Hide file tree
Showing 8 changed files with 143 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ dist
coverage
tests
tmp
.env
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
language: node_js
node_js:
- "5"
branches:
only:
- master
86 changes: 86 additions & 0 deletions browsers.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
{
"BS_Safari": {
"base": "BrowserStack",
"os": "OS X",
"os_version": "Yosemite",
"browser": "safari",
"browser_version": "8.0"
},
"BS_Safari": {
"base": "BrowserStack",
"os": "OS X",
"os_version": "Mavericks",
"browser": "safari",
"browser_version": "7.0"
},
"BS_Chrome": {
"base": "BrowserStack",
"os": "OS X",
"os_version": "Yosemite",
"browser": "chrome",
"browser_version": "49.0"
},
"BS_Firefox": {
"base": "BrowserStack",
"os": "OS X",
"os_version": "Yosemite",
"browser": "firefox",
"browser_version": "45.0"
},
"BS_MobileSafari": {
"base": "BrowserStack",
"os": "ios",
"os_version": "8.0",
"browser": "iphone",
"real_mobile": false
},
"BS_MobileSafari": {
"base": "BrowserStack",
"os": "ios",
"os_version": "9.0",
"browser": "iphone",
"real_mobile": false
},
"BS_Chrome": {
"base": "BrowserStack",
"os": "Windows",
"os_version": "8.1",
"browser": "chrome",
"browser_version": "49.0"
},
"BS_Firefox": {
"base": "BrowserStack",
"os": "Windows",
"os_version": "8.1",
"browser": "firefox",
"browser_version": "45.0"
},
"BS_InternetExplorer9": {
"base": "BrowserStack",
"os": "Windows",
"os_version": "7",
"browser": "ie",
"browser_version": "9.0"
},
"BS_InternetExplorer10": {
"base": "BrowserStack",
"os": "Windows",
"os_version": "8",
"browser": "ie",
"browser_version": "10"
},
"BS_InternetExplorer11": {
"base": "BrowserStack",
"os": "Windows",
"os_version": "8.1",
"browser": "ie",
"browser_version": "11.0"
},
"BS_Edge": {
"base": "BrowserStack",
"os": "Windows",
"os_version": "10",
"browser": "edge",
"browser_version": "14"
}
}
7 changes: 7 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 0.3.8 / 2016-11-17

- better cache prefill
- fix supportedValue
- migrate tests
- introduce browerstack config and travis

## 0.3.7 / 2016-10-31

- use cross-env
Expand Down
41 changes: 39 additions & 2 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
const webpackConfig = require('./webpack.config')
const browsers = require('./browsers')

const useCloud = process.env.USE_CLOUD === 'true'
const browserStackUserName = process.env.BROWSER_STACK_USERNAME
const browserStackAccessKey = process.env.BROWSER_STACK_ACCESS_KEY
const isTravis = process.env.TRAVIS
const travisBuildNumber = process.env.TRAVIS_BUILD_NUMBER
const travisBuildId = process.env.TRAVIS_BUILD_ID
const travisJobNumber = process.env.TRAVIS_JOB_NUMBER

module.exports = (config) => {
config.set({
customLaunchers: browsers,
browsers: ['Chrome'],
frameworks: ['mocha'],
files: ['tests.webpack.js'],
files: [
'node_modules/es5-shim/es5-shim.js',
'node_modules/es5-shim/es5-sham.js',
'tests.webpack.js',
],
preprocessors: {
'tests.webpack.js': ['webpack', 'sourcemap']
'tests.webpack.js': ['webpack', 'sourcemap'],
},
webpack: Object.assign(webpackConfig, {
devtool: 'inline-source-map'
Expand All @@ -16,4 +30,27 @@ module.exports = (config) => {
},
reporters: ['mocha']
})

if (useCloud) {
Object.assign(config, {
browsers: Object.keys(browsers),
browserDisconnectTolerance: 3,
// My current OS plan allows max 2 parallel connections.
concurrency: 2,
retryLimit: 3
})

config.browserStack = {
username: browserStackUserName,
accessKey: browserStackAccessKey,
captureTimeout: 10000
}

if (isTravis) {
Object.assign(config.browserStack, {
build: `TRAVIS #${travisBuildNumber} (${travisBuildId})`,
name: travisJobNumber
})
}
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "css-vendor",
"description": "CSS vendor prefix detection and property feature testing.",
"version": "0.3.7",
"version": "0.3.8",
"author": {
"name": "Oleg Slobodskoi",
"email": "[email protected]"
Expand Down
2 changes: 2 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[![Build Status](https://travis-ci.org/cssinjs/css-vendor.svg?branch=master)](https://travis-ci.org/cssinjs/css-vendor)

## CSS vendor prefix detection and property feature testing.

### Vendor prefixes
Expand Down
2 changes: 1 addition & 1 deletion tests.webpack.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
var context = require.context('./src', true, /\.test\.js$/)
const context = require.context('./src', true, /\.test\.js$/)
context.keys().forEach(context)

0 comments on commit 4948b19

Please sign in to comment.