From 60ded4fd274821201699a8b0174114cb99112cf5 Mon Sep 17 00:00:00 2001 From: Alberto Brusa Date: Thu, 19 Jan 2023 11:47:19 +0000 Subject: [PATCH 1/9] Remove unnecessary error log --- packages/modular-scripts/src/addPackage.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/modular-scripts/src/addPackage.ts b/packages/modular-scripts/src/addPackage.ts index 00b75cf9d..cece33068 100644 --- a/packages/modular-scripts/src/addPackage.ts +++ b/packages/modular-scripts/src/addPackage.ts @@ -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...`, ); From 7ed3432ef3ce6a5d31a0c5e09c03b1bf21c29cdb Mon Sep 17 00:00:00 2001 From: Alberto Brusa Date: Thu, 19 Jan 2023 12:06:39 +0000 Subject: [PATCH 2/9] Move jest-environment-jsdom to correct package.json --- packages/modular-scripts/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/modular-scripts/package.json b/packages/modular-scripts/package.json index 8249b2c24..8b57920ee 100644 --- a/packages/modular-scripts/package.json +++ b/packages/modular-scripts/package.json @@ -84,6 +84,7 @@ "jest-runner-eslint": "1.1.0", "jest-transform-stub": "2.0.0", "jest-watch-typeahead": "^2.0.0", + "jest-environment-jsdom": "^29.3.1", "js-yaml": "^4.1.0", "kill-port": "^2.0.1", "loader-utils": "3.2.0", From 359295b728e3c1038f94c290bcbc534a1c46ed42 Mon Sep 17 00:00:00 2001 From: Alberto Brusa Date: Thu, 19 Jan 2023 12:18:36 +0000 Subject: [PATCH 3/9] Remove jest-environment-jsdom from root package.json --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 49ef746bc..6a322978b 100644 --- a/package.json +++ b/package.json @@ -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", From 97d45026df27aa6ac7072b4caed3abfbc1094a37 Mon Sep 17 00:00:00 2001 From: Alberto Brusa Date: Thu, 19 Jan 2023 14:11:26 +0000 Subject: [PATCH 4/9] reorder dependencies --- packages/modular-scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/modular-scripts/package.json b/packages/modular-scripts/package.json index 8b57920ee..af89131fd 100644 --- a/packages/modular-scripts/package.json +++ b/packages/modular-scripts/package.json @@ -81,10 +81,10 @@ "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", - "jest-environment-jsdom": "^29.3.1", "js-yaml": "^4.1.0", "kill-port": "^2.0.1", "loader-utils": "3.2.0", From 4ed7c367718f4aaabdb9b3779456bd099519c525 Mon Sep 17 00:00:00 2001 From: Alberto Brusa Date: Thu, 19 Jan 2023 14:20:03 +0000 Subject: [PATCH 5/9] v4.0.2 --- packages/modular-scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/modular-scripts/package.json b/packages/modular-scripts/package.json index af89131fd..366d0d3cc 100644 --- a/packages/modular-scripts/package.json +++ b/packages/modular-scripts/package.json @@ -1,6 +1,6 @@ { "name": "modular-scripts", - "version": "3.6.0", + "version": "4.0.2", "license": "Apache-2.0", "repository": { "type": "git", From 1a33b08155ec5afa4147564d24e3084c6387ef05 Mon Sep 17 00:00:00 2001 From: Alberto Brusa Date: Thu, 19 Jan 2023 15:09:37 +0000 Subject: [PATCH 6/9] v1.1.1 --- packages/modular-template-package/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/modular-template-package/package.json b/packages/modular-template-package/package.json index 3d4c74a80..f2ff3ec99 100644 --- a/packages/modular-template-package/package.json +++ b/packages/modular-template-package/package.json @@ -1,6 +1,6 @@ { "name": "modular-template-package", - "version": "1.1.0", + "version": "1.1.1", "exports": { "./package.json": "./package.json" }, From addc5f2576658c09ca6f9daf9df3f8138579b7d9 Mon Sep 17 00:00:00 2001 From: Alberto Brusa Date: Thu, 19 Jan 2023 15:11:54 +0000 Subject: [PATCH 7/9] v4.0.0 --- packages/eslint-config-modular-app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/eslint-config-modular-app/package.json b/packages/eslint-config-modular-app/package.json index 4aea9dc42..078c5ffea 100644 --- a/packages/eslint-config-modular-app/package.json +++ b/packages/eslint-config-modular-app/package.json @@ -1,6 +1,6 @@ { "name": "eslint-config-modular-app", - "version": "3.0.2", + "version": "4.0.0", "license": "Apache-2.0", "main": "index.js", "engines": { From 6637d491c01dd924d591d9547e7c979d0a491850 Mon Sep 17 00:00:00 2001 From: Alberto Brusa Date: Thu, 19 Jan 2023 15:27:53 +0000 Subject: [PATCH 8/9] Update typescript set by CMRA --- packages/create-modular-react-app/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-modular-react-app/src/index.ts b/packages/create-modular-react-app/src/index.ts index b3bfecc1c..c1b2f4bbc 100755 --- a/packages/create-modular-react-app/src/index.ts +++ b/packages/create-modular-react-app/src/index.ts @@ -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', ], 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 From 272f6ef184401bdde26f810af80929f2435a7c84 Mon Sep 17 00:00:00 2001 From: Alberto Brusa Date: Fri, 20 Jan 2023 14:28:42 +0000 Subject: [PATCH 9/9] Revert accidentally changed versions and bump CMRA version by major due to update TS version --- packages/eslint-config-modular-app/package.json | 2 +- packages/modular-scripts/package.json | 2 +- packages/modular-template-package/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/eslint-config-modular-app/package.json b/packages/eslint-config-modular-app/package.json index 078c5ffea..4aea9dc42 100644 --- a/packages/eslint-config-modular-app/package.json +++ b/packages/eslint-config-modular-app/package.json @@ -1,6 +1,6 @@ { "name": "eslint-config-modular-app", - "version": "4.0.0", + "version": "3.0.2", "license": "Apache-2.0", "main": "index.js", "engines": { diff --git a/packages/modular-scripts/package.json b/packages/modular-scripts/package.json index 366d0d3cc..af89131fd 100644 --- a/packages/modular-scripts/package.json +++ b/packages/modular-scripts/package.json @@ -1,6 +1,6 @@ { "name": "modular-scripts", - "version": "4.0.2", + "version": "3.6.0", "license": "Apache-2.0", "repository": { "type": "git", diff --git a/packages/modular-template-package/package.json b/packages/modular-template-package/package.json index f2ff3ec99..3d4c74a80 100644 --- a/packages/modular-template-package/package.json +++ b/packages/modular-template-package/package.json @@ -1,6 +1,6 @@ { "name": "modular-template-package", - "version": "1.1.1", + "version": "1.1.0", "exports": { "./package.json": "./package.json" },