Updated blueprints (#66)

* chore: Updated latestVersions

* feature: Downstreamed changes from @embroider/[email protected] and [email protected]

* chore: Updated test fixtures

---------

Co-authored-by: ijlee2 <[email protected]>

Author: ijlee2

src/blueprints/ember-addon/__testAppLocation__/ember-cli-build.js

@@ -7,7 +7,10 @@ module.exports = function (defaults) {
     // Add options here
     autoImport: {
       watchDependencies: ['<%= options.packages.addon.name %>'],
-    },
+    },<% if (options.packages.addon.hasTypeScript) { %>
+    'ember-cli-babel': {
+      enableTypeScriptTransform: true,
+    },<% } %>
   });
 
   const { maybeEmbroider } = require('@embroider/test-setup');

src/steps/update-addon-tsconfig-json.ts

@@ -19,9 +19,11 @@ function updateCompilerOptions(
 
   if (packages.addon.hasGlint) {
     compilerOptions.set('allowImportingTsExtensions', true);
+    compilerOptions.set('allowJs', true);
     compilerOptions.set('declarationDir', 'declarations');
   } else {
     compilerOptions.set('allowImportingTsExtensions', true);
+    compilerOptions.set('allowJs', true);
     compilerOptions.set('declaration', true);
     compilerOptions.set('declarationDir', 'declarations');
     compilerOptions.set('emitDeclarationOnly', true);

src/steps/update-test-app-tsconfig-json.ts

@@ -23,8 +23,8 @@ function updateCompilerOptions(
   tsConfigJson['compilerOptions'] = convertToObject(compilerOptions);
 }
 
-function updateInclude(tsConfigJson: TsConfigJson): void {
-  tsConfigJson['include'] = ['app/**/*', 'tests/**/*', 'types/**/*'];
+function removeInclude(tsConfigJson: TsConfigJson) {
+  delete tsConfigJson['include'];
 }
 
 export function updateTestAppTsConfigJson(options: Options): void {
@@ -39,7 +39,7 @@ export function updateTestAppTsConfigJson(options: Options): void {
   const tsConfigJson = JSON.parse(sanitizeJson(oldFile));
 
   updateCompilerOptions(tsConfigJson, options);
-  updateInclude(tsConfigJson);
+  removeInclude(tsConfigJson);
 
   const newFile = JSON.stringify(tsConfigJson, null, 2) + '\n';
 

src/utils/blueprints/get-version.ts

@@ -3,20 +3,21 @@ import { decideVersion } from '@codemod-utils/blueprints';
 import type { Options } from '../../types/index.js';
 
 const latestVersions = new Map([
-  ['@babel/core', '7.22.11'],
-  ['@babel/plugin-proposal-decorators', '7.22.10'],
+  ['@babel/core', '7.22.17'],
+  ['@babel/plugin-proposal-decorators', '7.22.15'],
   ['@babel/plugin-transform-class-properties', '7.22.5'],
-  ['@babel/preset-typescript', '7.22.11'],
-  ['@babel/runtime', '7.22.11'],
+  ['@babel/preset-typescript', '7.22.15'],
+  ['@babel/runtime', '7.22.15'],
   ['@embroider/addon-dev', '4.1.0'],
   ['@embroider/addon-shim', '1.8.6'],
+  ['@embroider/test-setup', '3.0.1'],
   ['@rollup/plugin-babel', '6.0.3'],
   ['concurrently', '8.2.1'],
   ['ember-auto-import', '2.6.3'],
   ['ember-cli-babel', '8.0.0'],
   ['ember-cli-htmlbars', '6.3.0'],
-  ['rollup', '3.28.1'],
-  ['rollup-plugin-copy', '3.4.0'],
+  ['rollup', '3.29.1'],
+  ['rollup-plugin-copy', '3.5.0'],
 ]);
 
 export function getVersion(packageName: string, options: Options): string {

tests/fixtures/ember-container-query-customizations/output/demo-app/ember-cli-build.js

@@ -8,6 +8,9 @@ module.exports = function (defaults) {
     autoImport: {
       watchDependencies: ['ember-container-query'],
     },
+    'ember-cli-babel': {
+      enableTypeScriptTransform: true,
+    },
   });
 
   const { maybeEmbroider } = require('@embroider/test-setup');

tests/fixtures/ember-container-query-customizations/output/demo-app/tsconfig.json

@@ -15,11 +15,6 @@
     },
     "skipLibCheck": true
   },
-  "include": [
-    "app/**/*",
-    "tests/**/*",
-    "types/**/*"
-  ],
   "glint": {
     "environment": "ember-loose"
   }

tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/package.json

@@ -67,16 +67,16 @@
     "ember-test-selectors": "^6.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.11",
-    "@babel/plugin-proposal-decorators": "^7.22.10",
+    "@babel/core": "^7.22.17",
+    "@babel/plugin-proposal-decorators": "^7.22.15",
     "@babel/plugin-transform-class-properties": "^7.22.5",
-    "@babel/preset-typescript": "^7.22.11",
-    "@babel/runtime": "^7.22.11",
+    "@babel/preset-typescript": "^7.22.15",
+    "@babel/runtime": "^7.22.15",
     "@embroider/addon-dev": "^4.1.0",
     "@rollup/plugin-babel": "^6.0.3",
     "concurrently": "^7.6.0",
-    "rollup": "^3.28.1",
-    "rollup-plugin-copy": "^3.4.0"
+    "rollup": "^3.29.1",
+    "rollup-plugin-copy": "^3.5.0"
   },
   "engines": {
     "node": "14.* || 16.* || >= 18"

tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "@tsconfig/ember/tsconfig.json",
   "compilerOptions": {
     "allowImportingTsExtensions": true,
+    "allowJs": true,
     "declarationDir": "declarations",
     "skipLibCheck": true
   },

tests/fixtures/ember-container-query-glint/output/ember-container-query/package.json

@@ -67,16 +67,16 @@
     "ember-test-selectors": "^6.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.11",
-    "@babel/plugin-proposal-decorators": "^7.22.10",
+    "@babel/core": "^7.22.17",
+    "@babel/plugin-proposal-decorators": "^7.22.15",
     "@babel/plugin-transform-class-properties": "^7.22.5",
-    "@babel/preset-typescript": "^7.22.11",
-    "@babel/runtime": "^7.22.11",
+    "@babel/preset-typescript": "^7.22.15",
+    "@babel/runtime": "^7.22.15",
     "@embroider/addon-dev": "^4.1.0",
     "@rollup/plugin-babel": "^6.0.3",
     "concurrently": "^7.6.0",
-    "rollup": "^3.28.1",
-    "rollup-plugin-copy": "^3.4.0"
+    "rollup": "^3.29.1",
+    "rollup-plugin-copy": "^3.5.0"
   },
   "engines": {
     "node": "14.* || 16.* || >= 18"

tests/fixtures/ember-container-query-glint/output/ember-container-query/tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "@tsconfig/ember/tsconfig.json",
   "compilerOptions": {
     "allowImportingTsExtensions": true,
+    "allowJs": true,
     "declarationDir": "declarations",
     "skipLibCheck": true
   },