Skip to content

Commit

Permalink
Merge 29d58c0 into b64f295
Browse files Browse the repository at this point in the history
  • Loading branch information
ogonkov committed Oct 30, 2020
2 parents b64f295 + 29d58c0 commit 78640d9
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ typings/
.idea

# Compiled module
/es/
/lib/
/index.js

/test/.coverage/
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "fest-webpack-loader",
"version": "2.3.0",
"description": "Webpack loader for fest",
"main": "es/loader.js",
"main": "index.js",
"dependencies": {},
"devDependencies": {
"@babel/cli": "^7.12.1",
Expand All @@ -28,7 +28,7 @@
"lint": "eslint src",
"pretest": "rm -rf test/.coverage && npm run lint",
"test": "jest",
"build": "rm -rf es && babel src --out-dir=es",
"build": "rm -rf index.js lib && babel src --out-dir=.",
"preversion": "npm test",
"postversion": "git push && git push --tags",
"prepack": "npm run build"
Expand Down
3 changes: 3 additions & 0 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import {festLoader} from './lib/loader';

export default festLoader;
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/loader.js → src/lib/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function compile(source, {
});
}

export default function festLoader(source) {
export function festLoader(source) {
const callback = this.async();

let options;
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion test/compiler.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default (fixture, options = {}) => {
rules: [{
test: /\.xml$/,
use: {
loader: path.resolve(__dirname, '../src/loader.js'),
loader: path.resolve(__dirname, '..', 'src', 'index.js'),
options: options
}
}]
Expand Down
2 changes: 1 addition & 1 deletion test/loader.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fs from 'fs';
import path from 'path';
import util from 'util';
import loader from '../src/loader';
import {festLoader as loader} from '../src/lib/loader';
import compiler from './compiler.js';
import {getOutput} from './get-output';
import {getLoaderContext} from './get-loader-context';
Expand Down

0 comments on commit 78640d9

Please sign in to comment.