Merge pull request #362 from adopted-ember-addons/ember-cli-update

Sync with latest addon blueprint

Author: SergeAstapov

.ember-cli

@@ -1,9 +1,7 @@
 {
   /**
-    Ember CLI sends analytics information by default. The data is completely
-    anonymous, but there are times when you might want to disable this behavior.
-
-    Setting `disableAnalytics` to true will prevent any data from being sent.
+    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.
   */
-  "disableAnalytics": false
+  "isTypeScriptProject": false
 }

.github/workflows/ci.yml

@@ -7,59 +7,67 @@ on:
       - master
   pull_request: {}
 
+concurrency:
+  group: ci-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     name: "Tests"
     runs-on: ubuntu-latest
+    timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 18
           cache: npm
       - name: Install Dependencies
         run: npm ci
       - name: Lint
-        run: npm run lint:js
+        run: npm run lint
       - name: Run Tests
-        run: npm run test
+        run: npm run test:ember
 
   floating:
     name: "Floating Dependencies"
     runs-on: ubuntu-latest
+    timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 18
           cache: npm
       - name: Install Dependencies
         run: npm install --no-shrinkwrap
       - name: Run Tests
-        run: npm run test
+        run: npm run test:ember
 
   blueprints:
     name: "Blueprints Tests"
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - name: Install Node
+        uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 18
           cache: npm
       - name: Install Dependencies
-        run: npm install --no-shrinkwrap
+        run: npm ci
       - name: Run Tests
         run: npm run node-test
 
   try-scenarios:
     name: ${{ matrix.try-scenario }}
     runs-on: ubuntu-latest
-    needs: 'test'
+    needs: "test"
+    timeout-minutes: 10
 
     strategy:
       fail-fast: false
@@ -68,20 +76,24 @@ jobs:
           - ember-lts-3.20
           - ember-lts-3.24
           - ember-lts-3.28
+          - ember-lts-4.4
+          - ember-lts-4.8
+          - ember-lts-4.12
+          - ember-lts-5.4
+          - ember-lts-5.8
+          - ember-lts-5.12
           - ember-release
           - ember-beta
           - ember-canary
-          - ember-classic
-          - ember-default-with-jquery
           - embroider-safe
           - embroider-optimized
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 18
           cache: npm
       - name: Install Dependencies
         run: npm ci

.gitignore

@@ -1,26 +1,25 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
 # compiled output
 /dist/
-/tmp/
+/declarations/
 
 # dependencies
-/bower_components/
 /node_modules/
 
 # misc
 /.env*
 /.pnp*
-/.sass-cache
 /.eslintcache
-/connect.lock
 /coverage/
-/libpeerconnection.log
 /npm-debug.log*
 /testem.log
 /yarn-error.log
 
 # 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

@@ -2,11 +2,7 @@
 /dist/
 /tmp/
 
-# dependencies
-/bower_components/
-
 # misc
-/.bowerrc
 /.editorconfig
 /.ember-cli
 /.env*
@@ -18,23 +14,26 @@
 /.gitignore
 /.prettierignore
 /.prettierrc.js
+/.stylelintignore
+/.stylelintrc.js
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig
-/assets/
-/bower.json
-/config/ember-try.js
 /CONTRIBUTING.md
 /CODE_OF_CONDUCT.md
 /ember-cli-build.js
 /node-test/
 /testem.js
 /tests/
+/tsconfig.declarations.json
+/tsconfig.json
 /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

.prettierignore

@@ -1,21 +1,13 @@
 # unconventional js
 /blueprints/*/files/
-/vendor/
 
 # compiled output
 /dist/
-/tmp/
-
-# dependencies
-/bower_components/
-/node_modules/
 
 # misc
 /coverage/
 !.*
-.eslintcache
+.*/
 
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
-/package.json.ember-try

.prettierrc.cjs

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

.stylelintignore

@@ -0,0 +1,8 @@
+# unconventional files
+/blueprints/*/files/
+
+# compiled output
+/dist/
+
+# addons
+/.node_modules.ember-try/

.stylelintrc.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
+};

.watchmanconfig

@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp", "dist"]
+  "ignore_dirs": ["dist"]
 }

CONTRIBUTING.md

@@ -46,14 +46,24 @@ issue's number to the description of your pull-request.
 
 ## Installation
 
-First clone this repository:
+- `git clone https://github.com/adopted-ember-addons/ember-changeset-validations.git`
+- `cd ember-changeset-validations`
+- `npm install`
 
-```sh
-git clone https://github.com/poteto/ember-changeset-validations.git
-```
+## Linting
 
-<!-- Add further details on how to install the project here -->
+- `npm run lint`
+- `npm run lint:fix`
 
 ## Running tests
 
-<!-- Tell the user how to run the tests of your project -->
+- `npm run test` – Runs the test suite on the current Ember version
+- `npm run test:ember -- --server` – Runs the test suite in "watch mode"
+- `npm run test:ember-compatibility` – Runs the test suite against multiple Ember versions
+
+## Running the dummy application
+
+- `npm run start`
+- Visit the dummy application at [http://localhost:4200](http://localhost:4200).
+
+For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

README.md

@@ -577,25 +577,10 @@ We're grateful to these wonderful contributors who've contributed to `ember-chan
 
 [//]: contributor-faces
 
-## Installation
+## Contributing
 
-* `git clone <repository-url>` this repository
-* `cd ember-changeset-validations`
-* `npm install`
+See the [Contributing](CONTRIBUTING.md) guide for details.
 
-## Running
+## License
 
-* `ember serve`
-* Visit your app at [http://localhost:4200](http://localhost:4200).
-
-## Running Tests
-
-* `npm test` (Runs `ember try:each` to test your addon against multiple Ember versions)
-* `ember test`
-* `ember test --server`
-
-## Building
-
-* `ember build`
-
-For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
+This project is licensed under the [MIT License](LICENSE.md).