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

Loaders: Replace JSZip and gunzip with fflate. #20959

Merged
merged 2 commits into from
Dec 29, 2020
Merged

Conversation

Mugen87
Copy link
Collaborator

@Mugen87 Mugen87 commented Dec 29, 2020

Related issue: Fixed #20941.

Description

This PR replaces the loader dependencies JSZip and gunzip with fflate.

To completely remove JSZip, it would be necessary to refactor some code in the editor (although I don't think this task is that urgent and can be done later).

It was also necessary to slightly enhance modularize.js so it's possible to convert the usage of fflate from js -> jsm.

Copy link

@101arrowz 101arrowz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks mostly correct, and the demos that I tested do seem to work.

examples/js/loaders/3MFLoader.js Outdated Show resolved Hide resolved
examples/js/loaders/3MFLoader.js Outdated Show resolved Hide resolved
examples/js/loaders/3MFLoader.js Outdated Show resolved Hide resolved
@Mugen87
Copy link
Collaborator Author

Mugen87 commented Dec 29, 2020

Okay, I've cleaned up the usage of fflate in 3MFLoader.

@mrdoob
Copy link
Owner

mrdoob commented Dec 29, 2020

This is awesome. You guys are the best! 🤗

@mrdoob mrdoob added this to the r125 milestone Dec 29, 2020
@mrdoob mrdoob merged commit 6eee336 into mrdoob:dev Dec 29, 2020
@mrdoob
Copy link
Owner

mrdoob commented Dec 29, 2020

Thanks! ✨

@@ -13,6 +13,7 @@ const assets = [
'../examples/jsm/controls/TransformControls.js',

'../examples/jsm/libs/chevrotain.module.min.js',
'../examples/jsm/libs/fflate.module.min.js',
'../examples/jsm/libs/inflate.module.min.js',
'../examples/jsm/libs/jszip.module.min.js',
Copy link
Owner

@mrdoob mrdoob Dec 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need inflate and jszip there?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I just saw #20941 (comment)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[124] TiltLoader breaks in a module env
3 participants