Skip to content

Commit

Permalink
Merge pull request #6 from uglow/feature/support-style-elements
Browse files Browse the repository at this point in the history
Feature/support style elements
  • Loading branch information
uglow authored Jun 18, 2018
2 parents e45e193 + ad11fcb commit d7cbbf7
Show file tree
Hide file tree
Showing 22 changed files with 14,469 additions and 83 deletions.
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
save-exact=true
9 changes: 6 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: node_js

node_js:
- '6'
- '7'
- '8'

matrix:
fast-finish: true # https://docs.travis-ci.com/user/customizing-the-build/#Fast-Finishing
Expand All @@ -13,6 +13,7 @@ env:
- CXX=g++-4.8

addons:
chrome: stable
firefox: "45.0"
apt:
sources:
Expand All @@ -36,10 +37,12 @@ before_script:
- sleep 3 # give xvfb some time to start

script:
- npm run pre-release
#- npm run pre-release #disabled due to Chrome headless not working (even locally)
- npm run verify
- npm run build

after_success:
- npm run upload-coverage
#- npm run upload-coverage # disabled due to tests being disabled
- npm run semantic-release

branches:
Expand Down
3 changes: 1 addition & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ stylesheet-switcher/
│ ├──styles/ * css source code for this module
│ ├──template/ * HTML templates for this module
│ ├──systemTest/ * system test specs for this module
│ ├──unitTest/ * unit test specs for this module
│ └── * visual regression test specs for this module (if enabled)
│ └──unitTest/ * unit test specs for this module
├──dev/ * development-build code is output here (Webpack may keep it in memory for speed)
├──dist/ * production-build code is output here
Expand Down
7 changes: 2 additions & 5 deletions config/testUnit/karma.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ let karmaConfig = {
basePath: '../../',

// testing framework to use (jasmine/mocha/qunit/...)
frameworks: ['jasmine', 'es6-shim'],
frameworks: ['jasmine'],

// list of files / patterns to exclude
exclude: [],
Expand All @@ -37,12 +37,10 @@ let karmaConfig = {
// Start these browsers, currently available:
// - Chrome, ChromeCanary, Firefox, Opera, Safari (only Mac), PhantomJS, IE (only Windows)
browsers: [
'PhantomJS'
'Chrome',
],

plugins: [
'karma-phantomjs-launcher',
'karma-es6-shim',
'karma-jasmine',
'karma-junit-reporter',
'karma-coverage',
Expand All @@ -53,7 +51,6 @@ let karmaConfig = {
],

files: [
'node_modules/phantomjs-polyfill/bind-polyfill.js',
'config/testUnit/test.files.js'
],

Expand Down
3 changes: 0 additions & 3 deletions config/testUnit/test.files.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
// START_CONFIT_GENERATED_CONTENT
Error.stackTraceLimit = Infinity;

// Polyfill required for PhantomJS
require('phantomjs-polyfill');

// Load the test dependencies!


Expand Down
2 changes: 1 addition & 1 deletion dist/js/component.es5.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/js/component.es5.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit d7cbbf7

Please sign in to comment.