Merge pull request #361 from ember-bootstrap/upgrade-blueprint-files-to-ember-cli-4.10

upgrade blueprint files to Ember CLI 4.10

Author: jelhan

.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

@@ -41,11 +41,10 @@ module.exports = {
         browser: false,
         node: true,
       },
-      plugins: ['node'],
-      extends: ['plugin:node/recommended'],
+      extends: ['plugin:n/recommended'],
     },
     {
-      // Test files:
+      // test files
       files: ['tests/**/*-test.{js,ts}'],
       extends: ['plugin:qunit/recommended'],
     },

.github/workflows/ci.yml

@@ -3,76 +3,83 @@ name: CI
 on:
   push:
     branches:
+      - main
       - master
       - renovate/*
     tags:
       - '*'
-  pull_request:
+  pull_request: {}
   schedule:
     - cron:  '0 4 * * 5' # Fridays at 4am
 
+concurrency:
+  group: ci-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
-    name: Tests
+    name: "Tests"
     runs-on: ubuntu-latest
+    timeout-minutes: 10
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Setup node.js
+      - uses: actions/checkout@v3
+      - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 14
-      - name: Install dependencies
-        uses: bahmutov/npm-install@v1
+          node-version: 14.x
+          cache: yarn
+      - name: Install Dependencies
+        run: yarn install --frozen-lockfile
       - name: Lint
         run: yarn lint
-      - name: Test
+      - name: Run Tests
         run: yarn test:ember
 
-  test-no-lock:
-    name: Floating Dependencies
+  floating:
+    name: "Floating Dependencies"
     runs-on: ubuntu-latest
-    needs:
-      - test
+    timeout-minutes: 10
+
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Setup node.js
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14
-      - name: Install dependencies
-        uses: bahmutov/npm-install@v1
-        with:
-          useLockFile: false
-      - name: Test
+          node-version: 14.x
+          cache: yarn
+      - name: Install Dependencies
+        run: yarn install --no-lockfile
+      - name: Run Tests
         run: yarn test:ember
 
-  test-try:
-    name: Additional Tests
+  try-scenarios:
+    name: ${{ matrix.try-scenario }}
     runs-on: ubuntu-latest
-    needs:
-      - test
+    needs: "test"
+    timeout-minutes: 10
+
     strategy:
       fail-fast: false
       matrix:
-        scenario:
+        try-scenario:
           - ember-lts-3.28
           - ember-lts-4.4
           - ember-lts-4.8
           - ember-release
           - ember-beta
           - ember-canary
           - ember-classic
+          # - embroider-safe
+          # - embroider-optimized
+
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Setup node.js
+      - uses: actions/checkout@v3
+      - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 14
-      - name: Install dependencies
-        uses: bahmutov/npm-install@v1
-      - name: Test
-        run: yarn ember try:one ${{ matrix.scenario }}
+          node-version: 14.x
+          cache: yarn
+      - name: Install Dependencies
+        run: yarn install --frozen-lockfile
+      - 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,14 +14,14 @@
 /.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
@@ -33,4 +33,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,8 +14,12 @@
 /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

.prettierrc.js

@@ -1,5 +1,12 @@
 'use strict';
 
 module.exports = {
-  singleQuote: true,
+  overrides: [
+    {
+      files: '*.{js,ts}',
+      options: {
+        singleQuote: true,
+      },
+    },
+  ],
 };

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/).

README.md

@@ -7,8 +7,7 @@
 Integrate [Ember Power Select](http://www.ember-power-select.com/) into your [Ember Bootstrap](https://www.ember-bootstrap.com)
 forms.
 
-Compatibility
-------------------------------------------------------------------------------
+## Compatibility
 
 * Ember Power Select v6 or above
 * Ember Bootstrap v5 or above
@@ -17,8 +16,7 @@ Compatibility
 * Node.js v14 or above
 
 
-Installation
-------------------------------------------------------------------------------
+## Installation
 
 ```bash
 ember install ember-bootstrap-power-select
@@ -28,8 +26,7 @@ This will additionally install `ember-power-select` into your app, and setup its
 Bootstrap theme, either by importing the appropriate Less or Sass file (if you use one of these preprocessors), or by
 editing your `ember-cli-build.js` to include the static theme CSS (if you use plain CSS). 
 
-Usage
-------------------------------------------------------------------------------
+## Usage
 
 With this addon installed, you have a new `controlType` of `power-select` available. Use the `options` property to
 set the array of selectable options:
@@ -87,12 +84,10 @@ action are already wired up to the controlling `form.element` for you. Set any o
 
 Please consult the [Ember Power Select documentation](http://www.ember-power-select.com/docs) for all available options.
 
-Contributing
-------------------------------------------------------------------------------
+## Contributing
 
 See the [Contributing](CONTRIBUTING.md) guide for details.
 
-License
-------------------------------------------------------------------------------
+## License
 
 This project is licensed under the [MIT License](LICENSE.md).