Skip to content

Allow workspaces outside the packages/ directory #2169

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

Merged
cristiano-belloni merged 2 commits into from
Sep 28, 2022
Merged

Allow workspaces outside the packages/ directory #2169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea5e994
Remove packages/ verification
Sep 27, 2022
2bf087c
Create spicy-hotels-cross.md
cristiano-belloni Sep 27, 2022
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
5 changes: 5 additions & 0 deletions .changeset/spicy-hotels-cross.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"modular-scripts": minor
---

Allow workspaces outside the `packages` directory
6 changes: 3 additions & 3 deletions __fixtures__/verifiable-project/packages/app-one/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
},
"dependencies": {
"package-one": "workspace:*",
"package-two": "workspace:^",
"package-three": "workspace:~",
"package-four": "workspace:^1.0.0"
"package-two": "workspace:*",
"package-three": "workspace:*",
"package-four": "workspace:*"
},
"version": "1.0.0"
}
10 changes: 3 additions & 7 deletions packages/modular-scripts/src/__tests__/check/verifyWorkspaceDependencies.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,12 @@ describe('verifyWorkspaceDependencies', () => {
expect(error).not.toHaveBeenCalled();
});

it('rejects packages not in the "packages" directory', async () => {
it('doesn\'t reject packages not in the "packages" directory', async () => {
mock(getModularRoot).mockReturnValue('__fixtures__/verifiable-project');

const checked = await check('__fixtures__/verifiable-project');
expect(checked).toBe(false);
expect(error).toHaveBeenCalledWith(
expect.stringContaining(
`package-four is not located within the "/packages" directory`,
),
);
expect(checked).toBe(true);
expect(error).not.toHaveBeenCalled();
});
});

Expand Down
7 changes: 0 additions & 7 deletions packages/modular-scripts/src/check/verifyWorkspaceDependencies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,6 @@ export async function check(target?: string): Promise<boolean> {
valid = false;
}

if (!packageInfo.location.startsWith('packages')) {
logger.error(
`${packageName} is not located within the "/packages" directory in the repository, instead found "${packageInfo.location}"`,
);
valid = false;
}

if (!isValidModularType(path.join(modularRoot, packageInfo.location))) {
logger.error(
`${packageName} at ${
Expand Down