Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Babel 7 #10293

Merged
merged 1 commit into from
Nov 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,11 @@ function createWebpackConfig(defines, output) {
// babel is too slow
exclude: /src[\\\/]core[\\\/](glyphlist|unicode)/,
options: {
presets: skipBabel ? undefined : ['env'],
presets: skipBabel ? undefined : ['@babel/preset-env'],
plugins: [
'transform-es2015-modules-commonjs',
['transform-runtime', {
'@babel/plugin-transform-modules-commonjs',
['@babel/plugin-transform-runtime', {
'helpers': false,
'polyfill': false,
'regenerator': true,
}],
],
Expand Down Expand Up @@ -903,25 +902,24 @@ gulp.task('lib', ['buildnumber'], function () {
content = preprocessor2.preprocessPDFJSCode(ctx, content);
content = babel.transform(content, {
sourceType: 'module',
presets: noPreset ? undefined : ['env'],
presets: noPreset ? undefined : ['@babel/preset-env'],
plugins: [
'transform-es2015-modules-commonjs',
['transform-runtime', {
'@babel/plugin-transform-modules-commonjs',
['@babel/plugin-transform-runtime', {
'helpers': false,
'polyfill': false,
'regenerator': true,
}],
babelPluginReplaceNonWebPackRequire,
],
}).code;
var removeCjsSrc =
/^(var\s+\w+\s*=\s*require\('.*?)(?:\/src)(\/[^']*'\);)$/gm;
content = content.replace(removeCjsSrc, function (all, prefix, suffix) {
// eslint-disable-next-line max-len
var removeCjsSrc = /^(var\s+\w+\s*=\s*(_interopRequireDefault\()?require\(".*?)(?:\/src)(\/[^"]*"\)\)?;)$/gm;
content = content.replace(removeCjsSrc, (all, prefix, interop, suffix) => {
return prefix + suffix;
});
return licenseHeaderLibre + content;
}
var babel = require('babel-core');
var babel = require('@babel/core');
var versionInfo = getVersionJSON();
var ctx = {
rootPath: __dirname,
Expand Down
Loading