Merge pull request #103 from BBVAEngineering/feature-house-keeping

Resolving some issues

Author: adrigzr

.editorconfig

@@ -14,5 +14,5 @@ tab_width = 4
 [*.hbs]
 insert_final_newline = false
 
-[*.md]
+[*.{diff,md}]
 trim_trailing_whitespace = false

.eslintrc.js

@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
 	root: true,
 	parser: 'babel-eslint',

.huskyrc.js

@@ -3,6 +3,6 @@
 module.exports = {
 	hooks: {
 		'commit-msg': 'commitlint -E HUSKY_GIT_PARAMS',
-		'pre-push': 'npm run lint:js && npm run lint:hbs && npm test'
+		'pre-push': 'yarn test'
 	}
 };

.template-lintrc.js

@@ -10,7 +10,7 @@ module.exports = {
 		'deprecated-each-syntax': true,
 		'link-rel-noopener': true,
 		'no-invalid-interactive': true,
-		'img-alt-attributes': true,
+		'require-valid-alt-text': true,
 		'style-concatenation': true,
 		'deprecated-inline-view-helper': true,
 		'no-unused-block-params': true,

.travis.yml

@@ -7,62 +7,50 @@ dist: trusty
 addons:
   chrome: stable
 
-cache:
-  directories:
-    - $HOME/.npm
+cache: yarn
 
 env:
   global:
     - JOBS=1
 
 jobs:
-  fail_fast: true
+  fast_finish: true
   allow_failures:
     - env: EMBER_TRY_SCENARIO=ember-canary
 
   include:
     - stage: "Tests"
       before_install:
-        - npm config set spin false
-        - npm install -g npm@6
         - npm install -g codecov
-        - npm install -g greenkeeper-lockfile@1
         - npm install -g @commitlint/travis-cli
-        - npm --version
-      install:
-        - if [[ $TRAVIS_BRANCH =~ greenkeeper || $TRAVIS_PULL_REQUEST_BRANCH =~ greenkeeper ]]; then npm install; else npm ci; fi
-      before_script:
-        - greenkeeper-lockfile-update
+        - yarn --version
       script:
         - commitlint-travis
-        - npm run lint
-        - npm test
-      after_script:
-        - greenkeeper-lockfile-upload
+        - yarn lint
+        - yarn test
+        - yarn semantic-release --dry-run --branches=$TRAVIS_BRANCH
       after_success:
         - codecov --file=coverage/node/lcov.info
         - codecov --file=coverage/ember/lcov.info
 
     - stage: "Regression Tests"
-      env: EMBER_TRY_SCENARIO=ember-release
+      env: EMBER_TRY_SCENARIO=ember-lts-3.16
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.20
+    - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
     - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
+    - env: EMBER_TRY_SCENARIO=ember-classic
 
     - stage: "Release"
       script: skip
       deploy:
         provider: script
         skip_cleanup: true
-        before_script:
-          - npm uninstall husky
-        script:
-          - npx semantic-release
+        script: yarn semantic-release
 
 before_install:
-  - npm config set spin false
-  - npm install -g npm@6
-  - npm --version
+  - yarn --version
 
 script:
   - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

README.md

@@ -34,25 +34,29 @@ Installation
 If you need to customize **ember-cli-workbox configuration** you can do it like this:
 
 ```javascript
-//app/config/environment.js
+// app/config/environment.js
 
 ENV['ember-cli-workbox'] = {
   enabled: environment !== 'test',
-
   debug: true,
-
   autoRegister: true,
-
-  importScriptsTransform(importScripts) {
-    return importScripts.map((importScript) => `https://example-cdn.com/${importScript}`);
-  },
-
   importScriptsGlobPatterns: [
     'assets/service-workers/*.js'
   ]
 };
 ```
 
+```javascript
+// ember-cli-build.js
+const app = new EmberAddon(defaults, {
+  'ember-cli-workbox': {
+    importScriptsTransform(importScripts) {
+      return importScripts.map((importScript) => `https://example-cdn.com/${importScript}`);
+    }
+  }
+});
+```
+
 | Property                    | Type       | Description                                                                                                                                                        |
 |:---------------------------:|:----------:|:------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
 | `enabled`                   | `Boolean`  | Addon is enabled. Defaults `true` for production builds                                                                                                            |
@@ -61,7 +65,9 @@ ENV['ember-cli-workbox'] = {
 | `importScriptsTransform`    | `Function` | Allows for transformation of array sent to workbox [importScripts](https://developers.google.com/web/tools/workbox/modules/workbox-build#generateSW-importScripts) |
 | `importScriptsGlobPatterns` | `Array`    | Define files that are going to be imported using [importScripts](https://developers.google.com/web/tools/workbox/modules/workbox-build#generateSW-importScripts)   |
 
-You can further customize ember-cli-workbox by setting **workbox configurations** in your `config/environment.js`:
+You can further customize ember-cli-workbox by setting **workbox configurations** in your `config/environment.js` on in your `ember-cli-build.js`
+
+*Note*: `importScriptsTransform` must be defined in your `ember-cli-build.js`.
 
 ```javascript
 //app/config/environment.js

addon/instance-initializers/sw.js

@@ -1,5 +1,11 @@
-import { getWithDefault } from '@ember/object';
 import { debug } from '@ember/debug';
+import { get } from '@ember/object';
+
+function getWithDefault(obj, path, def) {
+	const value = get(obj, path);
+
+	return typeof value !== 'undefined' ? value : def;
+}
 
 export function getConfig(appInstance) {
 	const config = appInstance.resolveRegistration('config:environment');

addon/services/service-worker.js

@@ -1,6 +1,9 @@
 import Service from '@ember/service';
 import Evented from '@ember/object/evented';
 import { debug } from '@ember/debug';
+import { getOwner } from '@ember/application';
+
+const EventedService = Service.extend(Evented);
 
 /*
  *
@@ -18,7 +21,11 @@ import { debug } from '@ember/debug';
  *	"registrationComplete"		- sw successfully registered
  *	"unregistrationComplete"	- all sw are unregistered
  */
-export default class ServiceWorker extends Service.extend(Evented) {
+export default class ServiceWorker extends EventedService {
+	get config() {
+		return getOwner(this).resolveRegistration('config:environment');
+	}
+
 	constructor() {
 		super(...arguments);
 
@@ -44,7 +51,7 @@ export default class ServiceWorker extends Service.extend(Evented) {
 
 	async register(swFile) {
 		try {
-			const registration = await this.sw.register(swFile);
+			const registration = await this.sw.register(`${this.config.rootURL}${swFile}`);
 
 			return this._onRegistration(registration);
 		} catch (error) {

config/ember-cli-update.json

@@ -0,0 +1,21 @@
+{
+  "schemaVersion": "1.0.0",
+  "packages": [
+    {
+      "name": "ember-cli",
+      "version": "3.21.0",
+      "blueprints": [
+        {
+          "name": "addon",
+          "outputRepo": "https://github.com/ember-cli/ember-addon-output",
+          "codemodsSource": "ember-addon-codemods-manifest@1",
+          "isBaseBlueprint": true,
+          "options": [
+            "--yarn",
+            "--no-welcome"
+          ]
+        }
+      ]
+    }
+  ]
+}

config/ember-try.js

@@ -4,20 +4,21 @@ const getChannelURL = require('ember-source-channel-url');
 
 module.exports = async function() {
 	return {
+		useYarn: true,
 		scenarios: [
 			{
-				name: 'ember-lts-3.8',
+				name: 'ember-lts-3.16',
 				npm: {
 					devDependencies: {
-						'ember-source': '~3.8.0'
+						'ember-source': '~3.16.0'
 					}
 				}
 			},
 			{
-				name: 'ember-lts-3.12',
+				name: 'ember-lts-3.20',
 				npm: {
 					devDependencies: {
-						'ember-source': '~3.12.0'
+						'ember-source': '~3.20.5'
 					}
 				}
 			},
@@ -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'
 					}
 				}
 			},