Merge pull request #100 from Cropster/fn/update-dependencies

Update dependencies

.eslintignore

@@ -13,6 +13,8 @@
 # misc
 /coverage/
 !.*
+.*/
+.eslintcache
 /node-tests/fixtures
 
 # ember-try

.eslintrc.js

@@ -10,7 +10,7 @@ module.exports = {
       legacyDecorators: true,
     },
   },
-  plugins: ['ember'],
+  plugins: ['ember', 'ember-suave'],
   extends: [
     'eslint:recommended',
     'plugin:ember/recommended',
@@ -20,14 +20,17 @@ module.exports = {
   env: {
     browser: true,
   },
-  rules: {},
+  rules: {
+    'ember-suave/lines-between-object-properties': 0,
+    'ember-suave/lines-between-class-members': 0,
+    'ember-suave/require-access-in-comments': 0,
+  },
   overrides: [
     // node files
     {
       files: [
         '.eslintrc.js',
         '.template-lintrc.js',
-        '.eslintrc.js',
         'ember-cli-build.js',
         'index.js',
         'testem.js',

.github/workflows/test.yml

@@ -35,8 +35,8 @@ jobs:
         # Keep this in sync with config/ember-try.js
         ember:
           [
-            ember-lts-3.16,
             ember-lts-3.20,
+            ember-lts-3.24,
             ember-release,
             ember-beta,
             ember-canary,

.gitignore

@@ -12,6 +12,7 @@
 /.env*
 /.pnp*
 /.sass-cache
+/.eslintcache
 /connect.lock
 /coverage/*
 /libpeerconnection.log

.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
 yarn-error.log

.prettierignore

@@ -1,6 +1,22 @@
-node_modules/
-tmp/
-dist/
-public/
-vendor/
-/.idea/
+# 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
+/.idea/

.template-lintrc.js

@@ -5,4 +5,6 @@ module.exports = {
   rules: {
     quotes: false,
   },
+
+  ignore: ['tests/**'],
 };

CONTRIBUTING.md

@@ -8,9 +8,8 @@
 
 ## Linting
 
-- `npm run lint:hbs`
-- `npm run lint:js`
-- `npm run lint:js -- --fix`
+* `yarn lint`
+* `yarn lint:fix`
 
 ## Running tests
 

README.md

@@ -18,9 +18,9 @@ __Note:__ Addon's CLI commands will check dependencies for you and install them
 Compatibility
 ------------------------------------------------------------------------------
 
-* Ember.js v3.16 or above
-* Ember CLI v2.13 or above
-* Node.js v10 or above
+* Ember.js v3.20 or above
+* Ember CLI v3.20 or above
+* Node.js v12 or above
 
 ## Configuration
 

addon/services/l10n.js

@@ -4,7 +4,7 @@ import { Promise } from 'rsvp';
 import Ember from 'ember';
 import Service from '@ember/service';
 import { assign } from '@ember/polyfills';
-import { guessLocale } from '../utils/guess-locale';
+import { guessLocale } from 'ember-l10n/utils/guess-locale';
 import { A as array } from '@ember/array';
 import { assert } from '@ember/debug';
 import { getLocaleAssetMap } from 'ember-l10n/utils/get-locale-asset-map';

addon/utils/guess-locale.js

@@ -37,6 +37,7 @@ export function guessLocale(
   if (!desiredLocales.find) {
     desiredLocales = array(desiredLocales);
   }
+
   if (!allowedLocales.find) {
     allowedLocales = array(allowedLocales);
   }

config/ember-try.js

@@ -1,24 +1,25 @@
 'use strict';
 
 const getChannelURL = require('ember-source-channel-url');
+const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
 
 module.exports = async function () {
   return {
     useYarn: true,
     scenarios: [
       {
-        name: 'ember-lts-3.16',
+        name: 'ember-lts-3.20',
         npm: {
           devDependencies: {
-            'ember-source': '~3.16.0',
+            'ember-source': '~3.20.5',
           },
         },
       },
       {
-        name: 'ember-lts-3.20',
+        name: 'ember-lts-3.24',
         npm: {
           devDependencies: {
-            'ember-source': '~3.20.5',
+            'ember-source': '~3.24.3',
           },
         },
       },
@@ -69,11 +70,16 @@ module.exports = async function () {
           }),
         },
         npm: {
+          devDependencies: {
+            'ember-source': '~3.28.0',
+          },
           ember: {
             edition: 'classic',
           },
         },
       },
+      embroiderSafe(),
+      embroiderOptimized(),
     ],
   };
 };

ember-cli-build.js

@@ -22,5 +22,12 @@ module.exports = function (defaults) {
     behave. You most likely want to be modifying `./index.js` or app's build file
   */
 
-  return app.toTree();
+  let { maybeEmbroider } = require('@embroider/test-setup');
+  return maybeEmbroider(app, {
+    skipBabel: [
+      {
+        package: 'qunit',
+      },
+    ],
+  });
 };

index.js

@@ -25,9 +25,8 @@ module.exports = {
 
     let app = this._findHost();
 
-    let hasEmberCliFastboot = !!this.project.findAddonByName(
-      'ember-cli-fastboot'
-    );
+    let hasEmberCliFastboot =
+      !!this.project.findAddonByName('ember-cli-fastboot');
     this._hasEmberCliFastboot = hasEmberCliFastboot;
 
     let env = process.env.EMBER_ENV;

lib/commands/extract.js

@@ -641,6 +641,7 @@ CREATING PO FILE
       } catch (e) {
         // ignore non-existing folders
       }
+
       return files;
     }, []);
   },

lib/commands/sync.js

@@ -203,7 +203,8 @@ PARSING SOURCE FILES
     //
     let messages = {};
 
-    let regex = /msgid\s+"(.+)"\s*(?:msgid_plural\s+"(.+)"\s*)?msgstr(?:\[0\])?\s+"(.+)"\s*(?:msgstr(?:\[1\])?\s+"(.+)")?/g;
+    let regex =
+      /msgid\s+"(.+)"\s*(?:msgid_plural\s+"(.+)"\s*)?msgstr(?:\[0\])?\s+"(.+)"\s*(?:msgstr(?:\[1\])?\s+"(.+)")?/g;
     let data = fs.readFileSync(this.poFile, 'utf8');
 
     let match;
@@ -245,18 +246,18 @@ PARSING SOURCE FILES
     /* eslint-disable prefer-template */
     let regex = new RegExp(
       '(\\.' +
-      this._normalizeKey(key) +
-      '\\((?:\\s*)(?:\'|\\"))' + // = $1
-      '(' +
-      this.escapeString_(msgid) +
-      ')' + // = $2
-      '(\'|\\")' + // = $3
-      '(?:' +
-      '(\\s*,\\s*(?:\'|\\"))' + // = $4
-      '(' +
-      this.escapeString_(msgidPlural || '') +
-      ')' + // = $5
-      '(\'|\\")' + // = $6
+        this._normalizeKey(key) +
+        '\\((?:\\s*)(?:\'|\\"))' + // = $1
+        '(' +
+        this.escapeString_(msgid) +
+        ')' + // = $2
+        '(\'|\\")' + // = $3
+        '(?:' +
+        '(\\s*,\\s*(?:\'|\\"))' + // = $4
+        '(' +
+        this.escapeString_(msgidPlural || '') +
+        ')' + // = $5
+        '(\'|\\")' + // = $6
         ')?',
       'g'
     );
@@ -304,18 +305,18 @@ PARSING SOURCE FILES
     /* eslint-disable prefer-template */
     let regex = new RegExp(
       '((?:\\(|{{{?)' +
-      this._normalizeKey(key) +
-      '\\s*(?:\'|\\"))' + // = $1
-      '(' +
-      this.escapeString_(msgid) +
-      ')' + // = $2
-      '(\'|\\")' + // = $3
-      '(?:' +
-      '(\\s*(?:\'|\\"))' + // = $4
-      '(' +
-      this.escapeString_(msgidPlural || '') +
-      ')' + // = $5
-      '(\'|\\")' + // = $6
+        this._normalizeKey(key) +
+        '\\s*(?:\'|\\"))' + // = $1
+        '(' +
+        this.escapeString_(msgid) +
+        ')' + // = $2
+        '(\'|\\")' + // = $3
+        '(?:' +
+        '(\\s*(?:\'|\\"))' + // = $4
+        '(' +
+        this.escapeString_(msgidPlural || '') +
+        ')' + // = $5
+        '(\'|\\")' + // = $6
         ')?',
       'g'
     );
@@ -392,8 +393,10 @@ PARSING SOURCE FILES
     // {{n "My Message Id Single" "My Message Id Plural" count}}
     // {{some-fancy-component translatable-attribute=(t "My Message Id")}}
     // ...
-    let regex1 = /((?:(?:n|t)?\(|{{{?)(?:n|t)?\s*["])([^"]+)(["])(?:(,?\s*")([^"]+)(["]))?/g;
-    let regex2 = /((?:(?:n|t)?\(|{{{?)(?:n|t)?\s*['])([^']+)(['])(?:(,?\s*')([^']+)([']))?/g;
+    let regex1 =
+      /((?:(?:n|t)?\(|{{{?)(?:n|t)?\s*["])([^"]+)(["])(?:(,?\s*")([^"]+)(["]))?/g;
+    let regex2 =
+      /((?:(?:n|t)?\(|{{{?)(?:n|t)?\s*['])([^']+)(['])(?:(,?\s*')([^']+)([']))?/g;
 
     input = input.replace(regex1, (match, p1, p2, p3, p4, p5, p6) => {
       return [p1, p2.replace(/\s+/g, ' '), p3, p4, p5, p6].join('');

lib/commands/utils/build-pot-file.js

@@ -2,6 +2,7 @@ function normalizeMsgId(str) {
   if (!str) {
     return '';
   }
+
   return str
     .replace(/"/gm, '\\"') // Escape "
     .replace(/(\n|(\r\n))[\t ]*/gm, '\n') // Remove leading whitespace after line breaks

lib/commands/utils/validate/validate-translated-placeholders.js

@@ -30,17 +30,11 @@ function validateTranslatedPlaceholders(
   if (!placeholders.length) {
     return;
   }
+
   let placeholderConfig = placeholders.map((str) => {
     pattern.lastIndex = 0;
-    let [
-      fullResult,
-      placeholder,
-      quoteSymbol1,
-      ,
-      ,
-      content,
-      quoteSymbol2,
-    ] = pattern.exec(str);
+    let [fullResult, placeholder, quoteSymbol1, , , content, quoteSymbol2] =
+      pattern.exec(str);
     return {
       fullResult,
       placeholder,
@@ -54,15 +48,8 @@ function validateTranslatedPlaceholders(
   let translatedPlaceholders = translation.match(pattern) || [];
   let translatedPlaceholderConfig = translatedPlaceholders.map((str) => {
     pattern.lastIndex = 0;
-    let [
-      fullResult,
-      placeholder,
-      quoteSymbol1,
-      ,
-      ,
-      content,
-      quoteSymbol2,
-    ] = pattern.exec(str);
+    let [fullResult, placeholder, quoteSymbol1, , , content, quoteSymbol2] =
+      pattern.exec(str);
     return {
       fullResult,
       placeholder,
@@ -98,6 +85,7 @@ function validateTranslatedPlaceholders(
     if (id === translation) {
       return;
     }
+
     let invalidTranslatedPlaceholder = translatedPlaceholderConfig.find(
       (config) => {
         return config.content === content;

node-tests/fixtures/extract/expected.pot

@@ -17,17 +17,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tests/dummy/app/controllers/application.js:12:10
+#: tests/dummy/app/controllers/application.js:14:10
 #: tests/dummy/app/templates/test-page.hbs:19:0
 #: tests/dummy/app/templates/test-page.hbs:20:0
 msgid "en"
 msgstr ""
 
-#: tests/dummy/app/controllers/application.js:13:10
+#: tests/dummy/app/controllers/application.js:15:10
 msgid "de"
 msgstr ""
 
-#: tests/dummy/app/controllers/application.js:14:10
+#: tests/dummy/app/controllers/application.js:16:10
 msgid "ko"
 msgstr ""