ember-cli · kategengler · Jul 1, 2023 · Jun 1, 2023 · Jun 1, 2023 · Jun 7, 2023
diff --git a/blueprints/addon/additional-package.json b/blueprints/addon/additional-package.json
@@ -1,7 +1,5 @@
 {
-  "keywords": [
-    "ember-addon"
-  ],
+  "keywords": ["ember-addon"],
   "scripts": {
     "test:ember-compatibility": "ember try:each"
   },

diff --git a/blueprints/addon/files/ember-cli-build.js b/blueprints/addon/files/ember-cli-build.js
@@ -4,7 +4,9 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function (defaults) {
   const app = new EmberAddon(defaults, {
-    // Add options here
+    <% if (typescript) {%>'ember-cli-babel': { enableTypeScriptTransform: true },
+
+    <% } %>// Add options here
   });
 
   /*

diff --git a/blueprints/addon/files/index.js b/blueprints/addon/files/index.js
@@ -1,5 +1,9 @@
 'use strict';
 
 module.exports = {
-  name: require('./package').name,
+  name: require('./package').name,<% if (typescript) {%>
+
+  options: {
+    'ember-cli-babel': { enableTypeScriptTransform: true },
+  },<% } %>
 };
diff --git a/blueprints/addon/files/tsconfig.declarations.json b/blueprints/addon/files/tsconfig.declarations.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "declarationDir": "declarations",
+    "emitDeclarationOnly": true,
+    "noEmit": false,
+    "rootDir": "."
+  },
+  "include": ["addon", "addon-test-support"]
+}
diff --git a/blueprints/addon/files/tsconfig.json b/blueprints/addon/files/tsconfig.json
@@ -0,0 +1,18 @@
+{
+  "extends": "@tsconfig/ember/tsconfig.json",
+  "compilerOptions": {
+    // The combination of `baseUrl` with `paths` allows Ember's classic package
+    // layout, which is not resolvable with the Node resolution algorithm, to
+    // work with TypeScript.
+    "baseUrl": ".",
+    "paths": {
+      "dummy/tests/*": ["tests/*"],
+      "dummy/*": ["tests/dummy/app/*", "app/*"],
+      "<%= addonName %>": ["addon"],
+      "<%= addonName %>/*": ["addon/*"],
+      "<%= addonName %>/test-support": ["addon-test-support"],
+      "<%= addonName %>/test-support/*": ["addon-test-support/*"],
+      "*": ["types/*"]
+    }
+  }
+}
diff --git a/blueprints/addon/index.js b/blueprints/addon/index.js
@@ -64,6 +64,11 @@ module.exports = {
 
     // 95% of addons don't need ember-data or ember-fetch, make them opt-in instead
     delete contents.devDependencies['ember-data'];
+    delete contents.devDependencies['@types/ember-data'];
+    delete contents.devDependencies['@types/ember-data__adapter'];
+    delete contents.devDependencies['@types/ember-data__model'];
+    delete contents.devDependencies['@types/ember-data__serializer'];
+    delete contents.devDependencies['@types/ember-data__store'];
     delete contents.devDependencies['ember-fetch'];
 
     // Per RFC #811, addons should not have this dependency.
@@ -77,6 +82,22 @@ module.exports = {
     // 100% of addons don't need ember-cli-app-version, make it opt-in instead
     delete contents.devDependencies['ember-cli-app-version'];
 
+    // add scripts to build type declarations for TypeScript addons
+    if (this.options.typescript) {
+      contents.devDependencies.rimraf = '^5.0.1';
+
+      contents.scripts.prepack = 'tsc --project tsconfig.declarations.json';
+      contents.scripts.postpack = 'rimraf declarations';
+
+      contents.typesVersions = {
+        '*': {
+          'test-support': ['declarations/addon-test-support/index.d.ts'],
+          'test-support/*': ['declarations/addon-test-support/*', 'declarations/addon-test-support/*/index.d.ts'],
+          '*': ['declarations/addon/*', 'declarations/addon/*/index.d.ts'],
+        },
+      };
+    }
+
     merge(contents, ADDITIONAL_PACKAGE);
 
     return stringifyAndNormalize(sortPackageJson(contents));
@@ -110,15 +131,6 @@ module.exports = {
     this.ui.writeLine(prependEmoji('✨', `Creating a new Ember addon in ${chalk.yellow(process.cwd())}:`));
   },
 
-  async afterInstall(options) {
-    if (options.typescript) {
-      await this.addAddonToProject({
-        name: 'ember-cli-typescript',
-        blueprintOptions: { ...options, save: true },
-      });
-    }
-  },
-
   locals(options) {
     let entity = { name: 'dummy' };
     let rawName = entity.name;
@@ -172,7 +184,9 @@ module.exports = {
   },
 
   files(options) {
-    let appFiles = this.lookupBlueprint(this.appBlueprintName).files(options);
+    let appFiles = this.lookupBlueprint(this.appBlueprintName)
+      .files(options)
+      .filter((file) => !['types/ember-data/types/registries/model.d.ts'].includes(file));
     let addonFilesPath = this.filesPath(this.options);
     let ignoredCITemplate = this.options.ciProvider !== 'travis' ? '.travis.yml' : '.github';
 
@@ -182,6 +196,10 @@ module.exports = {
       addonFiles = addonFiles.filter((file) => !file.endsWith('.npmrc'));
     }
 
+    if (!options.typescript) {
+      addonFiles = addonFiles.filter((file) => file !== 'tsconfig.json' && !file.endsWith('.d.ts'));
+    }
+
     return uniq(appFiles.concat(addonFiles));
   },
 

diff --git a/blueprints/app/files/app/config/environment.d.ts b/blueprints/app/files/app/config/environment.d.ts
@@ -0,0 +1,14 @@
+/**
+ * Type declarations for
+ *    import config from '<%= name %>/config/environment'
+ */
+declare const config: {
+  environment: string;
+  modulePrefix: string;
+  podModulePrefix: string;
+  locationType: 'history' | 'hash' | 'none' | 'auto';
+  rootURL: string;
+  APP: Record<string, unknown>;
+};
+
+export default config;
diff --git a/blueprints/app/files/ember-cli-build.js b/blueprints/app/files/ember-cli-build.js
@@ -4,7 +4,9 @@ const EmberApp = require('ember-cli/lib/broccoli/ember-app');
 
 module.exports = function (defaults) {
   const app = new EmberApp(defaults, {
-    // Add options here
+    <% if (typescript) {%>'ember-cli-babel': { enableTypeScriptTransform: true },
+
+    <% } %>// Add options here
   });
 
   <% if (embroider) { %>const { Webpack } = require('@embroider/webpack');

diff --git a/blueprints/app/files/gitignore b/blueprints/app/files/gitignore
@@ -1,5 +1,6 @@
 # compiled output
 /dist/
+/declarations/
 
 # dependencies
 /node_modules/

diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json
@@ -36,6 +36,37 @@
     "@embroider/webpack": "^3.0.0<% } %>",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2<% if (typescript) { %>",
+    "@glint/environment-ember-loose": "^1.0.2",
+    "@glint/template": "^1.0.2",
+    "@tsconfig/ember": "^2.0.0",
+    "@types/ember": "^4.0.3",
+    "@types/ember-data": "^4.4.10",
+    "@types/ember-data__adapter": "^4.0.1",
+    "@types/ember-data__model": "^4.0.0",
+    "@types/ember-data__serializer": "^4.0.1",
+    "@types/ember-data__store": "^4.0.2",
+    "@types/ember__application": "^4.0.5",
+    "@types/ember__array": "^4.0.3",
+    "@types/ember__component": "^4.0.13",
+    "@types/ember__controller": "^4.0.4",
+    "@types/ember__debug": "^4.0.3",
+    "@types/ember__destroyable": "^4.0.1",
+    "@types/ember__engine": "^4.0.4",
+    "@types/ember__error": "^4.0.2",
+    "@types/ember__helper": "^4.0.1",
+    "@types/ember__modifier": "^4.0.3",
+    "@types/ember__object": "^4.0.5",
+    "@types/ember__owner": "^4.0.3",
+    "@types/ember__polyfills": "^4.0.1",
+    "@types/ember__routing": "^4.0.12",
+    "@types/ember__runloop": "^4.0.2",
+    "@types/ember__service": "^4.0.2",
+    "@types/ember__string": "^3.0.10",
+    "@types/ember__template": "^4.0.1",
+    "@types/ember__test": "^4.0.1",
+    "@types/ember__utils": "^4.0.2",
+    "@types/qunit": "^2.19.5",
+    "@types/rsvp": "^4.0.4",
     "@typescript-eslint/eslint-plugin": "^5.60.0",
     "@typescript-eslint/parser": "^5.60.0<% } %>",
     "broccoli-asset-rev": "^3.0.0",
@@ -73,7 +104,8 @@
     "stylelint": "^15.8.0",
     "stylelint-config-standard": "^33.0.0",
     "stylelint-prettier": "^3.0.0",
-    "tracked-built-ins": "^3.1.1",
+    "tracked-built-ins": "^3.1.1<% if (typescript) { %>",
+    "typescript": "^5.0.4<% } %>",
     "webpack": "^5.87.0"
   },
   "engines": {

diff --git a/blueprints/app/files/tsconfig.json b/blueprints/app/files/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "extends": "@tsconfig/ember/tsconfig.json",
+  "compilerOptions": {
+    // The combination of `baseUrl` with `paths` allows Ember's classic package
+    // layout, which is not resolvable with the Node resolution algorithm, to
+    // work with TypeScript.
+    "baseUrl": ".",
+    "paths": {
+      "<%= name %>/tests/*": ["tests/*"],
+      "<%= name %>/*": ["app/*"],
+      "*": ["types/*"]
+    }
+  }
+}
diff --git a/blueprints/app/files/types/ember-data/types/registries/model.d.ts b/blueprints/app/files/types/ember-data/types/registries/model.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Catch-all for ember-data.
+ */
+export default interface ModelRegistry {
+  [key: string]: any;
+}
diff --git a/blueprints/app/files/types/global.d.ts b/blueprints/app/files/types/global.d.ts
@@ -0,0 +1 @@
+import '@glint/environment-ember-loose';
diff --git a/blueprints/app/index.js b/blueprints/app/index.js
@@ -72,11 +72,19 @@ module.exports = {
 
     let files = this._super();
     if (options.ciProvider !== 'travis') {
-      this._files = files.filter((file) => file !== '.travis.yml');
+      files = files.filter((file) => file !== '.travis.yml');
     } else {
-      this._files = files.filter((file) => file.indexOf('.github') < 0);
+      files = files.filter((file) => file.indexOf('.github') < 0);
     }
 
+    if (!options.typescript) {
+      files = files.filter(
+        (file) => !['tsconfig.json', 'app/config/', 'types/'].includes(file) && !file.endsWith('.d.ts')
+      );
+    }
+
+    this._files = files;
+
     return this._files;
   },
 
@@ -88,10 +96,4 @@ module.exports = {
     this.ui.writeLine('');
     this.ui.writeLine(prependEmoji('✨', `Creating a new Ember app in ${chalk.yellow(process.cwd())}:`));
   },
-
-  async afterInstall(options) {
-    if (options.typescript) {
-      await this.addAddonToProject({ name: 'ember-cli-typescript', blueprintOptions: options });
-    }
-  },
 };
diff --git a/tests/acceptance/init-test.js b/tests/acceptance/init-test.js
@@ -47,8 +47,10 @@ describe('Acceptance: ember init', function () {
 
   function confirmBlueprinted(typescript = false) {
     let blueprintPath = path.join(root, 'blueprints', 'app', 'files');
-    // ignore .travis.yml
-    let expected = walkSync(blueprintPath, { ignore: ['.travis.yml'] })
+    // ignore .travis.yml and TypeScript files
+    let expected = walkSync(blueprintPath, {
+      ignore: ['.travis.yml', 'tsconfig.json', 'types', 'app/config'],
+    })
       .map((name) => (typescript ? name : name.replace(/\.ts$/, '.js')))
       .sort();
     let actual = walkSync('.').sort();