Skip to content

fix(cli): #1576 fix nested greenwood type imports from breaking the build #1634

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.

Sign up for GitHub

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

Draft
thescientist13 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix(cli): #1576 fix nested greenwood type imports from breaking the build #1634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions packages/cli/src/config/rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@ function greenwoodResourceLoader(compilation, browser = false) {
return {
name: "greenwood-resource-loader",
async resolveId(id, importer, options) {
// fix for nested type imports - https://github.com/ProjectEvergreen/greenwood/issues/1576
if (id.indexOf("@greenwood") >= 0) {
return {
id,
external: true,
};
}

const { userWorkspace, scratchDir } = compilation.context;
const normalizedId = cleanRollupId(id);
const importerUrl = new URL(`file://${cleanRollupId(importer) ?? ""}`);
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/test/cases/build.typescript.default/build.typescript.default.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ describe("Build Greenwood With: ", function () {

expect(jsFiles.length).to.equal(1);
expect(javascript.replace(/\n/g, "")).to.contain(
'const o="Angela",l="Davis",s="Professor";console.log(`Hello ${s} ${o} ${l}!`);',
'const o="Angela",e="Davis",l="Professor";console.log(`Hello ${l} ${o} ${e}!`);',
);
});
});
Expand Down
6 changes: 6 additions & 0 deletions packages/cli/test/cases/build.typescript.default/src/scripts/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
import { type Page } from "@greenwood/cli";

const pages: Page[] = [];

console.log({ pages });

interface User {
firstName: string;
lastName: string;
Expand Down