run npx ember-cli-update --to=4.3.0 to align with blueprint

adopted-ember-addons · Apr 22, 2022 · 46efef8 · 46efef8
1 parent b4ebe43
commit 46efef8
Show file tree

Hide file tree

Showing 26 changed files with 719 additions and 403 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,25 @@
-node_modules
+# See https://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+dist/
+
+# dependencies
+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
+package.json.ember-try
+yarn.lock.ember-try
diff --git a/addon/.gitignore b/addon/.gitignore
diff --git a/addon/package.json b/addon/package.json
@@ -34,26 +34,26 @@
   },
   "dependencies": {
     "@embroider/addon-shim": "^1.5.0",
+    "ember-destroyable-polyfill": "^2.0.3",
     "ember-modifier": "^2.1.2 || ^3.1.0",
-    "ember-modifier-manager-polyfill": "^1.2.0",
-    "ember-destroyable-polyfill": "^2.0.3"
+    "ember-modifier-manager-polyfill": "^1.2.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.17.7",
+    "@babel/core": "^7.17.9",
     "@babel/eslint-parser": "^7.17.0",
     "@babel/plugin-proposal-class-properties": "^7.16.7",
-    "@babel/plugin-proposal-decorators": "^7.17.2",
-    "@embroider/addon-dev": "^1.5.0",
+    "@babel/plugin-proposal-decorators": "^7.17.9",
+    "@embroider/addon-dev": "^1.6.0",
     "@rollup/plugin-babel": "^5.3.1",
-    "ember-template-lint": "^4.3.0",
-    "eslint": "^8.11.0",
+    "ember-template-lint": "^4.4.2",
+    "eslint": "^8.13.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-ember": "^10.5.9",
+    "eslint-plugin-ember": "^10.6.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-qunit": "^7.2.0",
-    "prettier": "^2.6.0",
-    "rollup": "^2.70.1"
+    "prettier": "^2.6.2",
+    "rollup": "^2.70.2"
   },
   "peerDependencies": {
     "@ember/test-helpers": "^2.6.0"

diff --git a/docs/.ember-cli b/docs/.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
 }
diff --git a/docs/.eslintignore b/docs/.eslintignore
@@ -19,5 +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
diff --git a/docs/.eslintrc.js b/docs/.eslintrc.js
@@ -33,7 +33,10 @@ module.exports = {
         './.template-lintrc.js',
         './ember-cli-build.js',
         './testem.js',
+        './blueprints/*/index.js',
         './config/**/*.js',
+        './lib/*/index.js',
+        './server/**/*.js',
       ],
       parserOptions: {
         sourceType: 'script',
@@ -46,7 +49,7 @@ module.exports = {
       extends: ['plugin:node/recommended'],
     },
     {
-      // Test files:
+      // test files
       files: ['tests/**/*-test.{js,ts}'],
       extends: ['plugin:qunit/recommended'],
     },

diff --git a/docs/.gitignore b/docs/.gitignore
@@ -23,5 +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/
diff --git a/docs/README.md b/docs/README.md
@@ -8,7 +8,8 @@ A short introduction of this app could easily go here.
 You will need the following things properly installed on your computer.
 
 * [Git](https://git-scm.com/)
-* [Node.js](https://nodejs.org/) (with npm)
+* [Node.js](https://nodejs.org/)
+* [Yarn](https://yarnpkg.com/)
 * [Ember CLI](https://cli.emberjs.com/release/)
 * [Google Chrome](https://google.com/chrome/)
 
@@ -35,8 +36,8 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Linting
 
-* `yarn run lint`
-* `yarn run lint:fix`
+* `yarn lint`
+* `yarn lint:fix`
 
 ### Building
 

diff --git a/docs/app/index.html b/docs/app/index.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>Ember Keyboard</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">

diff --git a/docs/config/ember-cli-update.json b/docs/config/ember-cli-update.json
@@ -3,14 +3,15 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "v4.2.0",
+      "version": "4.3.0",
       "blueprints": [
         {
           "name": "app",
           "outputRepo": "https://github.com/ember-cli/ember-new-output",
           "codemodsSource": "ember-app-codemods-manifest@1",
           "isBaseBlueprint": true,
           "options": [
+            "--yarn",
             "--no-welcome"
           ]
         }

diff --git a/docs/package.json b/docs/package.json
@@ -1,6 +1,7 @@
 {
   "name": "docs",
   "version": "8.1.1",
+  "private": true,
   "description": "Documentation site for ember-keyboard Ember.js addon",
   "keywords": [],
   "repository": {
@@ -31,16 +32,15 @@
     "@babel/eslint-parser": "^7.17.0",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
-    "@embroider/test-setup": "^1.5.0",
-    "@glimmer/component": "^1.0.4",
-    "@glimmer/tracking": "^1.0.4",
-    "babel-eslint": "^10.1.0",
+    "@embroider/test-setup": "^1.6.0",
+    "@glimmer/component": "^1.1.2",
+    "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "^2.4.0",
-    "ember-cli": "~4.2.0",
-    "ember-cli-babel": "^7.26.6",
-    "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-fastboot": "^3.2.0",
+    "ember-auto-import": "^2.4.1",
+    "ember-cli": "~4.3.0",
+    "ember-cli-babel": "^7.26.11",
+    "ember-cli-dependency-checker": "^3.3.1",
+    "ember-cli-fastboot": "^3.3.0",
     "ember-cli-github-pages": "0.2.2",
     "ember-cli-htmlbars": "^6.0.1",
     "ember-cli-inject-live-reload": "^2.1.0",
@@ -51,27 +51,27 @@
     "ember-keyboard": "8.1.1",
     "ember-load-initializers": "^2.1.2",
     "ember-on-helper": "^0.1.0",
-    "ember-qunit": "^5.1.4",
+    "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.3",
     "ember-set-helper": "^2.0.1",
-    "ember-source": "~4.2.0",
-    "ember-template-lint": "^4.3.0",
+    "ember-source": "~4.3.0",
+    "ember-template-lint": "^4.4.2",
     "ember-test-selectors": "^6.0.0",
     "ember-try": "^2.0.0",
-    "eslint": "^8.11.0",
+    "eslint": "^8.13.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-ember": "^10.5.9",
+    "eslint-plugin-ember": "^10.6.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-qunit": "^7.2.0",
-    "highlight.js": "^11.5.0",
+    "highlight.js": "^11.5.1",
     "loader.js": "^4.7.0",
-    "marked": "^4.0.4",
+    "marked": "^4.0.14",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.6.0",
-    "qunit": "^2.18.0",
+    "prettier": "^2.6.2",
+    "qunit": "^2.18.2",
     "qunit-dom": "^2.0.0",
-    "webpack": "^5.70.0"
+    "webpack": "^5.72.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"

diff --git a/docs/tests/helpers/.gitkeep b/docs/tests/helpers/.gitkeep
diff --git a/docs/tests/helpers/index.js b/docs/tests/helpers/index.js
@@ -0,0 +1,42 @@
+import {
+  setupApplicationTest as upstreamSetupApplicationTest,
+  setupRenderingTest as upstreamSetupRenderingTest,
+  setupTest as upstreamSetupTest,
+} from 'ember-qunit';
+
+// This file exists to provide wrappers around ember-qunit's / ember-mocha's
+// test setup functions. This way, you can easily extend the setup that is
+// needed per test type.
+
+function setupApplicationTest(hooks, options) {
+  upstreamSetupApplicationTest(hooks, options);
+
+  // Additional setup for application tests can be done here.
+  //
+  // For example, if you need an authenticated session for each
+  // application test, you could do:
+  //
+  // hooks.beforeEach(async function () {
+  //   await authenticateSession(); // ember-simple-auth
+  // });
+  //
+  // This is also a good place to call test setup functions coming
+  // from other addons:
+  //
+  // setupIntl(hooks); // ember-intl
+  // setupMirage(hooks); // ember-cli-mirage
+}
+
+function setupRenderingTest(hooks, options) {
+  upstreamSetupRenderingTest(hooks, options);
+
+  // Additional setup for rendering tests can be done here.
+}
+
+function setupTest(hooks, options) {
+  upstreamSetupTest(hooks, options);
+
+  // Additional setup for unit tests can be done here.
+}
+
+export { setupApplicationTest, setupRenderingTest, setupTest };
diff --git a/docs/tests/index.html b/docs/tests/index.html
@@ -2,8 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>docs Tests</title>
+    <title>Docs Tests</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-  "private": true,
   "version": "8.1.1",
+  "private": true,
   "repository": {
     "type": "git",
     "url": "https://github.com/adopted-ember-addons/ember-keyboard.git"
@@ -16,7 +16,7 @@
     "test": "cd test-app && yarn test"
   },
   "devDependencies": {
-    "release-it": "^14.12.5",
+    "release-it": "^14.14.2",
     "release-it-lerna-changelog": "^4.0.1",
     "release-it-yarn-workspaces": "^2.0.1"
   },

diff --git a/test-app/.ember-cli b/test-app/.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
 }
diff --git a/test-app/.eslintignore b/test-app/.eslintignore
@@ -19,5 +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
diff --git a/test-app/.eslintrc.js b/test-app/.eslintrc.js
@@ -33,7 +33,10 @@ module.exports = {
         './.template-lintrc.js',
         './ember-cli-build.js',
         './testem.js',
+        './blueprints/*/index.js',
         './config/**/*.js',
+        './lib/*/index.js',
+        './server/**/*.js',
       ],
       parserOptions: {
         sourceType: 'script',
@@ -46,7 +49,7 @@ module.exports = {
       extends: ['plugin:node/recommended'],
     },
     {
-      // Test files:
+      // test files
       files: ['tests/**/*-test.{js,ts}'],
       extends: ['plugin:qunit/recommended'],
     },

diff --git a/test-app/.gitignore b/test-app/.gitignore
@@ -23,5 +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/