Merge pull request #255 from salsify/upgrade-dependencies

.github/workflows/ci.yml

@@ -29,15 +29,11 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 16
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
-      - name: Lint
-        run: yarn workspace ember-css-modules lint:js
-      - name: Browser Tests
+      - name: Run Tests
         run: yarn workspace ember-css-modules test
-      - name: Node Tests
-        run: yarn workspace ember-css-modules test:node
 
   test-old-dependencies:
     name: Oldest Supported Env
@@ -48,7 +44,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v1
         with:
-          node-version: 6
+          node-version: 12
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
         working-directory: test-packages/old-app
@@ -66,7 +62,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 16
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
       - name: Install Latest `ember-cli`
@@ -85,11 +81,11 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 16
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
       - name: Run Tests
-        run: yarn workspace ember-css-modules test
+        run: yarn workspace ember-css-modules test:ember
 
   test-try:
     name: Ember Try
@@ -107,7 +103,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 16
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
       - name: Try Scenario
@@ -123,20 +119,16 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 16
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
       - name: Embroider App
-        run: yarn workspace embroider-app test
+        run: yarn workspace embroider-app test:ember
       - name: Sass App
-        run: yarn workspace sass-app test
-      - name: Dummy Addon
-        run: yarn workspace dummy-addon test
+        run: yarn workspace sass-app test:ember
       - name: Plugin Addon
-        run: yarn workspace plugin-addon test
+        run: yarn workspace plugin-addon test:ember
       - name: Octane Addon
         run: yarn workspace octane-addon test
-      - name: Dummy Addon With Custom moduleName
-        run: yarn workspace @my-namespace/dummy-addon test
       - name: Octane Addon With Custom moduleName
         run: yarn workspace @my-namespace/octane-addon test

package.json

@@ -2,8 +2,6 @@
   "private": true,
   "workspaces": [
     "packages/ember-css-modules",
-    "test-packages/dummy-addon",
-    "test-packages/dummy-addon-with-module-name",
     "test-packages/embroider-app",
     "test-packages/octane-addon",
     "test-packages/octane-addon-with-module-name",

packages/ember-css-modules/.editorconfig

@@ -4,7 +4,6 @@
 
 root = true
 
-
 [*]
 end_of_line = lf
 charset = utf-8

packages/ember-css-modules/.eslintignore

@@ -8,10 +8,13 @@
 
 # dependencies
 /bower_components/
+/node_modules/
 
 # misc
 /coverage/
-/tests/dummy*/node_modules
+!.*
+.*/
+.eslintcache
 
 # ember-try
 /.node_modules.ember-try/

packages/ember-css-modules/.eslintrc.js

@@ -1,56 +1,65 @@
+'use strict';
+
 module.exports = {
   root: true,
   parser: 'babel-eslint',
   parserOptions: {
-    ecmaVersion: 2017,
-    sourceType: 'module'
+    ecmaVersion: 2018,
+    sourceType: 'module',
+    ecmaFeatures: {
+      legacyDecorators: true,
+    },
   },
-  plugins: [
-    'ember'
-  ],
+  plugins: ['ember'],
   extends: [
     'eslint:recommended',
-    'plugin:ember/recommended'
+    'plugin:ember/recommended',
+    'plugin:prettier/recommended',
   ],
   env: {
-    'browser': true
+    browser: true,
   },
   rules: {
-    'ember/no-new-mixins': 'off'
+    // TODO: enable all these for v2 when we don't need to test these constructs ourselves
+    'ember/no-mixins': 'off',
+    'ember/no-new-mixins': 'off',
+    'ember/no-classic-classes': 'off',
+    'ember/no-classic-components': 'off',
+    'ember/no-computed-properties-in-native-classes': 'off',
+    'ember/require-tagless-components': 'off',
+    'ember/classic-decorator-no-classic-methods': 'off',
+    'ember/no-component-lifecycle-hooks': 'off',
   },
   overrides: [
     // node files
     {
       files: [
-        '.template-lintrc.js',
-        'ember-cli-build.js',
-        'index.js',
-        'testem.js',
-        'blueprints/*/index.js',
-        'config/**/*.js',
-        'tests/dummy/config/**/*.js',
-        'tests-node/**/*.js',
-        'lib/**/*.js'
-      ],
-      excludedFiles: [
-        'addon/**',
-        'addon-test-support/**',
-        'app/**',
-        'tests/dummy*/app/**',
-        'tests/dummy*/addon/**'
+        './.eslintrc.js',
+        './.prettierrc.js',
+        './.template-lintrc.js',
+        './ember-cli-build.js',
+        './index.js',
+        './testem.js',
+        './blueprints/*/index.js',
+        './config/**/*.js',
+        './tests/dummy/config/**/*.js',
+        './lib/**/*.js',
+        './tests-node/**/*.js',
       ],
       parserOptions: {
         sourceType: 'script',
-        ecmaVersion: 2015
       },
       env: {
         browser: false,
-        node: true
+        node: true,
       },
       plugins: ['node'],
-      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
-        // add your custom rules and overrides for node files here
-      }),
-    }
-  ]
+      extends: ['plugin:node/recommended'],
+    },
+    {
+      // Test files:
+      files: ['tests/**/*-test.{js,ts}'],
+      extends: ['plugin:qunit/recommended'],
+    },
+  ],
 };

packages/ember-css-modules/.gitignore

@@ -9,7 +9,10 @@
 /node_modules/
 
 # misc
+/.env*
+/.pnp*
 /.sass-cache
+/.eslintcache
 /connect.lock
 /coverage/
 /libpeerconnection.log

packages/ember-css-modules/.npmignore

@@ -5,9 +5,15 @@
 # misc
 /.editorconfig
 /.ember-cli
+/.env*
+/.eslintcache
 /.eslintignore
+/.eslintrc.js
+/.git/
 /.gitignore
-/.watchmanconfig
+/.prettierignore
+/.prettierrc.js
+/.template-lintrc.js
 /.travis.yml
 /config/ember-try.js
 /dist

test-packages/dummy-addon-with-module-name/.eslintignore → packages/ember-css-modules/.prettierignore

@@ -13,6 +13,7 @@
 # misc
 /coverage/
 !.*
+.eslintcache
 
 # ember-try
 /.node_modules.ember-try/

test-packages/dummy-addon/.template-lintrc.js → packages/ember-css-modules/.prettierrc.js

@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  extends: 'recommended'
+  singleQuote: true,
 };

packages/ember-css-modules/.template-lintrc.js

@@ -3,6 +3,6 @@
 module.exports = {
   extends: 'recommended',
   rules: {
-    quotes: false
-  }
+    quotes: false,
+  },
 };

packages/ember-css-modules/addon/decorators.js

@@ -20,20 +20,22 @@ import { assert } from '@ember/debug';
 
   @param {...string} classNames - The list of local classes to be applied to the component
 */
-export const localClassNames = (...classNames) => (...desc) => {
-  assert(
-    `The @localClassNames decorator must be provided strings, received: ${classNames}`,
-    classNames.every(className => typeof className === 'string')
-  );
+export const localClassNames =
+  (...classNames) =>
+  (...desc) => {
+    assert(
+      `The @localClassNames decorator must be provided strings, received: ${classNames}`,
+      classNames.every((className) => typeof className === 'string')
+    );
 
-  if (isStage1ClassDescriptor(desc)) {
-    collapseAndMerge(desc[0].prototype, 'localClassNames', ...classNames);
-  } else {
-    desc[0].finisher = target => {
-      collapseAndMerge(target.prototype, 'localClassNames', ...classNames);
-    };
-  }
-};
+    if (isStage1ClassDescriptor(desc)) {
+      collapseAndMerge(desc[0].prototype, 'localClassNames', ...classNames);
+    } else {
+      desc[0].finisher = (target) => {
+        collapseAndMerge(target.prototype, 'localClassNames', ...classNames);
+      };
+    }
+  };
 
 /**
   Decorator which indicates that the field or computed should be bound to the
@@ -64,14 +66,14 @@ export const localClassName = (...params) => {
   return (...desc) => {
     assert(
       `The @localClassName decorator may only receive strings as parameters. Received: ${params}`,
-      params.every(className => typeof className === 'string')
+      params.every((className) => typeof className === 'string')
     );
 
     if (isStage1FieldDescriptor(desc)) {
       let [prototype, key, descriptor] = desc;
       setUpLocalClassField(params, prototype, key, descriptor);
     } else if (isStage2FieldDescriptor(desc)) {
-      desc[0].finisher = target => {
+      desc[0].finisher = (target) => {
         const { key, descriptor } = desc[0];
         setUpLocalClassField(params, target.prototype, key, descriptor);
       };
@@ -93,7 +95,9 @@ function setUpLocalClassField(params, prototype, key, descriptor) {
     // explicit `writable` flag, default to not being writable in Babel. Since
     // by default fields _are_ writable and this decorator should not change
     // that, we enable the `writable` flag in this specific case.
-    if (!('get' in descriptor || 'set' in descriptor || 'writable' in descriptor)) {
+    if (
+      !('get' in descriptor || 'set' in descriptor || 'writable' in descriptor)
+    ) {
       descriptor.writable = true;
     }
 
@@ -102,7 +106,7 @@ function setUpLocalClassField(params, prototype, key, descriptor) {
     // This is a no-op in Babel 7 (since `initializer` isn't part of the property descriptor)
     // and can be dropped when we remove support for Babel 6
     if (descriptor.initializer === null) {
-      descriptor.initializer = function() {
+      descriptor.initializer = function () {
         return get(this, key);
       };
     }
@@ -114,7 +118,7 @@ function collapseAndMerge(prototype, property, ...items) {
 
   if (property in prototype) {
     const parentElements = prototype[property];
-    items.unshift(...parentElements)
+    items.unshift(...parentElements);
   }
 
   prototype[property] = items;
@@ -135,7 +139,10 @@ function isStage1ClassDescriptor(possibleDesc) {
 }
 
 function isFieldDescriptor(possibleDesc) {
-  return isStage1FieldDescriptor(possibleDesc) || isStage2FieldDescriptor(possibleDesc);
+  return (
+    isStage1FieldDescriptor(possibleDesc) ||
+    isStage2FieldDescriptor(possibleDesc)
+  );
 }
 
 function isStage2FieldDescriptor(possibleDesc) {

packages/ember-css-modules/addon/helpers/local-class.js

@@ -4,12 +4,17 @@ import require from 'require';
 
 export function localClass(params, hash) {
   assert('No source specified to local-class lookup', 'from' in hash);
-  if (!hash.from) { return ''; }
+  if (!hash.from) {
+    return '';
+  }
 
   let styles = resolveSource(hash.from);
   let classes = (params[0] || '').split(/\s+/);
 
-  return classes.map(style => styles[style]).filter(Boolean).join(' ');
+  return classes
+    .map((style) => styles[style])
+    .filter(Boolean)
+    .join(' ');
 }
 
 export default helper(localClass);
@@ -19,7 +24,9 @@ function resolveSource(source) {
     if (require.has(source)) {
       return require(source).default;
     } else {
-      throw new Error(`Unable to resolve local class names from ${source}; does the styles file exist?`);
+      throw new Error(
+        `Unable to resolve local class names from ${source}; does the styles file exist?`
+      );
     }
   } else {
     return source;