diff --git a/lib/pipeline/pipeline.js b/lib/pipeline/pipeline.js index fd97a0f6..19f495a5 100644 --- a/lib/pipeline/pipeline.js +++ b/lib/pipeline/pipeline.js @@ -106,6 +106,17 @@ class Pipeline { { loader: "style-loader" }, { loader: "css-loader" } ] + }, + { + test: /\.scss$/, + use: [ + { loader: "style-loader" }, + { loader: "css-loader" } + ] + }, + { + test: /\.(png|woff|woff2|eot|ttf|svg)$/, + loader: 'url-loader?limit=100000' } ] } diff --git a/package.json b/package.json index eb448544..e55f6670 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "css-loader": "^0.28.7", "ejs": "^2.5.7", "ethereumjs-testrpc": "3.9.2", + "file-loader": "^1.1.5", "finalhandler": "^0.5.0", "follow-redirects": "^1.2.4", "fs-extra": "^2.0.0", @@ -43,6 +44,7 @@ "toposort": "^1.0.0", "underscore": "^1.8.3", "underscore.string": "^3.3.4", + "url-loader": "^0.6.2", "web3": "^0.19.1" }, "author": "Iuri Matias ", diff --git a/test_app/app/index.html b/test_app/app/index.html index bcd23a08..80a00fa2 100644 --- a/test_app/app/index.html +++ b/test_app/app/index.html @@ -1,9 +1,9 @@ Embark - SimpleStorage Demo - + - + diff --git a/test_app/app/js/index.js b/test_app/app/js/index.js index 1ba8d4e2..bbae71d6 100644 --- a/test_app/app/js/index.js +++ b/test_app/app/js/index.js @@ -1,6 +1,10 @@ /*globals $, SimpleStorage, document*/ -import $ from './_vendor/jquery.min'; +//import $ from './_vendor/jquery.min'; +import $ from 'jquery'; +import 'bootstrap'; +import 'bootstrap/dist/css/bootstrap.min.css'; +//import 'bootstrap/dist/js/bootstrap.min.js'; import EmbarkJS from 'Embark/EmbarkJS'; import SimpleStorage from 'Embark/contracts/SimpleStorage'; diff --git a/test_app/package.json b/test_app/package.json index ddf18ab5..dd05b590 100644 --- a/test_app/package.json +++ b/test_app/package.json @@ -11,7 +11,9 @@ "homepage": "", "devDependencies": {}, "dependencies": { + "bootstrap": "^3.3.6", "embark-babel": "^1.0.0", - "embark-service": "./extensions/embark-service" + "embark-service": "./extensions/embark-service", + "jquery": "^1.11.3" } }