Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
developit committed Feb 23, 2019
2 parents 125d05b + 4ef32f1 commit 952aede
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 21 deletions.
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -117,6 +117,7 @@ Here's what's coming up for Microbundle:
- [brazilian-utils](https://github.com/brazilian-utils/brazilian-utils) Utils library for specific Brazilian businesses.
- [react-hooks-lib](https://github.com/beizhedenglong/react-hooks-lib) A set of reusable react hooks.
- [mdx-deck-live-code](https://github.com/JReinhold/mdx-deck-live-code) A library for [mdx-deck](https://github.com/jxnblk/mdx-deck) to do live React and JS coding directly in slides.
- [react-router-ext](https://github.com/ri7nz/react-router-ext) An Extended [react-router-dom](https://github.com/ReactTraining/react-router/tree/master/packages/react-router-dom) with simple usage.

## 🥂 License

Expand Down
6 changes: 3 additions & 3 deletions src/index.js
Expand Up @@ -418,6 +418,9 @@ function createConfig(options, entry, format, writeMeta) {
}
return externalTest(id);
},
treeshake: {
propertyReadSideEffects: false,
},
plugins: []
.concat(
postcss({
Expand Down Expand Up @@ -592,9 +595,6 @@ function createConfig(options, entry, format, writeMeta) {
freeze: false,
esModule: false,
sourcemap: options.sourcemap,
treeshake: {
propertyReadSideEffects: false,
},
format,
name: options.name,
file: resolve(
Expand Down
38 changes: 20 additions & 18 deletions test/index.test.js
Expand Up @@ -14,26 +14,34 @@ const rimraf = promisify(_rimraf);
const FIXTURES_DIR = `${__dirname}/fixtures`;
const DEFAULT_SCRIPT = 'microbundle';

const times = (n, fn) => Array.from({ length: n }).map(i => fn(i));
const join = (arr, delimiter = '') => arr.join(delimiter);
const constant = konst => () => konst;

const printTree = (nodes, indentLevel = 0) => {
const indent = join(times(indentLevel, constant(' ')));
const indent = ' '.repeat(indentLevel);
return join(
nodes
.filter(node => node.name[0] !== '.')
.map(
node =>
`${indent}${node.name}\n${
node.type === 'directory'
? printTree(node.children, indentLevel + 1)
: ''
}`,
),
.map(node => {
const isDir = node.type === 'directory';
return `${indent}${node.name}\n${
isDir ? printTree(node.children, indentLevel + 1) : ''
}`;
}),
);
};

const getBuildScript = async (fixturePath, defaultScript) => {
let pkg = {};
try {
pkg = JSON.parse(
await readFile(resolve(fixturePath, 'package.json'), 'utf8'),
);
} catch (err) {
if (err.code !== 'ENOENT') throw err;
}
return (pkg && pkg.scripts && pkg.scripts.build) || defaultScript;
};

const parseScript = (() => {
let parsed;
const prog = createProg(_parsed => (parsed = _parsed));
Expand Down Expand Up @@ -65,13 +73,7 @@ describe('fixtures', () => {
await rimraf(resolve(`${fixturePath}/.rts2_cache_es`));
await rimraf(resolve(`${fixturePath}/.rts2_cache_umd`));

let script;
try {
({ scripts: { build: script } = {} } = JSON.parse(
await readFile(resolve(fixturePath, 'package.json'), 'utf8'),
));
} catch (err) {}
script = script || DEFAULT_SCRIPT;
const script = await getBuildScript(fixturePath, DEFAULT_SCRIPT);

const prevDir = process.cwd();
process.chdir(resolve(fixturePath));
Expand Down

0 comments on commit 952aede

Please sign in to comment.