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

Remove usage of createRequire in core image #6488

Merged
merged 7 commits into from
Mar 9, 2023
Merged

Conversation

matthewp
Copy link
Contributor

@matthewp matthewp commented Mar 9, 2023

Changes

Testing

  • Just manually. Not sure if there aren't other Netlify bugs underneath this.

Docs

N/A, bug fix

@changeset-bot
Copy link

changeset-bot bot commented Mar 9, 2023

🦋 Changeset detected

Latest commit: 68b6209

The changes in this PR will be included in the next version bump.

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@github-actions github-actions bot added the pkg: astro Related to the core `astro` package (scope) label Mar 9, 2023
import { ImageMetadata, InputFormat } from '../types.js';
const require = createRequire(import.meta.url);
const require = createRequire(getModuleURL(import.meta.url));
const sizeOf = require('image-size');
Copy link
Member

Choose a reason for hiding this comment

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

Would using a normal import fix the problem? If so, it might be worth investigating that. I only used require to workaround a weird issue I had going on during dev, but it might not be required. The image integration actually imported the same package without a require

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah I noticed that. I assumed it was necessary for a reason. I agree, I'll try that and see what happens.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Switched to import, thanks for the suggestion

@matthewp
Copy link
Contributor Author

matthewp commented Mar 9, 2023

!preview image-image-size

@github-actions
Copy link
Contributor

github-actions bot commented Mar 9, 2023

 > [email protected] release /home/runner/work/astro/astro > pnpm run build && changeset publish "--tag" "next--image-image-size" > [email protected] build /home/runner/work/astro/astro > turbo run build --output-logs=new-only --no-deps --filter=astro --filter=create-astro --filter="@astrojs/*" --filter="@benchmark/*" �[2m• Packages in scope: @astrojs/alpinejs, @astrojs/cloudflare, @astrojs/deno, @astrojs/image, @astrojs/lit, @astrojs/markdoc, @astrojs/markdown-component, @astrojs/markdown-remark, @astrojs/mdx, @astrojs/netlify, @astrojs/node, @astrojs/partytown, @astrojs/preact, @astrojs/prefetch, @astrojs/prism, @astrojs/react, @astrojs/rss, @astrojs/sitemap, @astrojs/solid-js, @astrojs/svelte, @astrojs/tailwind, @astrojs/telemetry, @astrojs/turbolinks, @astrojs/vercel, @astrojs/vue, @astrojs/webapi, @benchmark/timer, astro, create-astro�[0m �[2m• Running�[0m �[2m�[1mbuild�[0m�[0m �[2min 29 packages�[0m �[2m• Remote computation caching enabled (experimental)�[0m �[35m@astrojs/webapi:build: �[0mcache hit, suppressing output �[2m062e8d7a80398c28�[0m �[33mcreate-astro:build: �[0mcache hit, suppressing output �[2m5ffb2d015d7b472f�[0m �[36m@astrojs/prism:build: �[0mcache hit, suppressing output �[2m028e1cc2bb2b2026�[0m �[34m@astrojs/telemetry:build: �[0mcache hit, suppressing output �[2mf15778396696a3c4�[0m �[35m@astrojs/markdown-remark:build: �[0mcache hit, suppressing output �[2m1e9682b4cb82cc24�[0m �[32mastro:build: �[0mcache miss, executing �[2m564a380193d98a4e�[0m �[32mastro:build: �[0m �[32mastro:build: �[0m> [email protected] build /home/runner/work/astro/astro/packages/astro �[32mastro:build: �[0m> pnpm run prebuild && astro-scripts build "src/**/*.ts" && tsc && pnpm run postbuild �[32mastro:build: �[0m �[32mastro:build: �[0m �[32mastro:build: �[0m> [email protected] prebuild /home/runner/work/astro/astro/packages/astro �[32mastro:build: �[0m> astro-scripts prebuild --to-string "src/runtime/server/astro-island.ts" "src/runtime/client/{idle,load,media,only,visible}.ts" �[32mastro:build: �[0m �[32mastro:build: �[0m �[32mastro:build: �[0m> [email protected] postbuild /home/runner/work/astro/astro/packages/astro �[32mastro:build: �[0m> astro-scripts copy "src/**/*.astro" && astro-scripts copy "src/**/*.wasm" �[32mastro:build: �[0m �[35m@astrojs/cloudflare:build: �[0mcache miss, executing �[2me97b3878af5e1be8�[0m �[33m@astrojs/vue:build: �[0mcache miss, executing �[2m2eb70b0009bfb3f2�[0m �[35m@astrojs/lit:build: �[0mcache miss, executing �[2mb12bae76bd082408�[0m �[34m@astrojs/mdx:build: �[0mcache miss, executing �[2mc51c8e4eac8dd806�[0m �[36m@astrojs/svelte:build: �[0mcache miss, executing �[2m6b5323aac406503b�[0m �[36m@astrojs/partytown:build: �[0mcache miss, executing �[2m0b2b1f5cc411d9a2�[0m �[32m@astrojs/image:build: �[0mcache miss, executing �[2m69c4361cf11cc1e1�[0m �[32m@astrojs/preact:build: �[0mcache miss, executing �[2m5391b574a58669f1�[0m �[34m@astrojs/react:build: �[0mcache miss, executing �[2maf381954d00b2a2a�[0m �[33m@astrojs/solid-js:build: �[0mcache miss, executing �[2m4a7e868990a3ecfb�[0m �[35m@astrojs/cloudflare:build: �[0m �[35m@astrojs/cloudflare:build: �[0m> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/cloudflare �[35m@astrojs/cloudflare:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[35m@astrojs/cloudflare:build: �[0m �[35m@astrojs/lit:build: �[0m �[35m@astrojs/lit:build: �[0m> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/lit �[35m@astrojs/lit:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[35m@astrojs/lit:build: �[0m �[32m@astrojs/preact:build: �[0m �[32m@astrojs/preact:build: �[0m> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/preact �[32m@astrojs/preact:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[32m@astrojs/preact:build: �[0m �[32m@astrojs/image:build: �[0m �[32m@astrojs/image:build: �[0m> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/image �[32m@astrojs/image:build: �[0m> astro-scripts build "src/**/*.ts" && tsc && pnpm run postbuild �[32m@astrojs/image:build: �[0m �[33m@astrojs/vue:build: �[0m �[33m@astrojs/vue:build: �[0m> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/vue �[33m@astrojs/vue:build: �[0m> astro-scripts build "src/index.ts" && astro-scripts build "src/editor.cts" --force-cjs --no-clean-dist && tsc �[33m@astrojs/vue:build: �[0m �[34m@astrojs/mdx:build: �[0m �[34m@astrojs/mdx:build: �[0m> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/mdx �[34m@astrojs/mdx:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[34m@astrojs/mdx:build: �[0m �[36m@astrojs/partytown:build: �[0m �[36m@astrojs/partytown:build: �[0m> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/partytown �[36m@astrojs/partytown:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[36m@astrojs/partytown:build: �[0m �[36m@astrojs/svelte:build: �[0m �[36m@astrojs/svelte:build: �[0m> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/svelte �[36m@astrojs/svelte:build: �[0m> astro-scripts build "src/index.ts" && astro-scripts build "src/editor.cts" --force-cjs --no-clean-dist && tsc �[36m@astrojs/svelte:build: �[0m �[33m@astrojs/solid-js:build: �[0m �[33m@astrojs/solid-js:build: �[0m> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/solid �[33m@astrojs/solid-js:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[33m@astrojs/solid-js:build: �[0m �[34m@astrojs/react:build: �[0m �[34m@astrojs/react:build: �[0m> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/react �[34m@astrojs/react:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[34m@astrojs/react:build: �[0m �[33m@astrojs/node:build: �[0mcache miss, executing �[2m37ca0ca9e166a2d7�[0m �[34m@astrojs/tailwind:build: �[0mcache miss, executing �[2md78052bf758fc965�[0m �[35m@astrojs/turbolinks:build: �[0mcache miss, executing �[2med58dcfb3aad95be�[0m �[32m@astrojs/rss:build: �[0mcache miss, executing �[2m07e42be37ff1a3aa�[0m �[33m@astrojs/prefetch:build: �[0mcache miss, executing �[2madad288d5a78ed2d�[0m �[34m@benchmark/timer:build: �[0mcache miss, executing �[2md40f44b968ff08df�[0m �[35m@astrojs/netlify:build: �[0mcache miss, executing �[2mb296a3b089a202f4�[0m �[36m@astrojs/sitemap:build: �[0mcache miss, executing �[2md30d098c3a3ce4f2�[0m �[33m@astrojs/node:build: �[0m �[33m@astrojs/node:build: �[0m> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/node �[33m@astrojs/node:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[33m@astrojs/node:build: �[0m �[34m@astrojs/tailwind:build: �[0m �[34m@astrojs/tailwind:build: �[0m> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/tailwind �[34m@astrojs/tailwind:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[34m@astrojs/tailwind:build: �[0m �[35m@astrojs/turbolinks:build: �[0m �[35m@astrojs/turbolinks:build: �[0m> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/turbolinks �[35m@astrojs/turbolinks:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[35m@astrojs/turbolinks:build: �[0m �[32m@astrojs/vercel:build: �[0mcache miss, executing �[2m983ec0fc978fc19b�[0m �[32m@astrojs/rss:build: �[0m �[32m@astrojs/rss:build: �[0m> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/astro-rss �[32m@astrojs/rss:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[32m@astrojs/rss:build: �[0m �[33m@astrojs/prefetch:build: �[0m �[33m@astrojs/prefetch:build: �[0m> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/prefetch �[33m@astrojs/prefetch:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[33m@astrojs/prefetch:build: �[0m �[34m@benchmark/timer:build: �[0m �[34m@benchmark/timer:build: �[0m> @benchmark/[email protected] build /home/runner/work/astro/astro/benchmark/packages/timer �[34m@benchmark/timer:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[34m@benchmark/timer:build: �[0m �[36m@astrojs/sitemap:build: �[0m �[36m@astrojs/sitemap:build: �[0m> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/sitemap �[36m@astrojs/sitemap:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[36m@astrojs/sitemap:build: �[0m �[35m@astrojs/netlify:build: �[0m �[35m@astrojs/netlify:build: �[0m> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/netlify �[35m@astrojs/netlify:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[35m@astrojs/netlify:build: �[0m �[32m@astrojs/vercel:build: �[0m �[32m@astrojs/vercel:build: �[0m> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/vercel �[32m@astrojs/vercel:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[32m@astrojs/vercel:build: �[0m �[33m@astrojs/markdoc:build: �[0mcache miss, executing �[2m0d197e3df02f03e7�[0m �[34m@astrojs/alpinejs:build: �[0mcache miss, executing �[2me9fcf3d84368104a�[0m �[32m@astrojs/image:build: �[0m �[32m@astrojs/image:build: �[0m> @astrojs/[email protected] postbuild /home/runner/work/astro/astro/packages/integrations/image �[32m@astrojs/image:build: �[0m> astro-scripts copy "src/**/*.wasm" �[32m@astrojs/image:build: �[0m �[36m@astrojs/deno:build: �[0mcache miss, executing �[2m932a850c14d26f8a�[0m �[34m@astrojs/alpinejs:build: �[0m �[34m@astrojs/alpinejs:build: �[0m> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/alpinejs �[34m@astrojs/alpinejs:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[34m@astrojs/alpinejs:build: �[0m �[33m@astrojs/markdoc:build: �[0m �[33m@astrojs/markdoc:build: �[0m> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/markdoc �[33m@astrojs/markdoc:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[33m@astrojs/markdoc:build: �[0m �[36m@astrojs/deno:build: �[0m �[36m@astrojs/deno:build: �[0m> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/deno �[36m@astrojs/deno:build: �[0m> astro-scripts build "src/**/*.ts" && tsc �[36m@astrojs/deno:build: �[0m Tasks: 28 successful, 28 total Cached: 5 cached, 28 total Time: 1m14.041s Package �[36m"@astrojs/markdown-remark"�[39m must depend on the current version of �[36m"astro"�[39m: �[32m"0.0.0-image-image-size-20230309180922"�[39m vs �[31m"^2.1.0"�[39m 🦋 �[33mwarn�[39m �[31m===============================IMPORTANT!===============================�[39m 🦋 �[33mwarn�[39m Packages will be released under the next--image-image-size tag 🦋 �[33mwarn�[39m �[31m----------------------------------------------------------------------�[39m 🦋 �[36minfo�[39m npm info astro 🦋 �[36minfo�[39m npm info @astrojs/prism 🦋 �[36minfo�[39m npm info @astrojs/rss 🦋 �[36minfo�[39m npm info create-astro 🦋 �[36minfo�[39m npm info @astrojs/alpinejs 🦋 �[36minfo�[39m npm info @astrojs/cloudflare 🦋 �[36minfo�[39m npm info @astrojs/deno 🦋 �[36minfo�[39m npm info @astrojs/image 🦋 �[36minfo�[39m npm info @astrojs/lit 🦋 �[36minfo�[39m npm info @astrojs/markdoc 🦋 �[36minfo�[39m npm info @astrojs/mdx 🦋 �[36minfo�[39m npm info @astrojs/netlify 🦋 �[36minfo�[39m npm info @astrojs/node 🦋 �[36minfo�[39m npm info @astrojs/partytown 🦋 �[36minfo�[39m npm info @astrojs/preact 🦋 �[36minfo�[39m npm info @astrojs/prefetch 🦋 �[36minfo�[39m npm info @astrojs/react 🦋 �[36minfo�[39m npm info @astrojs/sitemap 🦋 �[36minfo�[39m npm info @astrojs/solid-js 🦋 �[36minfo�[39m npm info @astrojs/svelte 🦋 �[36minfo�[39m npm info @astrojs/tailwind 🦋 �[36minfo�[39m npm info @astrojs/turbolinks 🦋 �[36minfo�[39m npm info @astrojs/vercel 🦋 �[36minfo�[39m npm info @astrojs/vue 🦋 �[36minfo�[39m npm info @astrojs/markdown-component 🦋 �[36minfo�[39m npm info @astrojs/markdown-remark 🦋 �[36minfo�[39m npm info @astrojs/telemetry 🦋 �[36minfo�[39m npm info @astrojs/webapi 🦋 �[36minfo�[39m astro is being published because our local version (0.0.0-image-image-size-20230309180922) has not been published on npm 🦋 �[33mwarn�[39m @astrojs/prism is not being published because version 2.1.0 is already published on npm 🦋 �[36minfo�[39m @astrojs/rss is being published because our local version (0.0.0-image-image-size-20230309180922) has not been published on npm 🦋 �[33mwarn�[39m create-astro is not being published because version 3.1.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/alpinejs is not being published because version 0.2.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/cloudflare is not being published because version 6.2.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/deno is not being published because version 4.1.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/image is not being published because version 0.16.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/lit is not being published because version 1.3.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/markdoc is not being published because version 0.0.1 is already published on npm 🦋 �[33mwarn�[39m @astrojs/mdx is not being published because version 0.18.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/netlify is not being published because version 2.2.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/node is not being published because version 5.1.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/partytown is not being published because version 1.1.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/preact is not being published because version 2.1.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/prefetch is not being published because version 0.2.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/react is not being published because version 2.1.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/sitemap is not being published because version 1.2.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/solid-js is not being published because version 2.1.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/svelte is not being published because version 2.1.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/tailwind is not being published because version 3.1.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/turbolinks is not being published because version 0.2.0 is already published on npm 🦋 �[36minfo�[39m @astrojs/vercel is being published because our local version (0.0.0-image-image-size-20230309180922) has not been published on npm 🦋 �[33mwarn�[39m @astrojs/vue is not being published because version 2.1.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/markdown-component is not being published because version 1.0.2 is already published on npm 🦋 �[33mwarn�[39m @astrojs/markdown-remark is not being published because version 2.1.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/telemetry is not being published because version 2.1.0 is already published on npm 🦋 �[33mwarn�[39m @astrojs/webapi is not being published because version 2.1.0 is already published on npm 🦋 �[36minfo�[39m Publishing �[36m"astro"�[39m at �[32m"0.0.0-image-image-size-20230309180922"�[39m 🦋 �[36minfo�[39m Publishing �[36m"@astrojs/rss"�[39m at �[32m"0.0.0-image-image-size-20230309180922"�[39m 🦋 �[36minfo�[39m Publishing �[36m"@astrojs/vercel"�[39m at �[32m"0.0.0-image-image-size-20230309180922"�[39m 🦋 �[32msuccess�[39m packages published successfully: 🦋 [email protected] 🦋 @astrojs/[email protected] 🦋 @astrojs/[email protected] 🦋 Creating git tags... 🦋 New tag: [email protected] 🦋 New tag: @astrojs/[email protected] 🦋 New tag: @astrojs/[email protected]

Copy link
Member

@natemoo-re natemoo-re left a comment

Choose a reason for hiding this comment

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

Changes look good but PR title and changelog seem confusing for the final changes made

@matthewp matthewp changed the title Add fallback for hosts without import.meta.url Remove usage of createRequire in core image Mar 9, 2023
@Princesseuh Princesseuh linked an issue Mar 9, 2023 that may be closed by this pull request
1 task
@matthewp matthewp merged commit bfd67ea into main Mar 9, 2023
@matthewp matthewp deleted the protect-create-require branch March 9, 2023 21:08
@astrobot-houston astrobot-houston mentioned this pull request Mar 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pkg: astro Related to the core `astro` package (scope)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

assets: Vercel's serverless function crashes
3 participants