Skip to content

Commit

Permalink
remove bublé and run transpilation on babel
Browse files Browse the repository at this point in the history
  • Loading branch information
@wardpeet
wardpeet committed May 25, 2019
1 parent f8e8cc8 commit 1cf6864
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 56 deletions.
7 changes: 3 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,9 @@
"pretty-bytes": "^5.2.0",
"rollup": "^1.11.3",
"rollup-plugin-alias": "^1.5.1",
"rollup-plugin-babel": "^4.1.0-0",
"rollup-plugin-buble": "^0.19.4",
"rollup-plugin-bundle-size": "^1.0.3",
"rollup-plugin-commonjs": "^9.3.4",
"rollup-plugin-babel": "^4.3.2",
"rollup-plugin-bundle-size": "^1.0.1",
"rollup-plugin-commonjs": "^9.0.0",
"rollup-plugin-es3": "^1.1.0",
"rollup-plugin-flow": "^1.1.1",
"rollup-plugin-json": "^4.0.0",
Expand Down
111 changes: 59 additions & 52 deletions src/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { rollup, watch } from 'rollup';
import commonjs from 'rollup-plugin-commonjs';
import babel from 'rollup-plugin-babel';
import nodeResolve from 'rollup-plugin-node-resolve';
import buble from 'rollup-plugin-buble';
import { terser } from 'rollup-plugin-terser';
import alias from 'rollup-plugin-alias';
import postcss from 'rollup-plugin-postcss';
Expand Down Expand Up @@ -238,7 +237,7 @@ export default async function microbundle(inputOptions) {
return (
blue(
`Build "${options.name}" to ${relative(cwd, dirname(options.output)) ||
'.'}:`,
'.'}:`,
) +
'\n ' +
out.join('\n ')
Expand Down Expand Up @@ -301,8 +300,8 @@ async function jsOrTs(cwd, filename) {
const extension = (await isFile(resolve(cwd, filename + '.ts')))
? '.ts'
: (await isFile(resolve(cwd, filename + '.tsx')))
? '.tsx'
: '.js';
? '.tsx'
: '.js';

return resolve(cwd, `${filename}${extension}`);
}
Expand All @@ -315,13 +314,13 @@ async function getInput({ entries, cwd, source, module }) {
entries && entries.length
? entries
: (source &&
(Array.isArray(source) ? source : [source]).map(file =>
resolve(cwd, file),
)) ||
((await isDir(resolve(cwd, 'src'))) &&
(await jsOrTs(cwd, 'src/index'))) ||
(await jsOrTs(cwd, 'index')) ||
module,
(Array.isArray(source) ? source : [source]).map(file =>
resolve(cwd, file),
)) ||
((await isDir(resolve(cwd, 'src'))) &&
(await jsOrTs(cwd, 'src/index'))) ||
(await jsOrTs(cwd, 'index')) ||
module,
)
.map(file => glob(file))
.forEach(file => input.push(...file));
Expand Down Expand Up @@ -449,7 +448,7 @@ function createConfig(options, entry, format, writeMeta) {
nameCache.minify,
);
}
} catch (e) {}
} catch (e) { }
}
loadNameCache();

Expand Down Expand Up @@ -478,20 +477,20 @@ function createConfig(options, entry, format, writeMeta) {
plugins: [
autoprefixer(),
options.compress !== false &&
cssnano({
preset: 'default',
}),
cssnano({
preset: 'default',
}),
].filter(Boolean),
// only write out CSS for the first bundle (avoids pointless extra files):
inject: false,
extract: !!writeMeta,
}),
Object.keys(moduleAliases).length > 0 &&
alias(
Object.assign({}, moduleAliases, {
resolve: EXTENSIONS,
}),
),
alias(
Object.assign({}, moduleAliases, {
resolve: EXTENSIONS,
}),
),
nodeResolve({
mainFields: ['module', 'jsnext', 'main'],
browser: options.target !== 'node',
Expand Down Expand Up @@ -522,22 +521,22 @@ function createConfig(options, entry, format, writeMeta) {
},
},
useTypescript &&
typescript({
typescript: require('typescript'),
cacheRoot: `./node_modules/.cache/.rts2_cache_${format}`,
tsconfigDefaults: {
compilerOptions: {
sourceMap: options.sourcemap,
declaration: true,
jsx: options.jsx,
},
typescript({
typescript: require('typescript'),
cacheRoot: `./node_modules/.cache/.rts2_cache_${format}`,
tsconfigDefaults: {
compilerOptions: {
sourceMap: options.sourcemap,
declaration: true,
jsx: options.jsx,
},
tsconfigOverride: {
compilerOptions: {
target: 'esnext',
},
},
tsconfigOverride: {
compilerOptions: {
target: 'esnext',
},
}),
},
}),
!useTypescript && flow({ all: true, pretty: true }),
babel({
babelrc: false,
Expand All @@ -551,16 +550,24 @@ function createConfig(options, entry, format, writeMeta) {
],
],
}),
// Only used for async await
babel({
// We mainly use bublé to transpile JS and only use babel to
// transpile down `async/await`. To prevent conflicts with user
// supplied configurations we set this option to false. Note
// that we never supported using custom babel configs anyway.
babelrc: false,
configFile: false,
extensions: EXTENSIONS,
exclude: 'node_modules/**',
presets: [
[
'@babel/preset-env',
{
loose: true,
modules: false,
debug: true,
useBuiltIns: 'usage',
corejs: 2,
targets:
options.target === 'node' ? { node: '6' } : undefined,
exclude: ['transform-async-to-generator'],
},
],
],
plugins: [
require.resolve('@babel/plugin-syntax-jsx'),
[
Expand All @@ -577,15 +584,15 @@ function createConfig(options, entry, format, writeMeta) {
],
],
}),
buble({
exclude: 'node_modules/**',
jsx: options.jsx || 'h',
objectAssign: options.assign || 'Object.assign',
transforms: {
dangerousForOf: true,
dangerousTaggedTemplateString: true,
},
}),
// buble({
// exclude: 'node_modules/**',
// jsx: options.jsx || 'h',
// objectAssign: options.assign || 'Object.assign',
// transforms: {
// dangerousForOf: true,
// dangerousTaggedTemplateString: true,
// },
// }),
// We should upstream this to rollup
// format==='cjs' && replace({
// [`module.exports = ${rollupName};`]: '',
Expand Down Expand Up @@ -661,8 +668,8 @@ function createConfig(options, entry, format, writeMeta) {
file: resolve(
options.cwd,
(format === 'es' && moduleMain) ||
(format === 'umd' && umdMain) ||
cjsMain,
(format === 'umd' && umdMain) ||
cjsMain,
),
},
};
Expand Down

0 comments on commit 1cf6864

Please sign in to comment.