diff --git a/.changeset/light-countries-report.md b/.changeset/light-countries-report.md new file mode 100644 index 000000000..06b07fde2 --- /dev/null +++ b/.changeset/light-countries-report.md @@ -0,0 +1,5 @@ +--- +'create-modular-react-app': major +--- + +Bumped default TypeScript version to ^4.8.3 diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 8ac199e2e..e6fc56d2c 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -2,9 +2,9 @@ name: Lint on: push: - branches: [main, 'release/**', feature/v4] + branches: [main, 'release/**'] pull_request: - branches: [main, 'release/**', feature/v4] + branches: [main, 'release/**'] jobs: Static: diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 591a75272..b19190574 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -5,9 +5,9 @@ name: Windows Test on: push: - branches: [main, 'release/**', feature/v4] + branches: [main, 'release/**'] pull_request: - branches: [main, 'release/**', feature/v4] + branches: [main, 'release/**'] jobs: Test: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 61cc90ecd..79498a266 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,9 +5,9 @@ name: Test on: push: - branches: [main, 'release/**', feature/v4] + branches: [main, 'release/**'] pull_request: - branches: [main, 'release/**', feature/v4] + branches: [main, 'release/**'] jobs: Test: diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 25fa313eb..0244aa670 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -1,9 +1,9 @@ name: 'Validate' on: push: - branches: [main, 'release/**', feature/v4] + branches: [main, 'release/**'] pull_request: - branches: [main, 'release/**', feature/v4] + branches: [main, 'release/**'] jobs: check-yarn-lock-registry: 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", 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 diff --git a/packages/modular-scripts/package.json b/packages/modular-scripts/package.json index 8249b2c24..af89131fd 100644 --- a/packages/modular-scripts/package.json +++ b/packages/modular-scripts/package.json @@ -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", 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...`, );