Skip to content

Commit

Permalink
Fixes the-couch#62 - Add multiple entry points support
Browse files Browse the repository at this point in the history
  • Loading branch information
radmedov committed Jul 3, 2020
1 parent 5a4521a commit 0a27fb2
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 9 deletions.
10 changes: 10 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,16 @@
"ideas"
]
},
{
"login": "radmedov",
"name": "ray m",
"avatar_url": "https://avatars0.githubusercontent.com/u/25644432?v=4",
"profile": "https://github.com/radmedov",
"contributions": [
"code",
"ideas"
]
},
{
"login": "mrtamagotchi",
"name": "kotte",
Expand Down
7 changes: 4 additions & 3 deletions packages/compiler/lib/createConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@ const baseConfig = {
module.exports = function createConfig (conf, watch) {
const wc = clone(baseConfig)

wc.entry = {
[path.basename(conf.in, '.js')]: path.resolve(cwd, conf.in)
}
wc.entry = (Array.isArray(conf.in) ? conf.in : [conf.in]).reduce((obj, entry) => {
obj[path.basename(entry, '.js')] = path.resolve(cwd, entry);
return obj;
},{});

/**
* merge output as an object,
Expand Down
4 changes: 2 additions & 2 deletions packages/slater/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ module.exports = function createApp (config) {
console.log('')

return new Promise((res, rej) => {
if (!fs.existsSync(abs(config.assets.in))) return
if (fs.existsSync(Array.isArray(config.assets.in) ? abs(config.assets.in[0]) : abs(config.assets.in))) return

const bundle = compiler(config.assets)

Expand Down Expand Up @@ -209,7 +209,7 @@ module.exports = function createApp (config) {
watchers.map(w => w.close())
})

if (fs.existsSync(abs(config.assets.in))) {
if (fs.existsSync(Array.isArray(config.assets.in) ? abs(config.assets.in[0]) : abs(config.assets.in))) {
const bundle = compiler(config.assets)

bundle.on('error', e => {
Expand Down
8 changes: 4 additions & 4 deletions packages/util/getConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ module.exports = function getConfig (options) {
}
}, require(configpath))

config.assets.alias = {
'@': abs(path.dirname(config.assets.in)),
...(config.assets.alias || {})
}
config.assets.alias = (Array.isArray(config.assets.in) ? config.assets.in : [config.assets.in]).reduce((obj, entry) => {
obj['@'] = abs(path.dirname(entry));
return obj;
},{})

if (!config.assets.presets) {
config.assets.presets = [
Expand Down

0 comments on commit 0a27fb2

Please sign in to comment.