Ember 5.11 Blueprint Updates

* Add 4.12/5.4 ember-try scenarios * Bump various packages (non-breaking)
elwayman02 · Aug 21, 2024 · e0dfa26 · e0dfa26
1 parent 4834ab3
commit e0dfa26
Show file tree

Hide file tree

Showing 14 changed files with 517 additions and 219 deletions.
diff --git a/.ember-cli b/.ember-cli
@@ -1,12 +1,4 @@
 {
-  /**
-    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.
-  */
-  "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.

diff --git a/.eslintignore b/.eslintignore
@@ -1,25 +1,14 @@
 # unconventional js
 /blueprints/*/files/
-/vendor/
 
 # compiled output
+/declarations/
 /dist/
-/tmp/
-
-# dependencies
-/bower_components/
-/node_modules/
 
 # misc
 /coverage/
 !.*
 .*/
-.eslintcache
 
 # 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
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -54,6 +54,8 @@ jobs:
         try-scenario:
           - ember-lts-4.4
           - ember-lts-4.8
+          - ember-lts-4.12
+          - ember-lts-5.4
           - ember-release
           - embroider-safe
         experimental: [false]

diff --git a/.gitignore b/.gitignore
@@ -1,28 +1,21 @@
-# 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

diff --git a/.npmignore b/.npmignore
@@ -2,11 +2,7 @@
 /dist/
 /tmp/
 
-# dependencies
-/bower_components/
-
 # misc
-/.bowerrc
 /.editorconfig
 /.ember-cli
 /.env*
@@ -23,11 +19,12 @@
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig
-/bower.json
 /CONTRIBUTING.md
 /ember-cli-build.js
 /testem.js
 /tests/
+/tsconfig.declarations.json
+/tsconfig.json
 /yarn-error.log
 /yarn.lock
 /.yarn
@@ -36,7 +33,6 @@
 
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
 /npm-shrinkwrap.json.ember-try
 /package.json.ember-try
 /package-lock.json.ember-try

diff --git a/.prettierignore b/.prettierignore
@@ -1,25 +1,13 @@
 # unconventional js
 /blueprints/*/files/
-/vendor/
 
 # compiled output
 /dist/
-/tmp/
-
-# dependencies
-/bower_components/
-/node_modules/
 
 # misc
 /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
diff --git a/.watchmanconfig b/.watchmanconfig
@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp", "dist"]
+  "ignore_dirs": ["dist"]
 }
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -8,18 +8,18 @@
 
 ## Linting
 
-* `yarn lint`
-* `yarn lint:fix`
+- `yarn lint`
+- `yarn lint:fix`
 
 ## Running tests
 
-* `ember test` – Runs the test suite on the current Ember version
-* `ember test --server` – Runs the test suite in "watch mode"
-* `ember try:each` – Runs the test suite against multiple Ember versions
+- `yarn test` – Runs the test suite on the current Ember version
+- `yarn test:ember --server` – Runs the test suite in "watch mode"
+- `yarn test:ember-compatibility` – Runs the test suite against multiple Ember versions
 
 ## Running the dummy application
 
-* `ember serve`
-* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
+- `yarn 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/).
diff --git a/README.md b/README.md
@@ -8,12 +8,11 @@ Check out the [documentation](https://ember-scroll-modifiers.jhawk.co/)!
 
 We adhere to the [Ember Community Guidelines](https://emberjs.com/guidelines/) for our Code of Conduct.
 
-
 ## Compatibility
 
 * Ember.js v4.4 or above
 * Ember CLI v4.4 or above
-* Node.js v14 or above
+* Node.js v18 or above
 * [All N-1 Browsers](https://caniuse.com/#feat=intersectionobserver)
 
 
@@ -23,17 +22,14 @@ We adhere to the [Ember Community Guidelines](https://emberjs.com/guidelines/) f
 ember install ember-scroll-modifiers
 ```
 
-
 ## Usage
 
 [Longer description of how to use the addon in apps.]
 
-
 ## Contributing
 
 See the [Contributing](CONTRIBUTING.md) guide for details.
 
-
 ## License
 
 This project is licensed under the [MIT License](LICENSE.md).
diff --git a/package.json b/package.json
@@ -17,22 +17,22 @@
   },
   "scripts": {
     "build": "ember build --environment=production",
-    "lint": "concurrently \"npm:lint:*(!fix|hbs)\" --names \"lint:\"",
+    "lint": "concurrently \"yarn:lint:*(!fix|hbs)\" --names \"lint:\"",
     "lint:css": "stylelint \"**/*.css\"",
-    "lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
-    "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
+    "lint:css:fix": "concurrently \"yarn:lint:css -- --fix\"",
+    "lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"",
     "lint:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
     "start": "ember serve",
-    "test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
+    "test": "concurrently \"yarn:lint\" \"yarn:test:*\" --names \"lint,test:\"",
     "test:ember": "ember test",
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "ember-auto-import": "^2.6.3",
-    "ember-cli-babel": "^7.26.11",
+    "ember-auto-import": "^2.7.4",
+    "ember-cli-babel": "^7.26.11 || ^8.0.0",
     "ember-cli-htmlbars": "^6.3.0",
     "ember-modifier": "^4.1.0",
     "intersection-observer-admin": "^0.3.3"
@@ -41,15 +41,15 @@
     "@babel/eslint-parser": "^7.25.1",
     "@babel/plugin-proposal-decorators": "^7.24.7",
     "@babel/plugin-transform-class-static-block": "^7.24.7",
-    "@ember/optional-features": "^2.0.0",
-    "@ember/string": "^3.0.1",
-    "@ember/test-helpers": "^2.9.4",
+    "@ember/optional-features": "^2.1.0",
+    "@ember/test-helpers": "^3.3.1",
     "@embroider/test-setup": "^4.0.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^8.2.2",
     "ember-cli": "~5.11.0",
+    "ember-cli-clean-css": "^3.0.0",
     "ember-cli-dependency-checker": "^3.3.2",
     "ember-cli-deprecation-workflow": "^2.0.0",
     "ember-cli-fastboot": "^4.1.1",
@@ -61,32 +61,32 @@
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^8.2.3",
-    "ember-qunit": "^6.2.0",
+    "ember-qunit": "^8.1.0",
     "ember-resolver": "^11.0.1",
     "ember-sinon-qunit": "^6.0.0",
-    "ember-source": "~5.0.0",
+    "ember-source": "~5.11.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^6.0.0",
     "ember-try": "^3.0.0",
     "eslint": "^8.57.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-ember": "^11.11.1",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-ember": "^11.12.0",
     "eslint-plugin-n": "^17.10.2",
-    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-qunit": "^8.0.1",
+    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-qunit": "^8.1.1",
     "field-guide": "^2.4.0",
     "field-guide-default-template": "^3.0.0",
     "loader.js": "^4.7.0",
     "prember": "^2.0.0",
     "prettier": "^3.3.3",
-    "qunit": "^2.20.0",
+    "qunit": "^2.22.0",
     "qunit-dom": "^3.2.0",
     "release-it": "^15.11.0",
     "release-it-lerna-changelog": "^5.0.0",
     "sass": "^1.77.8",
     "stylelint": "^15.11.0",
     "stylelint-config-standard": "^34.0.0",
-    "stylelint-prettier": "^4.0.2",
+    "stylelint-prettier": "^4.1.0",
     "webpack": "^5.93.0"
   },
   "fastbootDependencies": [

diff --git a/tests/dummy/config/ember-cli-update.json b/tests/dummy/config/ember-cli-update.json
@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "4.12.1",
+      "version": "5.11.0",
       "blueprints": [
         {
           "name": "addon",

diff --git a/tests/dummy/config/ember-try.js b/tests/dummy/config/ember-try.js
@@ -23,6 +23,22 @@ module.exports = async function () {
           },
         },
       },
+      {
+        name: 'ember-lts-4.12',
+        npm: {
+          devDependencies: {
+            'ember-source': '~4.12.0',
+          },
+        },
+      },
+      {
+        name: 'ember-lts-5.4',
+        npm: {
+          devDependencies: {
+            'ember-source': '~5.4.0',
+          },
+        },
+      },
       {
         name: 'ember-release',
         npm: {

diff --git a/tests/helpers/index.js b/tests/helpers/index.js
@@ -4,7 +4,7 @@ import {
   setupTest as upstreamSetupTest,
 } from 'ember-qunit';
 
-// This file exists to provide wrappers around ember-qunit's / ember-mocha's
+// This file exists to provide wrappers around ember-qunit's
 // test setup functions. This way, you can easily extend the setup that is
 // needed per test type.
 
@@ -23,7 +23,7 @@ function setupApplicationTest(hooks, options) {
   // This is also a good place to call test setup functions coming
   // from other addons:
   //
-  // setupIntl(hooks); // ember-intl
+  // setupIntl(hooks, 'en-us'); // ember-intl
   // setupMirage(hooks); // ember-cli-mirage
 }