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.

Sign up for GitHub

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

Fix minified bundle #3261

Merged
merged 13 commits into from
Dec 13, 2019
Merged

Fix minified bundle #3261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e9eaaaa
Add failing bundle tests
cgewecke Dec 7, 2019
bc23107
Use "entry" for preset-env
cgewecke Dec 7, 2019
89a71fd
Add babel polyfill to gulp browserify step
cgewecke Dec 7, 2019
5f6e00d
Cleanup diff
cgewecke Dec 7, 2019
84372e3
Update CHANGELOG.md
cgewecke Dec 7, 2019
3d6e6d7
Rename surge to cdn
cgewecke Dec 9, 2019
cb91051
Remove unnecessary karma flag, improve comments
cgewecke Dec 9, 2019
8cc70a4
Cap test name
cgewecke Dec 9, 2019
6f14072
Add it block to have one test
cgewecke Dec 9, 2019
bcb5153
gulp-babel and babel/polyfill package removed and babelify added to g…
nivida Dec 10, 2019
ec7ddf4
'regenerator-runtime' does now get added manually in the build pipeli…
nivida Dec 10, 2019
85bdd21
Always publish e2e to sudden-playground.surge.sh
cgewecke Dec 10, 2019
38c5c54
Remove unnecessary formatting changes from gulpfile
cgewecke Dec 10, 2019
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,5 +116,6 @@ Released with 1.0.0-beta.37 code base.

### Fixed

- Fix minified bundle (#3256)
- ``defaultBlock`` property handling fixed (#3247)
- ``clearSubscriptions`` does no longer throw an error if no running subscriptions do exist (#3246)
2 changes: 1 addition & 1 deletion dist/web3.min.js
View file
Open in desktop

Large diffs are not rendered by default.

27 changes: 20 additions & 7 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ var gulp = require('gulp');
var browserify = require('browserify');
var jshint = require('gulp-jshint');
var uglify = require('gulp-uglify');
var babel = require('gulp-babel');
var rename = require('gulp-rename');
var source = require('vinyl-source-stream');
var exorcist = require('exorcist');
Expand Down Expand Up @@ -167,6 +166,7 @@ packages.forEach(function(pckg, i) {
var stream = browserify(browserifyOptions)
.require(pckg.src, {expose: pckg.expose})
.require('bn.js', {expose: 'BN'}) // expose it to dapp developers
.add('./node_modules/regenerator-runtime')
.add(pckg.src);

if (pckg.ignore) {
Expand All @@ -175,7 +175,24 @@ packages.forEach(function(pckg, i) {
});
}

var bundle = stream.bundle();
var bundle = stream.transform(
"babelify",
{
global: true,
presets: [
[
"@babel/preset-env",
{
useBuiltIns: 'entry',
corejs: 3,
targets: {
ie: 10
}
}
]
]
}
).bundle();

stream = bundle
.pipe(exorcist(path.join(DEST, pckg.fileName + '.js.map')));
Expand All @@ -185,11 +202,7 @@ packages.forEach(function(pckg, i) {
.pipe(exorcist(path.join(WEB3_PACKAGE_DEST, pckg.fileName + '.js.map')));
}

stream = stream.pipe(source(pckg.fileName + '.js'))
.pipe(streamify(babel({
compact: false,
presets: [[ '@babel/preset-env', { "useBuiltIns": "usage", "corejs": 2 } ]]
})));
stream = stream.pipe(source(pckg.fileName + '.js'));

if (pckg.fileName === 'web3') {
stream = stream
Expand Down
25 changes: 19 additions & 6 deletions karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,31 @@ if (!process.env.TRAVIS){
process.env.CHROME_BIN = require('puppeteer').executablePath();
}

// BROWSER_BUNDLE_TEST is set for an un-browserified check that both bundles load correctly.
// BROWSER_BUNDLE_TEST is not set for the e2e unit tests, which check that bundle internals are ok.
function getTestFiles(){
nivida marked this conversation as resolved.
Show resolved Hide resolved
switch (process.env.BROWSER_BUNDLE_TEST){
case 'publishedDist': return ["packages/web3/dist/web3.min.js", "test/e2e.minified.js"]
case 'gitRepoDist': return ["dist/web3.min.js", "test/e2e.minified.js"]
default: return ["test/**/e2e*.js"]
}
}

// Only loads browserified preprocessor for the logic unit tests so we can `require` stuff.
function getPreprocessors(){
if (!process.env.BROWSER_BUNDLE_TEST){
nivida marked this conversation as resolved.
Show resolved Hide resolved
return { 'test/**/e2e*.js': [ 'browserify' ] }
}
}

module.exports = function (config) {
var configuration = {
frameworks: [
'mocha',
'browserify'
],
files: [
'test/**/e2e*.js'
],
preprocessors: {
'test/**/e2e*.js': [ 'browserify' ]
},
files: getTestFiles(),
preprocessors: getPreprocessors(),
plugins: [
'karma-chrome-launcher',
'karma-firefox-launcher',
Expand Down
Loading