diff --git a/.gitignore b/.gitignore index 82e3b88..c3d8acf 100644 --- a/.gitignore +++ b/.gitignore @@ -61,6 +61,7 @@ typings/ .idea # Compiled module -/es/ +/lib/ +/index.js /test/.coverage/ diff --git a/package.json b/package.json index a968887..e3026e2 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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" diff --git a/src/index.js b/src/index.js new file mode 100644 index 0000000..059138e --- /dev/null +++ b/src/index.js @@ -0,0 +1,3 @@ +import {festLoader} from './lib/loader'; + +export default festLoader; diff --git a/src/filter-nodes.js b/src/lib/filter-nodes.js similarity index 100% rename from src/filter-nodes.js rename to src/lib/filter-nodes.js diff --git a/src/get-dependencies.js b/src/lib/get-dependencies.js similarity index 100% rename from src/get-dependencies.js rename to src/lib/get-dependencies.js diff --git a/src/get-parser.js b/src/lib/get-parser.js similarity index 100% rename from src/get-parser.js rename to src/lib/get-parser.js diff --git a/src/loader.js b/src/lib/loader.js similarity index 98% rename from src/loader.js rename to src/lib/loader.js index e07d4d8..ec36764 100644 --- a/src/loader.js +++ b/src/lib/loader.js @@ -58,7 +58,7 @@ function compile(source, { }); } -export default function festLoader(source) { +export function festLoader(source) { const callback = this.async(); let options; diff --git a/src/nodes.js b/src/lib/nodes.js similarity index 100% rename from src/nodes.js rename to src/lib/nodes.js diff --git a/test/compiler.js b/test/compiler.js index ea48be6..3898f36 100644 --- a/test/compiler.js +++ b/test/compiler.js @@ -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 } }] diff --git a/test/loader.test.js b/test/loader.test.js index 4efb7bb..6ee6ad4 100644 --- a/test/loader.test.js +++ b/test/loader.test.js @@ -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';