Merge branch 'master' into dependabot/npm_and_yarn/tmpl-1.0.5

Author: chriskrycho

blueprint-files/ember-cli-typescript/__config_root__/config/environment.d.ts

@@ -8,7 +8,7 @@ declare const config: {
   environment: string;
   modulePrefix: string;
   podModulePrefix: string;
-  locationType: string;
+  locationType: 'history' | 'hash' | 'none' | 'auto';
   rootURL: string;
   APP: Record<string, unknown>;
 };

ts/lib/commands/precompile.ts

@@ -53,8 +53,9 @@ export default command({
     // addon name from its package name, we use the addon name, since that is
     // how it will be written for imports.
     let addon = this.project.addons.find((addon) => addon.root === this.project.root);
-    if (addon && addon.name !== packageName) {
-      packageName = addon.name;
+    if (addon) {
+      let addonName = addon.moduleName ? addon.moduleName() : addon.name;
+      packageName = addonName;
     }
 
     let createdFiles = copyDeclarations(pathRoots, paths, packageName, this.project.root);

ts/tests/commands/precompile-test.ts

@@ -1,4 +1,5 @@
 import * as fs from 'fs-extra';
+import * as path from 'path';
 import { hook } from 'capture-console';
 import ember from 'ember-cli-blueprint-test-helpers/lib/helpers/ember';
 import blueprintHelpers from 'ember-cli-blueprint-test-helpers/helpers';
@@ -109,10 +110,57 @@ describe('Acceptance: ts:precompile command', function () {
     pkg.name = '@foo/my-addon'; // addon `name` is `my-addon`
     fs.writeJSONSync('package.json', pkg);
 
+    // CAUTION! HACKY CODE AHEAD!
+    // The ember blueprint helper stays in the same node process, so require
+    // keeps any previously read files cached. We need to clear out these
+    // caches so it picks up the changes properly.
+    delete require.cache[path.join(process.cwd(), 'index.js')];
+    delete require.cache[path.join(process.cwd(), 'package.json')];
+
     return ember(['ts:precompile']).then(() => {
       const declaration = file('test-support/test-file.d.ts');
       expect(declaration).to.exist;
       expect(declaration.content.trim()).to.equal(`export declare const testString: string;`);
     });
   });
+
+  it('generates .d.ts files for components when addon and moduleName do not match', function () {
+    fs.ensureDirSync('addon/components');
+    fs.writeFileSync(
+      'addon/components/my-component.ts',
+      `export const testString: string = 'hello';`
+    );
+    fs.ensureDirSync('addon-test-support');
+    fs.writeFileSync(
+      'addon-test-support/test-file.ts',
+      `export const anotherTestString: string = 'hello';`
+    );
+    fs.writeFileSync(
+      'index.js',
+      `module.exports = { name: '@foo/my-addon', moduleName() { return 'my-addon'; } };`
+    );
+
+    const pkg = fs.readJSONSync('package.json');
+    pkg.name = '@foo/my-addon'; // addon `moduleName()` is `my-addon`
+    fs.writeJSONSync('package.json', pkg);
+
+    // CAUTION! HACKY CODE AHEAD!
+    // The ember blueprint helper stays in the same node process, so require
+    // keeps any previously read files cached. We need to clear out these
+    // caches so it picks up the changes properly.
+    delete require.cache[path.join(process.cwd(), 'index.js')];
+    delete require.cache[path.join(process.cwd(), 'package.json')];
+
+    return ember(['ts:precompile']).then(() => {
+      const componentDecl = file('components/my-component.d.ts');
+      expect(componentDecl).to.exist;
+      expect(componentDecl.content.trim()).to.equal(`export declare const testString: string;`);
+
+      const testSupportDecl = file('test-support/test-file.d.ts');
+      expect(testSupportDecl).to.exist;
+      expect(testSupportDecl.content.trim()).to.equal(
+        `export declare const anotherTestString: string;`
+      );
+    });
+  });
 });

ts/types/ember-cli/index.d.ts

@@ -40,6 +40,7 @@ declare module 'ember-cli/lib/models/addon' {
     serverMiddleware(options: { app: Application; options?: TaskOptions }): void | Promise<void>;
     testemMiddleware(app: Application, options?: TaskOptions): void;
     setupPreprocessorRegistry(type: 'self' | 'parent', registry: PreprocessRegistry): void;
+    moduleName(): string;
   }
 }
 

yarn.lock

@@ -4550,21 +4550,21 @@ debug@3.1.0, debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@4.2.0, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
+debug@4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
   integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
   dependencies:
     ms "2.1.2"
 
-debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.1.1:
+debug@^3.0.1, debug@^3.1.0, debug@^3.1.1:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
   dependencies:
     ms "^2.1.1"
 
-debug@^4.3.2:
+debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2:
   version "4.3.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
   integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
@@ -6390,11 +6390,9 @@ flush-write-stream@^1.0.0:
     readable-stream "^2.3.6"
 
 follow-redirects@^1.0.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz#afa14f08ba12a52963140fe43212658897bc0ecb"
-  integrity sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA==
-  dependencies:
-    debug "^3.0.0"
+  version "1.14.7"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
+  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
 
 for-in@^1.0.2:
   version "1.0.2"