Update ember-cli to 3.28.6

JulienVannier66 · JulienVannier66 · commit db4d26802efa · 2023-06-01T17:23:43.000+02:00
diff --git a/.eslintignore b/.eslintignore
@@ -13,6 +13,8 @@
 # misc
 /coverage/
 !.*
+.*/
+.eslintcache
 
 # ember-try
 /.node_modules.ember-try/
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@ storybook-static
 /.env*
 /.pnp*
 /.sass-cache
+/.eslintcache
 /connect.lock
 /coverage/
 /libpeerconnection.log
diff --git a/.npmignore b/.npmignore
@@ -10,10 +10,13 @@
 /.editorconfig
 /.ember-cli
 /.env*
+/.eslintcache
 /.eslintignore
 /.eslintrc.js
 /.git/
 /.gitignore
+/.prettierignore
+/.prettierrc.js
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig
@@ -23,6 +26,7 @@
 /ember-cli-build.js
 /testem.js
 /tests/
+/yarn-error.log
 /yarn.lock
 .gitkeep
 
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,21 @@
+# 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
diff --git a/.prettierrc b/.prettierrc
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -0,0 +1,14 @@
+'use strict';
+
+// eslint-disable-next-line no-undef
+module.exports = {
+  arrowParens: 'always',
+  bracketSpacing: true,
+  printWidth: 120,
+  proseWrap: 'preserve',
+  semi: true,
+  singleQuote: true,
+  tabWidth: 2,
+  trailingComma: 'none',
+  useTabs: false
+};
diff --git a/.template-lintrc.js b/.template-lintrc.js
@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = {
-  extends: 'octane',
+  extends: 'recommended',
 
   plugins: ['./linters/handlebars'],
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -8,9 +8,9 @@
 
 ## Linting
 
-* `npm run lint:hbs`
-* `npm run lint:js`
-* `npm run lint:js -- --fix`
+* `yarn lint`
+* `yarn lint:hbs`
+* `yarn lint:fix`
 
 ## Running tests
 
diff --git a/README.md b/README.md
@@ -9,9 +9,9 @@ components for usage in our projects.
 Compatibility
 ------------------------------------------------------------------------------
 
-* Ember.js v3.12 or above
-* Ember CLI v2.13 or above
-* Node.js v10 or above
+* Ember.js v3.24 or above
+* Ember CLI v3.24 or above
+* Node.js v12 or above
 
 
 Installation
diff --git a/addon/components/o-s-s/password-input.hbs b/addon/components/o-s-s/password-input.hbs
@@ -1,6 +1,6 @@
 <OSS::InputContainer @errorMessage={{this.errorMessage}} ...attributes>
   <:input>
-    <Input @value={{@value}} @placeholder={{this.placeholder}} type={{this.visibility}}
+    <Input @value={{@value}} @placeholder={{this.placeholder}} @type={{this.visibility}}
            {{on "keyup" this.validateInput}} autocomplete="current-password" />
   </:input>
   <:suffix>
diff --git a/addon/components/radio-button.js b/addon/components/radio-button.js
@@ -19,7 +19,7 @@ export default Component.extend({
   click(e) {
     e.stopPropagation();
     if (!this.disabled) {
-      // eslint-disable-next-line
+      // eslint-disable-next-line ember/closure-actions
       this.sendAction('onCheck', this.value);
     }
   }
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -1,23 +1,24 @@
 'use strict';
 
 const getChannelURL = require('ember-source-channel-url');
+const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
 
 module.exports = async function () {
   return {
     scenarios: [
       {
-        name: 'ember-lts-3.12',
+        name: 'ember-lts-3.24',
         npm: {
           devDependencies: {
-            'ember-source': '~3.12.0'
+            'ember-source': '~3.24.3'
           }
         }
       },
       {
-        name: 'ember-lts-3.16',
+        name: 'ember-lts-3.28',
         npm: {
           devDependencies: {
-            'ember-source': '~3.16.0'
+            'ember-source': '~3.28.0'
           }
         }
       },
@@ -45,16 +46,6 @@ module.exports = async function () {
           }
         }
       },
-      // The default `.travis.yml` runs this scenario via `npm test`,
-      // not via `ember try`. It's still included here so that running
-      // `ember try:each` manually or from a customized CI config will run it
-      // along with all the other scenarios.
-      {
-        name: 'ember-default',
-        npm: {
-          devDependencies: {}
-        }
-      },
       {
         name: 'ember-default-with-jquery',
         env: {
@@ -64,7 +55,7 @@ module.exports = async function () {
         },
         npm: {
           devDependencies: {
-            '@ember/jquery': '^0.5.1'
+            '@ember/jquery': '^1.1.0'
           }
         }
       },
@@ -78,11 +69,16 @@ module.exports = async function () {
           })
         },
         npm: {
+          devDependencies: {
+            'ember-source': '~3.28.0'
+          },
           ember: {
             edition: 'classic'
           }
         }
-      }
+      },
+      embroiderSafe(),
+      embroiderOptimized()
     ]
   };
 };
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -9,5 +9,19 @@ module.exports = function (defaults) {
     }
   });
 
-  return app.toTree();
+  /*
+    This build file specifies the options for the dummy test app of this
+    addon, located in `/tests/dummy`
+    This build file does *not* influence how the addon or the app using it
+    behave. You most likely want to be modifying `./index.js` or app's build file
+  */
+
+  const { maybeEmbroider } = require('@embroider/test-setup');
+  return maybeEmbroider(app, {
+    skipBabel: [
+      {
+        package: 'qunit'
+      }
+    ]
+  });
 };
diff --git a/package.json b/package.json
@@ -18,8 +18,11 @@
   "scripts": {
     "build": "ember build --environment=production",
     "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
+    "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
     "lint:hbs": "ember-template-lint .",
+    "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint .",
+    "lint:js:fix": "eslint . --fix",
     "start": "ember serve",
     "test": "npm-run-all lint:* test:*",
     "test:ember": "ember test --silent -r dot",
@@ -37,8 +40,8 @@
     "babel-plugin-debug-macros": "^0.3.1",
     "bootstrap": "^3.3.7",
     "calculate-cache-key-for-tree": "^2.0.0",
-    "ember-cli-babel": "^7.19.0",
-    "ember-cli-htmlbars": "^4.3.1",
+    "ember-cli-babel": "^7.26.10",
+    "ember-cli-htmlbars": "^5.7.2",
     "ember-cli-ifa": "^0.10.0",
     "ember-cli-less": "^1.5.3",
     "ember-cli-typescript": "^4.2.1",
@@ -52,11 +55,12 @@
   "devDependencies": {
     "@babel/core": "^7.11.6",
     "@ember/jquery": "^2.0.0",
-    "@ember/optional-features": "^1.3.0",
+    "@ember/optional-features": "^2.0.0",
     "@ember/render-modifiers": "^1.0.2",
     "@ember/test-helpers": "^2.8.1",
-    "@glimmer/component": "^1.0.0",
-    "@glimmer/tracking": "^1.0.0",
+    "@embroider/test-setup": "^0.48.1",
+    "@glimmer/component": "^1.0.4",
+    "@glimmer/tracking": "^1.0.4",
     "@storybook/addon-actions": "6.4.9",
     "@storybook/addon-essentials": "6.4.9",
     "@storybook/addon-links": "6.4.9",
@@ -91,37 +95,40 @@
     "babel-loader": "^8.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "ember-auto-import": "^1.5.3",
-    "ember-cli": "~3.18.0",
+    "ember-cli": "~3.28.6",
     "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-inject-live-reload": "^2.0.2",
+    "ember-cli-inject-live-reload": "^2.1.0",
+    "ember-cli-terser": "^4.0.2",
     "ember-cli-typescript-blueprints": "^3.0.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
-    "ember-load-initializers": "^2.1.1",
+    "ember-load-initializers": "^2.1.2",
     "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-page-title": "^6.2.2",
     "ember-qunit": "^5.1.5",
-    "ember-resolver": "^8.0.0",
+    "ember-resolver": "8.0.3",
     "ember-sinon-qunit": "^5.0.0",
-    "ember-source": "~3.18.0",
-    "ember-source-channel-url": "^2.0.1",
-    "ember-template-lint": "^2.6.0",
+    "ember-source": "~3.28.8",
+    "ember-source-channel-url": "^3.0.0",
+    "ember-template-lint": "^3.15.0",
     "ember-try": "^1.4.0",
-    "eslint": "^6.8.0",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-ember": "^8.4.0",
+    "eslint-plugin-ember": "^10.5.8",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.4.0",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-qunit": "^6.2.0",
     "less-loader": "^7.1.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.3.2",
+    "prettier": "^2.5.1",
     "qunit": "^2.17.2",
-    "qunit-dom": "^1.2.0",
+    "qunit-dom": "^1.6.0",
     "react-is": "^16.13.1",
     "typescript": "^4.4.4"
   },
   "engines": {
-    "node": "10.* || >= 12"
+    "node": "12.* || 14.* || >= 16"
   },
   "ember": {
     "edition": "octane"
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ export default Component.extend({`
`19`	`19`	`click(e) {`
`20`	`20`	`e.stopPropagation();`
`21`	`21`	`if (!this.disabled) {`
`22`		`- // eslint-disable-next-line`
	`22`	`+ // eslint-disable-next-line ember/closure-actions`
`23`	`23`	`this.sendAction('onCheck', this.value);`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,23 +1,24 @@`
`1`	`1`	`'use strict';`
`2`	`2`
`3`	`3`	`const getChannelURL = require('ember-source-channel-url');`
	`4`	`+const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');`
`4`	`5`
`5`	`6`	`module.exports = async function () {`
`6`	`7`	`return {`
`7`	`8`	`scenarios: [`
`8`	`9`	`{`
`9`		`- name: 'ember-lts-3.12',`
	`10`	`+ name: 'ember-lts-3.24',`
`10`	`11`	`npm: {`
`11`	`12`	`devDependencies: {`
`12`		`- 'ember-source': '~3.12.0'`
	`13`	`+ 'ember-source': '~3.24.3'`
`13`	`14`	`}`
`14`	`15`	`}`
`15`	`16`	`},`
`16`	`17`	`{`
`17`		`- name: 'ember-lts-3.16',`
	`18`	`+ name: 'ember-lts-3.28',`
`18`	`19`	`npm: {`
`19`	`20`	`devDependencies: {`
`20`		`- 'ember-source': '~3.16.0'`
	`21`	`+ 'ember-source': '~3.28.0'`
`21`	`22`	`}`
`22`	`23`	`}`
`23`	`24`	`},`
`@@ -45,16 +46,6 @@ module.exports = async function () {`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`	`},`
`48`		- // The default `.travis.yml` runs this scenario via `npm test`,
`49`		- // not via `ember try`. It's still included here so that running
`50`		- // `ember try:each` manually or from a customized CI config will run it
`51`		`- // along with all the other scenarios.`
`52`		`- {`
`53`		`- name: 'ember-default',`
`54`		`- npm: {`
`55`		`- devDependencies: {}`
`56`		`- }`
`57`		`- },`
`58`	`49`	`{`
`59`	`50`	`name: 'ember-default-with-jquery',`
`60`	`51`	`env: {`
`@@ -64,7 +55,7 @@ module.exports = async function () {`
`64`	`55`	`},`
`65`	`56`	`npm: {`
`66`	`57`	`devDependencies: {`
`67`		`- '@ember/jquery': '^0.5.1'`
	`58`	`+ '@ember/jquery': '^1.1.0'`
`68`	`59`	`}`
`69`	`60`	`}`
`70`	`61`	`},`
`@@ -78,11 +69,16 @@ module.exports = async function () {`
`78`	`69`	`})`
`79`	`70`	`},`
`80`	`71`	`npm: {`
	`72`	`+ devDependencies: {`
	`73`	`+ 'ember-source': '~3.28.0'`
	`74`	`+ },`
`81`	`75`	`ember: {`
`82`	`76`	`edition: 'classic'`
`83`	`77`	`}`
`84`	`78`	`}`
`85`		`- }`
	`79`	`+ },`
	`80`	`+ embroiderSafe(),`
	`81`	`+ embroiderOptimized()`
`86`	`82`	`]`
`87`	`83`	`};`
`88`	`84`	`};`