Skip to content

Commit

Permalink
Change travis to build application less -> sass
Browse files Browse the repository at this point in the history
let's use sass instead of less. Also change travis.yml to build application, so it would not throw errors
  • Loading branch information
karelhala committed Mar 29, 2016
1 parent 2299877 commit 9484145
Show file tree
Hide file tree
Showing 9 changed files with 508 additions and 324 deletions.
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,15 @@ sudo: false
language: node_js
node_js:
- '0.10'

notifications:
irc:
channels:
- chat.freenode.net#hawkular
on_success: change

before_install:
- 'npm install -g bower gulp typescript'
- 'npm install -g tsd bower webpack wiredep'

script:
- 'npm install'
- 'bower install'
- 'gulp'
4 changes: 2 additions & 2 deletions application-settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ module.exports = {
isMinified: function (production) {
return (!production ? '.js' : '.min.js');
},
get lessEntryPoint() {
return '.' + this.sourceFolder + this.stylesFolder + '/' + this.appName + '.less'
get sassEntryPoint() {
return '.' + this.sourceFolder + this.stylesFolder + '/' + this.appName + '.scss'
},
get tsEntryPoint() {
return '.' + this.sourceFolder + '/index.ts'
Expand Down
16 changes: 6 additions & 10 deletions dist/css/hawkular-ui-components.css

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

701 changes: 490 additions & 211 deletions dist/js/hawkular-ui-components.js

Large diffs are not rendered by default.

92 changes: 0 additions & 92 deletions gulpfile.js

This file was deleted.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,11 @@
"lodash": "4.6.1",
"minimist": "1.1.0",
"ng-annotate-webpack-plugin": "0.1.2",
"node-sass": "^3.4.2",
"patternfly": "^3.3.1",
"raw-loader": "0.5.1",
"sass": "^0.5.0",
"sass-loader": "^3.2.0",
"style-loader": "^0.13.0",
"through2": "0.6.3",
"ts-loader": "0.8.1",
Expand Down
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ module.exports = {
context: __dirname,
entry: {
'hawkular-ui-components': [
settings.lessEntryPoint,
settings.sassEntryPoint,
settings.tsEntryPoint
],
'demo-app': [
'.' + settings.sourceFolder + '/demo/index.ts',
'.' + settings.sourceFolder + '/demo/styles/demo-app.less'
'.' + settings.sourceFolder + '/demo/styles/demo-app.scss'
]
},
output: {
Expand All @@ -62,8 +62,8 @@ module.exports = {
{test: /\.ts$/, loaders: ['ts-loader'], exclude: /(node_modules|libs)/},
{test: /\.html$/, loader: 'raw', exclude: /(node_modules|libs|dist|tsd|bower)/},
// stylesheets
{test: /\.less$/, exclude: /(node_modules|lib)/, loader: ExtractTextPlugin.extract('style-loader', 'css-loader!less-loader')},
{test: /\.css$/, loader: ExtractTextPlugin.extract('style-loader', 'css-loader!less-loader')}
{test: /\.scss/, exclude: /(node_modules|lib)/, loader: ExtractTextPlugin.extract('style-loader', 'css-loader!sass-loader')},
{test: /\.css$/, loader: ExtractTextPlugin.extract('style-loader', 'css-loader!sass-loader')}
]
},
plugins: plugins,
Expand Down

0 comments on commit 9484145

Please sign in to comment.