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

Ignore both swSrc and swDest when globbing for the manifest #2232

Merged
merged 4 commits into from
Sep 25, 2019

Conversation

jeffposnick
Copy link
Contributor

R: @philipwalton

Fixes #2229

We previously had some code that ensured that swDest was omitted from the glob matches when generating the precache manifest.

This extends that to also ignore swSrc in injectManifest mode.

I also improved the that generates the globIgnores value so that instead of just matching anything that has the same basename as swSrc/swDest, it actually uses a full path to the file, relative to globDirectory. This should reduce the chance of a false positive.

@jeffposnick jeffposnick added the Chillin' Not being actively worked on, or deferred for a point in the future. label Sep 24, 2019
@jeffposnick
Copy link
Contributor Author

Actually, let me extend this to ignore the workbox-*.js runtime files that are generated, too.

@coveralls
Copy link

coveralls commented Sep 24, 2019

Coverage Status

Coverage decreased (-0.3%) to 78.992% when pulling 0fdce37 on better-glob-ignores into 4486dff on master.

Copy link
Member

@philipwalton philipwalton left a comment

Choose a reason for hiding this comment

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

LGTM with a few nits.

packages/workbox-build/src/lib/rebase-path.js Outdated Show resolved Hide resolved
packages/workbox-build/src/lib/rebase-path.js Outdated Show resolved Hide resolved
@jeffposnick jeffposnick removed the Chillin' Not being actively worked on, or deferred for a point in the future. label Sep 25, 2019
@workbox-pr-bot
Copy link
Collaborator

PR-Bot Size Plugin

Changed File Sizes

File Before After Change GZipped
packages/workbox-build/build/generate-sw.js 1.99 KB 2.75 KB +38% 1.23 KB ☠️
packages/workbox-build/build/inject-manifest.js 3.13 KB 3.41 KB +9% 1.46 KB

New Files

No new files have been added.

All File Sizes

View Table
File Before After Change GZipped
packages/workbox-background-sync/build/workbox-background-sync.prod.js 3.87 KB 3.87 KB 0% 1.60 KB
packages/workbox-broadcast-update/build/workbox-broadcast-update.prod.js 1.02 KB 1.02 KB 0% 576 B
packages/workbox-build/build/_types.js 41 B 41 B 0% 61 B
packages/workbox-build/build/generate-sw.js 1.99 KB 2.75 KB +38% 1.23 KB ☠️
packages/workbox-build/build/get-manifest.js 1.60 KB 1.60 KB 0% 779 B
packages/workbox-build/build/index.js 613 B 613 B 0% 344 B
packages/workbox-build/build/inject-manifest.js 3.13 KB 3.41 KB +9% 1.46 KB
packages/workbox-cacheable-response/build/workbox-cacheable-response.prod.js 610 B 610 B 0% 356 B
packages/workbox-cli/build/app.js 4.16 KB 4.16 KB 0% 1.64 KB
packages/workbox-cli/build/bin.js 940 B 940 B 0% 502 B
packages/workbox-core/build/workbox-core.prod.js 6.42 KB 6.42 KB 0% 2.66 KB
packages/workbox-expiration/build/workbox-expiration.prod.js 2.95 KB 2.95 KB 0% 1.27 KB
packages/workbox-google-analytics/build/workbox-offline-ga.prod.js 1.97 KB 1.97 KB 0% 915 B
packages/workbox-navigation-preload/build/workbox-navigation-preload.prod.js 659 B 659 B 0% 322 B
packages/workbox-precaching/build/workbox-precaching.prod.js 4.95 KB 4.95 KB 0% 1.92 KB
packages/workbox-range-requests/build/workbox-range-requests.prod.js 1.58 KB 1.58 KB 0% 800 B
packages/workbox-routing/build/workbox-routing.prod.js 3.09 KB 3.09 KB 0% 1.35 KB
packages/workbox-strategies/build/workbox-strategies.prod.js 4.10 KB 4.10 KB 0% 1.13 KB
packages/workbox-streams/build/workbox-streams.prod.js 1.44 KB 1.44 KB 0% 697 B
packages/workbox-sw/build/workbox-sw.js 1.34 KB 1.34 KB 0% 746 B
packages/workbox-webpack-plugin/build/generate-sw.js 4.22 KB 4.22 KB 0% 1.61 KB
packages/workbox-webpack-plugin/build/index.js 349 B 349 B 0% 255 B
packages/workbox-webpack-plugin/build/inject-manifest.js 5.10 KB 5.10 KB 0% 1.77 KB
packages/workbox-window/build/workbox-window.dev.umd.js 41.51 KB 41.51 KB 0% 9.20 KB
packages/workbox-window/build/workbox-window.prod.umd.js 4.52 KB 4.52 KB 0% 1.85 KB

Workbox Aggregate Size Plugin

3.51KB gzip'ed (23% of limit)
7.93KB uncompressed

@jeffposnick jeffposnick merged commit bfd5c71 into master Sep 25, 2019
@jeffposnick jeffposnick deleted the better-glob-ignores branch September 25, 2019 13:54
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.

Ensure that swSrc is automatically added to globIgnores
4 participants