ember-4.x

.ember-cli

@@ -5,5 +5,11 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
-  "disableAnalytics": false
+  "disableAnalytics": false,
+
+  /**
+  Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
+  rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
+  */
+  "isTypeScriptProject": false
 }

.eslintignore

@@ -19,4 +19,7 @@
 # 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

.eslintrc.js

@@ -45,7 +45,7 @@ module.exports = {
       extends: ['plugin:node/recommended'],
     },
     {
-      // Test files:
+      // test files
       files: ['tests/**/*-test.{js,ts}'],
       extends: ['plugin:qunit/recommended'],
     },

.github/workflows/ci.yml

@@ -1,83 +1,79 @@
 name: CI
 
 on:
-  pull_request:
   push:
-    # filtering branches here prevents duplicate builds from pull_request and push
     branches:
       - main
-  schedule:
-    - cron: '0 3 * * 0' # every Sunday at 3am
+      - master
+  pull_request: {}
 
-env:
-  CI: true
+concurrency:
+  group: ci-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
 
 jobs:
-  tests:
-    if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
-    name: Base Tests
-    timeout-minutes: 5
+  test:
+    name: 'Tests'
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node:
-          - '12'
-          - '14'
+    timeout-minutes: 10
+
     steps:
-      - uses: actions/checkout@v2
-      - uses: volta-cli/action@v1
+      - uses: actions/checkout@v3
+      - name: Install Node
+        uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node }}
-
-      - run: npm ci
-
-      - name: Test with ${{ matrix.node }}
+          node-version: 14.x
+          cache: npm
+      - name: Install Dependencies
+        run: npm ci
+      - name: Lint
+        run: npm run lint
+      - name: Run Tests
         run: npm run test:ember
 
-  floating-dependencies:
-    if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
-    name: Floating Dependencies
-    timeout-minutes: 5
+  floating:
+    name: 'Floating Dependencies'
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node:
-          - '12'
-          - '14'
+    timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: volta-cli/action@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node }}
-
-      - run: npm install --no-package-lock
-      - name: Test with Node ${{ matrix.node }}
+          node-version: 14.x
+          cache: npm
+      - name: Install Dependencies
+        run: npm install --no-shrinkwrap
+      - name: Run Tests
         run: npm run test:ember
 
   try-scenarios:
-    if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
-    name: 'Compatibility'
-    timeout-minutes: 5
+    name: ${{ matrix.try-scenario }}
     runs-on: ubuntu-latest
-    needs: tests
+    needs: 'test'
+    timeout-minutes: 10
 
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
-        ember-try-scenario:
-          - ember-lts-3.20
+        try-scenario:
           - ember-lts-3.24
+          - ember-lts-3.28
           - ember-release
-          # - ember-beta
-          # - ember-canary
+          - ember-beta
+          - ember-canary
           - ember-classic
+          - embroider-safe
+          - embroider-optimized
+
     steps:
-      - uses: actions/checkout@v2
-      - uses: volta-cli/action@v1
+      - uses: actions/checkout@v3
+      - name: Install Node
+        uses: actions/setup-node@v3
         with:
           node-version: 14.x
-      - name: install dependencies
+          cache: npm
+      - name: Install Dependencies
         run: npm ci
-      - name: test
-        run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
+      - name: Run Tests
+        run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

.gitignore

@@ -23,4 +23,10 @@
 # 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
+
+# broccoli-debug
+/DEBUG/

.npmignore

@@ -14,6 +14,7 @@
 /.eslintignore
 /.eslintrc.js
 /.git/
+/.github/
 /.gitignore
 /.prettierignore
 /.prettierrc.js
@@ -33,4 +34,7 @@
 # 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

.prettierignore

@@ -14,11 +14,15 @@
 /coverage/
 !.*
 .eslintcache
+.lint-todo/
 
 # 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
 
 # ignore due to block indent issues for code samples
 /tests/dummy/app/templates/application.hbs

CONTRIBUTING.md

@@ -22,4 +22,4 @@
 - `ember serve`
 - Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
-For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
+For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).