Skip to content

Commit

Permalink
chore(build): swap to carbon-icons, bump to rc-2 (#2442)
Browse files Browse the repository at this point in the history
* chore(build): swap to carbon-icons, bump to rc-2

* chore(build): include src files in the build

* fix(build): update to Carbon Components
  • Loading branch information
Christopher A. Dhanaraj authored and GitHub Enterprise committed Mar 24, 2017
1 parent a050bb0 commit 266d715
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const cloptions = require('minimist')(process.argv.slice(2), {

gulp.task('browser-sync', () => {
browserSync.init({
logPrefix: 'Bluemix Components',
logPrefix: 'Carbon Components',
open: false,
proxy: 'localhost:8080',
timestamps: false,
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "carbon-components",
"version": "7.0.0-rc.1",
"version": "7.0.0-rc.2",
"description": "Bluemix Components is a component library for Bluemix",
"main": "umd/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -48,7 +48,7 @@
"npm": "~3.0.0"
},
"dependencies": {
"@console/bluemix-icons": "5.0.1",
"carbon-icons": "5.0.1",
"adaro": "1.0.4",
"bluebird": "~3.1.1",
"eslint": "^3.0.0",
Expand Down Expand Up @@ -133,7 +133,8 @@
"umd/**/*",
"scripts/**/*",
"sass/**/*",
"css/**/*"
"css/**/*",
"src/**/*"
],
"keywords": [
"bluemix",
Expand Down
8 changes: 4 additions & 4 deletions tools/rollup.config.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ module.exports = {
plugins: [
resolve({
jsnext: true,
main: true
main: true,
}),
commonjs({
include: 'node_modules/**',
sourceMap: false,
}),
babel({
exclude: 'node_modules/**' // only transpile our source code
exclude: 'node_modules/**',
}),
],
dest: 'demo/demo.js'
};
dest: 'demo/demo.js',
};

0 comments on commit 266d715

Please sign in to comment.