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

Fix astro add with third-party integrations #4270

Merged
merged 4 commits into from
Aug 11, 2022
Merged

Conversation

natemoo-re
Copy link
Member

Changes

Previously, running astro add astro-pkg, would generate weird code:

import { defineConfig } from 'astro/config';
import astro from 'astro-pkg';

export const defineConfig({
  integrations: [
    astro()
  ]
})

With this PR, the generated code will now be:

import { defineConfig } from 'astro/config';
import pkg from 'astro-pkg';

export const defineConfig({
  integrations: [
    pkg()
  ]
})

Testing

Nah, we don't test astro add

Docs

N/A

@changeset-bot
Copy link

changeset-bot bot commented Aug 11, 2022

🦋 Changeset detected

Latest commit: f4ac4a1

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

This PR includes changesets to release 13 packages
Name Type
astro Patch
@e2e/astro-component Patch
@e2e/error-react-spectrum Patch
@e2e/error-sass Patch
@e2e/errors Patch
@e2e/lit-component Patch
@e2e/preact-component Patch
@e2e/react-component Patch
@e2e/solid-component Patch
@e2e/solid-recurse Patch
@e2e/svelte-component Patch
@e2e/e2e-tailwindcss Patch
@e2e/ts-resolution Patch

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 Aug 11, 2022
Copy link
Contributor

@bholmesdev bholmesdev left a comment

Choose a reason for hiding this comment

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

Good catch! Will note it's a side effect of bad dash handling. So for a package called astro-long-pkg-name, it'll generate long() instead of longPkgName(). Might be worth a more sustainable fix?

@natemoo-re
Copy link
Member Author

That's a good point, this was a lazy fix. I'll do what you're suggesting ☺️

Copy link
Contributor

@bholmesdev bholmesdev left a comment

Choose a reason for hiding this comment

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

I am forever in your idebt

@@ -289,11 +289,30 @@ async function parseAstroConfig(configURL: URL): Promise<t.File> {
return result;
}

// Convert an arbitrary NPM package name into a JS identifier
// Some examples:
Copy link
Member

Choose a reason for hiding this comment

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

now that we're post v1.0 I'm feeling the burn to start adding some tests to anything like this that we missed for v1.0, but okay to keep kicking this can a bit longer until we're out of the release bug swarm

Copy link
Contributor

Choose a reason for hiding this comment

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

@FredKSchott +1! I vote using Vitest for this for snapshot testing though. The lack of snapshots in create-astro made for a tough test authoring experience and brittle tests we ended up removing.

Copy link
Member

@FredKSchott FredKSchott left a comment

Choose a reason for hiding this comment

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

LGTM! Merging so that we can get this into the next release

@FredKSchott FredKSchott merged commit 7127b1b into main Aug 11, 2022
@FredKSchott FredKSchott deleted the fix/3p-integration-name branch August 11, 2022 23:31
@astrobot-houston astrobot-houston mentioned this pull request Aug 11, 2022
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.

3 participants