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

Support for non-modular packages in tests and workspace resolver #2167

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .changeset/thirty-crews-buy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'modular-scripts': minor
'@modular-scripts/workspace-resolver': minor
'@modular-scripts/modular-types': minor
---

Support for non-modular packages in test runner and workspace resolver
22 changes: 22 additions & 0 deletions __fixtures__/extraneous-packages/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
node_modules
/.pnp
.pnp.js

# testing
/coverage

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*

/dist
1 change: 1 addition & 0 deletions __fixtures__/extraneous-packages/.yarnrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
disable-self-update-check true
11 changes: 11 additions & 0 deletions __fixtures__/extraneous-packages/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
This monorepository has inter-workspace dependencies:

```mermaid
graph TD;
app-->a;
a-->b;
a-->c;
b-->c;
c-->d;
e-->a;
```
2 changes: 2 additions & 0 deletions __fixtures__/extraneous-packages/modular/setupEnvironment.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// Allows for adding setup configuration to Jest
export {};
5 changes: 5 additions & 0 deletions __fixtures__/extraneous-packages/modular/setupTests.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// jest-dom adds custom jest matchers for asserting on DOM nodes.
// allows you to do things like:
// expect(element).toHaveTextContent(/react/i)
// learn more: https://github.com/testing-library/jest-dom
import '@testing-library/jest-dom/extend-expect';
60 changes: 60 additions & 0 deletions __fixtures__/extraneous-packages/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{
"name": "ghost-tests-monorepo",
"version": "1.0.0",
"main": "index.js",
"author": "Cristiano Belloni <cristiano.belloni@jpmorgan.com>",
"license": "MIT",
"private": true,
"workspaces": [
"packages/**"
],
"modular": {
"type": "root"
},
"scripts": {
"start": "modular start",
"build": "modular build",
"test": "modular test",
"lint": "eslint . --ext .js,.ts,.tsx",
"prettier": "prettier --write ."
},
"eslintConfig": {
"extends": "modular-app"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"prettier": {
"singleQuote": true,
"trailingComma": "all",
"printWidth": 80,
"proseWrap": "always"
},
"dependencies": {
"@testing-library/dom": "^8.16.1",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.3.0",
"@testing-library/user-event": "^7.2.1",
"@types/jest": "^28.1.6",
"@types/node": "^18.7.2",
"@types/react": "^18.0.17",
"@types/react-dom": "^18.0.6",
"eslint-config-modular-app": "^3.0.1",
"modular-scripts": "^3.3.1",
"modular-template-app": "^1.1.0",
"modular-template-package": "^1.1.0",
"prettier": "^2.7.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"typescript": ">=4.2.1 <4.5.0"
}
}
1 change: 1 addition & 0 deletions __fixtures__/extraneous-packages/packages/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This will be the readme inside /packages
12 changes: 12 additions & 0 deletions __fixtures__/extraneous-packages/packages/a/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "a",
"private": false,
"modular": {
"type": "package"
},
"main": "./src/index.ts",
"version": "1.0.0",
"dependencies": {
"failing-extraneous-test": "1.0.0"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import add from '../index';

test('it should add two numbers', () => {
console.log('testing a:index.test.ts');
expect(add(0.1, 0.2)).toEqual(0.30000000000000004);
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import add from '../../index';

test('it should add two numbers', () => {
console.log('testing a:/utils/utils.test.ts');
expect(add(0.1, 0.2)).toEqual(0.30000000000000004);
});
2 changes: 2 additions & 0 deletions __fixtures__/extraneous-packages/packages/a/src/dummy.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
console.log('DUMMY a:dummy.ts - SHOULD NOT EXECUTE!');
export {};
3 changes: 3 additions & 0 deletions __fixtures__/extraneous-packages/packages/a/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function add(a: number, b: number): number {
return a + b;
}
12 changes: 12 additions & 0 deletions __fixtures__/extraneous-packages/packages/b/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "b",
"private": false,
"modular": {
"type": "package"
},
"main": "./src/index.ts",
"version": "1.0.0",
"dependencies": {
"successful-extraneous-test": "1.0.0"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import multiply from '../index';

test('it should multiply two numbers', () => {
console.log('testing b:index.test.ts');
expect(multiply(4, 5)).toEqual(20);
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import multiply from '../../index';

test('it should multiply two numbers', () => {
console.log('testing b:/utils/utils.test.ts');
expect(multiply(2, 4)).toEqual(8);
});
3 changes: 3 additions & 0 deletions __fixtures__/extraneous-packages/packages/b/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function multiply(...operands: number[]): number {
return operands.reduce((a, o) => a * o);
}
12 changes: 12 additions & 0 deletions __fixtures__/extraneous-packages/packages/c/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "c",
"private": false,
"modular": {
"type": "package"
},
"main": "./src/index.ts",
"version": "1.0.0",
"dependencies": {
"no-extraneous-test": "1.0.0"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import add from '../index';

test('it should add two numbers', () => {
console.log('testing c:index.test.ts');
expect(add(0.1, 0.2)).toEqual(0.30000000000000004);
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import add from '../../index';

test('it should add two numbers', () => {
console.log('testing c:/utils/utils.test.ts');
expect(add(0.1, 0.2)).toEqual(0.30000000000000004);
});
3 changes: 3 additions & 0 deletions __fixtures__/extraneous-packages/packages/c/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function add(a: number, b: number): number {
return a + b;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name": "failing-extraneous-test",
"private": false,
"main": "./src/index.ts",
"scripts": {
"test": "echo 'this is the test for failing-extraneous-test' && exit -1"
},
"version": "1.0.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import add from '../index';

test('it should add two numbers', () => {
expect(add(0.1, 0.2)).toEqual(0.30000000000000004);
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function add(a: number, b: number): number {
return a + b;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "no-extraneous-test",
"private": false,
"main": "./src/index.ts",
"version": "1.0.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import add from '../index';

test('it should add two numbers', () => {
expect(add(0.1, 0.2)).toEqual(0.30000000000000004);
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function add(a: number, b: number): number {
return a + b;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name": "successful-extraneous-test",
"private": false,
"main": "./src/index.ts",
"scripts": {
"test": "echo 'this is the test for successful-extraneous-test'"
},
"version": "1.0.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import add from '../index';

test('it should add two numbers', () => {
expect(add(0.1, 0.2)).toEqual(0.30000000000000004);
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function add(a: number, b: number): number {
return a + b;
}
4 changes: 4 additions & 0 deletions __fixtures__/extraneous-packages/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "modular-scripts/tsconfig.json",
"include": ["modular", "packages/**/src"]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "non-modular-workspace-1",
"version": "1.0.0",
"author": "App Frameworks team",
"license": "MIT",
"private": true,
"workspaces": [
"packages/**"
],
"modular": {
"type": "root"
},
"dependencies": {
"lodash": "^4.17.21"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "app-one",
"private": true,
"modular": {
"type": "app"
},
"dependencies": {
"package-one": "1.0.0",
"package-two": "1.0.0"
},
"version": "1.0.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "package-extraneous-1",
"private": true,
"main": "./src/index.ts",
"version": "1.0.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name": "package-extraneous-2",
"private": true,
"modular": {
"anotherProperty": "value"
},
"main": "./src/index.ts",
"version": "1.0.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name": "package-extraneous-3",
"private": true,
"modular": {
"type": ""
},
"main": "./src/index.ts",
"version": "1.0.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name": "package-one",
"private": true,
"modular": {
"type": "package"
},
"main": "./src/index.ts",
"version": "1.0.0"
}
Loading