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.

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

Jump to bottom

Small fixes #2261

Merged
merged 10 commits into from
Jan 20, 2023
Merged

Small fixes #2261

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
60ded4f
Remove unnecessary error log
AlbertoBrusa Jan 19, 2023
7ed3432
Move jest-environment-jsdom to correct package.json
AlbertoBrusa Jan 19, 2023
359295b
Remove jest-environment-jsdom from root package.json
AlbertoBrusa Jan 19, 2023
97d4502
reorder dependencies
AlbertoBrusa Jan 19, 2023
5a32ccf
Merge branch 'feature/v4' of https://github.com/jpmorganchase/modular…
AlbertoBrusa Jan 19, 2023
4ed7c36
v4.0.2
AlbertoBrusa Jan 19, 2023
1a33b08
v1.1.1
AlbertoBrusa Jan 19, 2023
addc5f2
v4.0.0
AlbertoBrusa Jan 19, 2023
6637d49
Update typescript set by CMRA
AlbertoBrusa Jan 19, 2023
272f6ef
Revert accidentally changed versions and bump CMRA version by major d…
AlbertoBrusa Jan 20, 2023
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
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
"execa": "5.1.1",
"husky": "8.0.1",
"is-ci": "2.0.0",
"jest-environment-jsdom": "^29.3.1",
"lint-staged": "12.4.1",
"micromatch": "4.0.5",
"patch-package": "^6.4.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-modular-react-app/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ export default async function createModularApp(argv: {
'prettier',
'modular-scripts',
'eslint-config-modular-app',
'typescript@>=4.2.1 <4.5.0',
'typescript@^4.8.3',
AlbertoBrusa marked this conversation as resolved.
Show resolved Hide resolved
],
newModularRoot,
// We can't pass a stream here if it's not backed by a fd. We need to set it to 'pipe', then pipe it from the ChildProcess to our transformer
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config-modular-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint-config-modular-app",
"version": "3.0.2",
"version": "4.0.0",
AlbertoBrusa marked this conversation as resolved.
Show resolved Hide resolved
"license": "Apache-2.0",
"main": "index.js",
"engines": {
Expand Down
3 changes: 2 additions & 1 deletion packages/modular-scripts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "modular-scripts",
"version": "3.6.0",
"version": "4.0.2",
AlbertoBrusa marked this conversation as resolved.
Show resolved Hide resolved
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -81,6 +81,7 @@
"jest-circus": "^29.0.0",
"jest-cli": "^29.0.0",
"jest-config": "^29.0.0",
"jest-environment-jsdom": "^29.3.1",
"jest-runner-eslint": "1.1.0",
"jest-transform-stub": "2.0.0",
"jest-watch-typeahead": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/modular-scripts/src/addPackage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ async function addPackage({
paths: [modularRoot],
});
} catch (e) {
console.log(e);
logger.log(`Couldn't find ${templateName} in project`);
logger.log(
`Installing template package ${templateName} from registry, this may take a moment...`,
);
Expand Down
2 changes: 1 addition & 1 deletion packages/modular-template-package/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "modular-template-package",
"version": "1.1.0",
"version": "1.1.1",
AlbertoBrusa marked this conversation as resolved.
Show resolved Hide resolved
"exports": {
"./package.json": "./package.json"
},
Expand Down