Skip to content

Commit

Permalink
Merge pull request #2 from shifteee/master
Browse files Browse the repository at this point in the history
Sync with upstream
  • Loading branch information
shifteee committed Mar 5, 2018
2 parents 1bffd3c + dc91335 commit 09cf3ef
Show file tree
Hide file tree
Showing 4 changed files with 368 additions and 13 deletions.
3 changes: 2 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const loaderUtils = require('loader-utils');
const flatten = require('lodash.flatten');
const exec = require('webpack-loader-api-exec');

const utils = require('./libs');

Expand All @@ -11,7 +12,7 @@ module.exports = function(source) {

const options = loaderUtils.getOptions(this);
const content = (typeof source === 'string')
? this.exec( source, this.resourcePath )
? exec( source, this.resourcePath )
: source;

const next = this.async();
Expand Down
362 changes: 362 additions & 0 deletions package-lock.json

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

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bem-loader",
"version": "0.2.2",
"version": "0.2.4",
"description": "",
"homepage": "https://github.com/shifteee/bem-loader.git",
"main": "index.js",
Expand All @@ -20,7 +20,8 @@
"glob": "^7.1.1",
"loader-utils": "^1.1.0",
"lodash.flatten": "^4.4.0",
"lodash.get": "^4.4.2"
"lodash.get": "^4.4.2",
"webpack-loader-api-exec": "^0.1.1"
},
"ignore": [
"**/.*",
Expand Down
Loading

0 comments on commit 09cf3ef

Please sign in to comment.