[AssetMapper] Fix file deleting errors & remove nullable MappedAsset on JS import #52331
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stof
approved these changes
Oct 27, 2023
fabpot
force-pushed
the
asset-mapper-fix-file-deletes
branch
from
300f157
to
f1708aa
Compare
|
Thank you @weaverryan. |
xabbuh
added a commit
that referenced
this pull request
Oct 29, 2023
This PR was merged into the 6.4 branch. Discussion ---------- [AssetMapper] Fixing merge | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | None | License | MIT Fixing the merge of #52323, #52331 and #52349 Also tested on a real project locally to verify the moving pieces :). Thanks! Commits ------- 99d5cbb [AssetMapper] Fixing merge from multiple PR's
This was referenced Oct 29, 2023
Merged
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi!
This PR accomplishes 2 things:
A) If
app.jsimportedfoo.js, and you deletedfoo.js, you got a big, unobvious error from Symfony. This was because theMappedAssetbehindapp.jsremained cached, including theJavaScriptImportforfoo.js. So then, the system was surprised whenapp.jshad thisJavaScriptImport... but the underlying file didn't exist. The fix was to add aFileExistenceResourceforfoo.js. We don't need to update theapp.jscache iffoo.jschanges, but we DO need to update it iffoo.jsno longer exists (so that we can create a newMappedAssetwithout the import).B) Upon looking at this, previously,
JavaScriptImport.assetwas nullable. That doesn't make sense, now that all vendor files are downloaded locally and exist in the AssetMapper. TheMappedAsset.javascriptImportsare used to implicitly add importmap entries for relative assets (which already required aMappedAsset) and to preload other dependencies. Previously, we added aJavaScriptImportwith a null asset for things like absolute imports (`import 'https://example.com/foo.js') or bare imports that we couldn't find. But we can't preload things like this anyway - or we shouldn't bother to in the case of an absolute assets.For (B), trying to tighten things up and do LESS, if we don't need it.
Cheers!