Merge pull request #242 from elwayman02/3.24-blueprint

elwayman02 · web-flow · commit 9e1272efb6aa · 2021-01-07T14:21:48.000-08:00
Update to 3.24 Blueprint
diff --git a/.eslintignore b/.eslintignore
@@ -13,6 +13,7 @@
 # misc
 /coverage/
 !.*
+.eslintcache
 
 # ember-try
 /.node_modules.ember-try/
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -7,48 +7,48 @@ module.exports = {
     ecmaVersion: 2018,
     sourceType: 'module',
     ecmaFeatures: {
-      legacyDecorators: true
-    }
+      legacyDecorators: true,
+    },
   },
-  plugins: [
-    'ember'
-  ],
+  plugins: ['ember'],
   extends: [
     'eslint:recommended',
-    'plugin:ember/recommended'
+    'plugin:ember/recommended',
+    'plugin:prettier/recommended',
   ],
   env: {
-    browser: true
+    browser: true,
   },
   rules: {},
   overrides: [
     // node files
     {
       files: [
         '.eslintrc.js',
+        '.prettierrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',
         'index.js',
         'testem.js',
         'blueprints/*/index.js',
         'config/**/*.js',
-        'tests/dummy/config/**/*.js'
+        'tests/dummy/config/**/*.js',
       ],
       excludedFiles: [
         'addon/**',
         'addon-test-support/**',
         'app/**',
-        'tests/dummy/app/**'
+        'tests/dummy/app/**',
       ],
       parserOptions: {
-        sourceType: 'script'
+        sourceType: 'script',
       },
       env: {
         browser: false,
-        node: true
+        node: true,
       },
       plugins: ['node'],
-      extends: ['plugin:node/recommended']
-    }
-  ]
+      extends: ['plugin:node/recommended'],
+    },
+  ],
 };
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@
 /.env*
 /.pnp*
 /.sass-cache
+/.eslintcache
 /connect.lock
 /coverage/
 /libpeerconnection.log
diff --git a/.npmignore b/.npmignore
@@ -10,6 +10,7 @@
 /.editorconfig
 /.ember-cli
 /.env*
+/.eslintcache
 /.eslintignore
 /.eslintrc.js
 /.git/
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.js b/.prettierrc.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  singleQuote: true,
+};
diff --git a/.template-lintrc.js b/.template-lintrc.js
@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  extends: 'octane'
+  extends: 'octane',
 };
diff --git a/addon/modifiers/did-intersect.js b/addon/modifiers/did-intersect.js
@@ -2,7 +2,7 @@ import Modifier from 'ember-modifier';
 import { inject as service } from '@ember/service';
 import { assert } from '@ember/debug';
 
-export const DEFAULT_OBSERVER_OPTIONS = {}
+export const DEFAULT_OBSERVER_OPTIONS = {};
 
 export default class DidIntersectModifier extends Modifier {
   @service('ember-scroll-modifiers@observer-manager') observerManager;
diff --git a/addon/services/observer-manager.js b/addon/services/observer-manager.js
@@ -5,7 +5,7 @@ export default class ObserverManagerService extends Service {
   _admin = new IntersectionObserverAdmin();
 
   observe(element, options) {
-    this._admin.observe(element, options)
+    this._admin.observe(element, options);
   }
 
   unobserve(element, options) {
diff --git a/config/deploy.js b/config/deploy.js
@@ -1,9 +1,9 @@
 /* eslint-env node */
 'use strict';
 
-module.exports = function(deployTarget) {
+module.exports = function (deployTarget) {
   let ENV = {
-    build: {}
+    build: {},
     // include other plugin configuration that applies to all deploy targets here
   };
 
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -2,78 +2,78 @@
 
 const getChannelURL = require('ember-source-channel-url');
 
-module.exports = async function() {
+module.exports = async function () {
   return {
     useYarn: true,
     scenarios: [
       {
         name: 'ember-lts-3.16',
         npm: {
           devDependencies: {
-            'ember-source': '~3.16.0'
-          }
-        }
+            'ember-source': '~3.16.0',
+          },
+        },
       },
       {
         name: 'ember-lts-3.20',
         npm: {
           devDependencies: {
-            'ember-source': '~3.20.5'
-          }
-        }
+            'ember-source': '~3.20.5',
+          },
+        },
       },
       {
         name: 'ember-release',
         npm: {
           devDependencies: {
-            'ember-source': await getChannelURL('release')
-          }
-        }
+            'ember-source': await getChannelURL('release'),
+          },
+        },
       },
       {
         name: 'ember-beta',
         npm: {
           devDependencies: {
-            'ember-source': await getChannelURL('beta')
-          }
-        }
+            'ember-source': await getChannelURL('beta'),
+          },
+        },
       },
       {
         name: 'ember-canary',
         npm: {
           devDependencies: {
-            'ember-source': await getChannelURL('canary')
-          }
-        }
+            'ember-source': await getChannelURL('canary'),
+          },
+        },
       },
       {
         name: 'ember-default-with-jquery',
         env: {
           EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            'jquery-integration': true
-          })
+            'jquery-integration': true,
+          }),
         },
         npm: {
           devDependencies: {
-            '@ember/jquery': '^1.1.0'
-          }
-        }
+            '@ember/jquery': '^1.1.0',
+          },
+        },
       },
       {
         name: 'ember-classic',
         env: {
           EMBER_OPTIONAL_FEATURES: JSON.stringify({
             'application-template-wrapper': true,
             'default-async-observers': false,
-            'template-only-glimmer-components': false
-          })
+            'template-only-glimmer-components': false,
+          }),
         },
         npm: {
           ember: {
-            edition: 'classic'
-          }
-        }
-      }
-    ]
+            edition: 'classic',
+          },
+        },
+      },
+    ],
   };
 };
diff --git a/config/environment.js b/config/environment.js
@@ -1,5 +1,5 @@
 'use strict';
 
-module.exports = function(/* environment, appConfig */) {
-  return { };
+module.exports = function (/* environment, appConfig */) {
+  return {};
 };
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -2,7 +2,7 @@
 
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
-module.exports = function(defaults) {
+module.exports = function (defaults) {
   let app = new EmberAddon(defaults, {
     // Add options here
   });
diff --git a/index.js b/index.js
@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  name: require('./package').name
+  name: require('./package').name,
 };
diff --git a/package.json b/package.json
@@ -17,11 +17,14 @@
   },
   "scripts": {
     "build": "ember build --environment=production",
-    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
+    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
+    "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
     "lint:hbs": "ember-template-lint .",
-    "lint:js": "eslint .",
+    "lint:hbs:fix": "ember-template-lint . --fix",
+    "lint:js": "eslint . --cache",
+    "lint:js:fix": "eslint . --fix",
     "start": "ember serve",
-    "test": "npm-run-all lint:* test:*",
+    "test": "npm-run-all lint test:*",
     "test:ember": "ember test",
     "test:ember-compatibility": "ember try:each"
   },
@@ -35,11 +38,12 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
+    "@ember/test-helpers": "^2.1.4",
     "@glimmer/component": "^1.0.3",
     "@glimmer/tracking": "^1.0.3",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.23.0",
+    "ember-cli": "~3.24.0",
     "ember-cli-addon-docs": "^0.9.0",
     "ember-cli-addon-docs-yuidoc": "^1.0.0",
     "ember-cli-dependency-checker": "^3.2.0",
@@ -55,18 +59,23 @@
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^4.6.0",
+    "ember-page-title": "^6.0.3",
+    "ember-qunit": "^5.1.1",
     "ember-resolver": "^8.0.2",
     "ember-sinon-qunit": "^5.0.0",
     "ember-source": "~3.24.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^2.15.0",
     "ember-try": "^1.4.0",
     "eslint": "^7.17.0",
+    "eslint-config-prettier": "^7.1.0",
     "eslint-plugin-ember": "^10.1.1",
     "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^3.3.1",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
+    "prettier": "^2.2.1",
+    "qunit": "^2.13.0",
     "qunit-dom": "^1.6.0",
     "release-it": "^14.2.2",
     "release-it-lerna-changelog": "^3.1.0",
diff --git a/testem.js b/testem.js
@@ -3,12 +3,8 @@
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,
-  launch_in_ci: [
-    'Chrome'
-  ],
-  launch_in_dev: [
-    'Chrome'
-  ],
+  launch_in_ci: ['Chrome'],
+  launch_in_dev: ['Chrome'],
   browser_start_timeout: 120,
   browser_args: {
     Chrome: {
@@ -20,8 +16,8 @@ module.exports = {
         '--disable-software-rasterizer',
         '--mute-audio',
         '--remote-debugging-port=0',
-        '--window-size=1440,900'
-      ].filter(Boolean)
-    }
-  }
+        '--window-size=1440,900',
+      ].filter(Boolean),
+    },
+  },
 };
diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js
@@ -6,8 +6,8 @@ export default class Router extends AddonDocsRouter {
   rootURL = config.rootURL;
 }
 
-Router.map(function() {
-  docsRoute(this, function() {
+Router.map(function () {
+  docsRoute(this, function () {
     this.route('did-intersect');
   });
 
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": "3.21.2",
+      "version": "3.24.0",
       "blueprints": [
         {
           "name": "addon",
diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
diff --git a/tests/dummy/config/targets.js b/tests/dummy/config/targets.js
diff --git a/tests/index.html b/tests/index.html
diff --git a/tests/integration/modifiers/did-intersect-test.js b/tests/integration/modifiers/did-intersect-test.js
diff --git a/tests/test-helper.js b/tests/test-helper.js
diff --git a/tests/unit/services/observer-manager-test.js b/tests/unit/services/observer-manager-test.js
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ export default class ObserverManagerService extends Service {`
`5`	`5`	`_admin = new IntersectionObserverAdmin();`
`6`	`6`
`7`	`7`	`observe(element, options) {`
`8`		`- this._admin.observe(element, options)`
	`8`	`+ this._admin.observe(element, options);`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`unobserve(element, options) {`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ export default class Router extends AddonDocsRouter {`
`6`	`6`	`rootURL = config.rootURL;`
`7`	`7`	`}`
`8`	`8`
`9`		`-Router.map(function() {`
`10`		`- docsRoute(this, function() {`
	`9`	`+Router.map(function () {`
	`10`	`+ docsRoute(this, function () {`
`11`	`11`	`this.route('did-intersect');`
`12`	`12`	`});`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"packages": [`
`4`	`4`	`{`
`5`	`5`	`"name": "ember-cli",`
`6`		`- "version": "3.21.2",`
	`6`	`+ "version": "3.24.0",`
`7`	`7`	`"blueprints": [`
`8`	`8`	`{`
`9`	`9`	`"name": "addon",`