Merge branch 'master' into patch-1

Author: chriskrycho

.eslintrc.js

@@ -7,7 +7,7 @@ module.exports = {
     sourceType: 'module',
   },
   plugins: ['ember', '@typescript-eslint', 'prettier'],
-  extends: ['eslint:recommended', 'plugin:ember/recommended', 'prettier/@typescript-eslint'],
+  extends: ['eslint:recommended', 'plugin:ember/recommended', 'plugin:prettier/recommended'],
   env: {
     browser: true,
   },

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,9 @@
-<!-- Thanks for submitting a pull request! 🎉 -->
+<!--
 
-<!-- Please note that commit messages need to follow the [Conventional Commits](https://www.conventionalcommits.org) format.
+Thanks for submitting a pull request! 🎉
 
-For example:
-test: fix node tests when run locally with ts-node
+Please include a link to a GitHub issue if one exists.
 
--->
+If you don't hear from a maintainer within a few days, please feel free to ping us here or in #e-typescript on Discord!
 
-<!-- Also, please include a link to a github issue if one exists. -->
+-->

.github/workflows/ci.yml

@@ -20,32 +20,13 @@ env:
   CI: true
 
 jobs:
-  commitlint:
-      name: Lint Commits
-      runs-on: ubuntu-latest
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      steps:
-        - name: Checkout Code
-          uses: actions/checkout@v2
-          # We need the `with` argument here so that force pushes (e.g. from
-          # Renovate rebasing) work correctly.
-          # https://github.com/wagoid/commitlint-github-action/tree/d6a383492a776126bbeba8c1d797ead4baedaaae#usage
-          with:
-            fetch-depth: 0
-        - name: Commitlint
-          uses: wagoid/commitlint-github-action@v2.1.1
-
   test-locked-deps:
     name: Test (linux, locked dependencies)
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
         uses: actions/checkout@v2
-      - name: Install Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '^10'
+      - uses: volta-cli/action@v1
       # https://github.com/expo/expo-github-action/issues/20#issuecomment-541676895
       - name: Raise Watched File Limit
         run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
@@ -69,7 +50,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v1
         with:
-          node-version: '^10'
+          node-version: '^12'
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
       - name: Prepare CI Environment
@@ -86,10 +67,7 @@ jobs:
     steps:
       - name: Checkout Code
         uses: actions/checkout@v2
-      - name: Install Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '^10'
+      - uses: volta-cli/action@v1
       - name: Raise Watched File Limit
         run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
       - name: Install Dependencies
@@ -106,6 +84,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [test-locked-deps]
     strategy:
+      fail-fast: false
       matrix:
         deps:
           - ember-cli@latest
@@ -115,10 +94,7 @@ jobs:
     steps:
       - name: Checkout Code
         uses: actions/checkout@v2
-      - name: Install Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '^10'
+      - uses: volta-cli/action@v1
       - name: Raise Watched File Limit
         run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
       - name: Install Dependencies

.npmignore

@@ -9,28 +9,46 @@
 /.bowerrc
 /.editorconfig
 /.ember-cli
+/.env*
+/.eslintcache
 /.eslintignore
 /.eslintrc.js
+/.git/
+/.github/
 /.gitignore
+/.prettierignore
+/.prettierrc.js
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig
 /bower.json
 /config/ember-try.js
+/CONTRIBUTING.md
 /ember-cli-build.js
 /testem.js
 /tests/
+/yarn-error.log
 /yarn.lock
 .gitkeep
 
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
+/package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try
+
 # TS sources and compiled tests
 /ts/
 /js/tests/
 /test-fixtures/
 
-
-# ember-try
-/.node_modules.ember-try/
-/bower.json.ember-try
-/package.json.ember-try
-/config/addon-docs.js
+# custom
+/commitlint.config.js
+/.vscode/
+/renovate.json
+/CODE_OF_CONDUCT.md
+/rfcs
+/*.sh
+/.gitbook.yaml

.vscode/launch.json

@@ -11,7 +11,9 @@
       "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
       "args": [
         "-r", "register-ts-node",
-        "-f", "generates .d.ts files when addon and package names do not match",
+        "-f", "Acceptance: ember-cli-typescript generator",
+        "-f", "basic app",
+        "-t", "1000000",
         "ts/tests/**/*.{ts,js}"
       ],
       "internalConsoleOptions": "openOnSessionStart"

CHANGELOG.md

@@ -6,6 +6,57 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [4.2.1] - 2021-06-17
+
+This is a republish of 4.2.0 without the accidentally included 500+ MB of debugging copies of node_modules.
+
+## [4.2.0] - 2021-06-15
+
+### Added ⭐️
+
+- Install @types/ember-data__* when ember-data is found ([#1411])
+
+### Changed 💥
+
+- update option noEmitOnError to true ([#1415])
+
+### Documentation 📖
+
+- Update Broccoli URL ([#1409])
+- Improve sentence about declare modifier ([#1414])
+- Link to decorator usage doc from ED-models doc ([#1404])
+- Fix link to doc "working with route models" ([#1418])
+- Fix typo [in services docs] ([#1421])
+- @ember-data/object is not a thing ([#1429])
+- Update README.md ([#1425])
+
+### Under the hood 🚗
+
+- Fix qunit types... again ([#1401])
+- Rip out commitlint from CI ([#1430])
+- CI updates ([#1434])
+- Bump y18n from 3.2.1 to 3.2.2 ([#1420])
+- Bump underscore from 1.10.2 to 1.13.1 ([#1426])
+- Bump handlebars from 4.7.6 to 4.7.7 ([#1427])
+- Bump lodash from 4.17.20 to 4.17.21 ([#1428])
+
+[#1401]: https://github.com/typed-ember/ember-cli-typescript/pull/1401
+[#1404]: https://github.com/typed-ember/ember-cli-typescript/pull/1404
+[#1409]: https://github.com/typed-ember/ember-cli-typescript/pull/1409
+[#1411]: https://github.com/typed-ember/ember-cli-typescript/pull/1411
+[#1414]: https://github.com/typed-ember/ember-cli-typescript/pull/1414
+[#1415]: https://github.com/typed-ember/ember-cli-typescript/pull/1415
+[#1418]: https://github.com/typed-ember/ember-cli-typescript/pull/1418
+[#1420]: https://github.com/typed-ember/ember-cli-typescript/pull/1420
+[#1421]: https://github.com/typed-ember/ember-cli-typescript/pull/1421
+[#1425]: https://github.com/typed-ember/ember-cli-typescript/pull/1425
+[#1426]: https://github.com/typed-ember/ember-cli-typescript/pull/1426
+[#1427]: https://github.com/typed-ember/ember-cli-typescript/pull/1427
+[#1428]: https://github.com/typed-ember/ember-cli-typescript/pull/1428
+[#1429]: https://github.com/typed-ember/ember-cli-typescript/pull/1429
+[#1430]: https://github.com/typed-ember/ember-cli-typescript/pull/1430
+[#1434]: https://github.com/typed-ember/ember-cli-typescript/pull/1434
+
 ## [4.1.0] - 2021-02-03
 
 ### Added ⭐️
@@ -765,7 +816,9 @@ We now use Babel 7's support for TypeScript to build apps and addons. Most of th
 * Basic, semi-working functionality.
 
 [ember-cli-typify]: https://github.com/winding-lines/ember-cli-typify
-[unreleased]: https://github.com/typed-ember/ember-cli-typescript/compare/v4.1.0...HEAD
+[unreleased]: https://github.com/typed-ember/ember-cli-typescript/compare/v4.2.1...HEAD
+[4.2.1]: https://github.com/typed-ember/ember-cli-typescript/compare/v4.2.0...v4.2.1
+[4.2.0]: https://github.com/typed-ember/ember-cli-typescript/compare/v4.1.0...v4.2.0
 [4.1.0]: https://github.com/typed-ember/ember-cli-typescript/compare/v4.0.0...v4.1.0
 [4.0.0]: https://github.com/typed-ember/ember-cli-typescript/compare/v3.1.4...v4.0.0
 [4.0.0-rc.1]: https://github.com/typed-ember/ember-cli-typescript/compare/v4.0.0-alpha.1...v4.0.0-rc.1

README.md

@@ -182,7 +182,7 @@ We have a channel (**`#e-typescript`**) on the [Ember Community Discord server](
 
 ### 📚 Issues With Ember Type Definitions
 
-If you've found that some of the Ember type information is missing things, or is incorrect in some way, please first ensure you're using the latest version of the [packages this addon installs](https://ember-cli-typescript.com/docs#other-packages-this-addon-installs). Although [StackOverflow](https://stackoverflow.com/questions/tagged/ember.js+typescript) and [Discuss](https://discuss.emberjs.com/search?q=typescript) are not the advised places to report problems, you may find an answer there.
+If you've found that some of the Ember type information is missing things, or is incorrect in some way, please first ensure you're using the latest version of the [packages this addon installs](https://docs.ember-cli-typescript.com/installation#other-packages-this-addon-installs). Although [StackOverflow](https://stackoverflow.com/questions/tagged/ember.js+typescript) and [Discuss](https://discuss.emberjs.com/search?q=typescript) are not the advised places to report problems, you may find an answer there.
 
 If you don't find an answer, please [open an enhancement request or bug report in this project](https://github.com/typed-ember/ember-cli-typescript/issues/new/choose).
 

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>;
 };

blueprint-files/ember-cli-typescript/tsconfig.json

@@ -13,7 +13,7 @@
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "noImplicitReturns": true,
-    "noEmitOnError": false,
+    "noEmitOnError": true,
     "noEmit": true,
     "inlineSourceMap": true,
     "inlineSources": true,

docs/SUMMARY.md

@@ -8,7 +8,7 @@
   * [Decorators](ts/decorators.md)
   * [Current limitations](ts/current-limitations.md)
   * [Building Addons in TypeScript](ts/with-addons.md)
-  * [Understanding the `@types` Package Names](ts/package-names.md)
+  * [Understanding the @types Package Names](ts/package-names.md)
 * [Working With Ember](ember/README.md)
   * [Components](ember/components.md)
   * [Services](ember/services.md)
@@ -28,4 +28,3 @@
 * [Upgrading from 1.x](upgrade-notes.md)
 * [Troubleshooting](troubleshooting/README.md)
   * [Conflicting Type Dependencies](troubleshooting/conflicting-types.md)
-