ember-css-modules 1.6.0 → 2.0.1

package/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;

package/addon/index.js

@@ -1 +0,0 @@
-export * from './decorators';

package/app/initializers/ensure-local-class-included.js

@@ -8,5 +8,5 @@ export default {
     // Instead, we reference it in our own template, and then import that
     // template from a file (an initializer) that we know must always
     // be loaded in order to boot the app and/or run tests.
-  }
-}
+  },
+};

package/config/environment.js

@@ -1,5 +1,5 @@
 'use strict';
 
-module.exports = function(/* environment, appConfig */) {
-  return { };
+module.exports = function (/* environment, appConfig */) {
+  return {};
 };

package/index.js

@@ -3,8 +3,6 @@
 const path = require('path');
 const fs = require('fs');
 const debug = require('debug')('ember-css-modules:addon');
-const VersionChecker = require('ember-cli-version-checker');
-const MergeTrees = require('broccoli-merge-trees');
 
 const HtmlbarsPlugin = require('./lib/htmlbars-plugin');
 const ModulesPreprocessor = require('./lib/modules-preprocessor');
@@ -14,16 +12,12 @@ const PluginRegistry = require('./lib/plugin/registry');
 module.exports = {
   name: require('./package.json').name,
 
-  shouldIncludeChildAddon(addon) {
-    // Don't infinitely recurse – it's the dummy test app that depends on dummy-addon, not this addon itself
-    return addon.name.indexOf('dummy') === -1;
-  },
-
   init() {
     this._super.init && this._super.init.apply(this, arguments);
     this.modulesPreprocessor = new ModulesPreprocessor({ owner: this });
-    this.outputStylesPreprocessor = new OutputStylesPreprocessor({ owner: this });
-    this.checker = new VersionChecker(this.project);
+    this.outputStylesPreprocessor = new OutputStylesPreprocessor({
+      owner: this,
+    });
     this.plugins = new PluginRegistry(this.parent);
   },
 
@@ -37,33 +31,17 @@ module.exports = {
 
     this._super.included.apply(this, arguments);
 
-    this.cssModulesOptions = this.plugins.computeOptions(includer.options && includer.options.cssModules);
+    this.cssModulesOptions = this.plugins.computeOptions(
+      includer.options && includer.options.cssModules
+    );
     this.setupTemplateTransform();
   },
 
-  treeForAddon() {
-    let addonTree = this._super.treeForAddon.apply(this, arguments);
-
-    // Allow to opt-out from automatic Component.reopen()
-    if (this.cssModulesOptions.patchClassicComponent !== false) {
-      return new MergeTrees([addonTree, `${__dirname}/vendor`]);
-    } else {
-      return addonTree;
-    }
-  },
-
-  cacheKeyForTree(treeType) {
-    // We override treeForAddon, but the result is still stable
-    if (treeType === 'addon') {
-      return require('calculate-cache-key-for-tree')('addon', this);
-    } else {
-      return this._super.cacheKeyForTree.call(this, treeType);
-    }
-  },
-
   setupPreprocessorRegistry(type, registry) {
     // Skip if we're setting up this addon's own registry
-    if (type !== 'parent') { return; }
+    if (type !== 'parent') {
+      return;
+    }
 
     this.parentPreprocessorRegistry = registry;
 
@@ -78,24 +56,32 @@ module.exports = {
     // options until our own `included()` hook, and we need those options in order
     // to configure the template transform.
     if (!this.parentPreprocessorRegistry) {
-      throw new Error('[ember-css-modules] internal error: unable to locate parent preprocessor registry');
+      throw new Error(
+        '[ember-css-modules] internal error: unable to locate parent preprocessor registry'
+      );
     }
 
-    this.parentPreprocessorRegistry.add('htmlbars-ast-plugin', HtmlbarsPlugin.instantiate({
-      emberVersion: this.checker.forEmber().version,
-      options: {
+    this.parentPreprocessorRegistry.add(
+      'htmlbars-ast-plugin',
+      HtmlbarsPlugin.instantiate({
         fileExtension: this.getFileExtension(),
         includeExtensionInModulePath: this.includeExtensionInModulePath(),
-      },
-    }));
+      })
+    );
   },
 
   verifyStylesDirectory() {
-    if (!fs.existsSync(path.join(this.parent.root, this.parent.treePaths['addon-styles']))) {
+    if (
+      !fs.existsSync(
+        path.join(this.parent.root, this.parent.treePaths['addon-styles'])
+      )
+    ) {
       this.ui.writeWarnLine(
-        'The addon ' + this.getParentName() + ' has ember-css-modules installed, but no addon styles directory. ' +
-        'You must have at least a placeholder file in this directory (e.g. `addon/styles/.placeholder`) in ' +
-        'the published addon in order for ember-cli to process its CSS modules.'
+        'The addon ' +
+          this.getParentName() +
+          ' has ember-css-modules installed, but no addon styles directory. ' +
+          'You must have at least a placeholder file in this directory (e.g. `addon/styles/.placeholder`) in ' +
+          'the published addon in order for ember-cli to process its CSS modules.'
       );
     }
   },
@@ -117,15 +103,24 @@ module.exports = {
   },
 
   getPassthroughFileExtensions() {
-    return this.cssModulesOptions.passthroughFileExtensions || ['css', 'scss', 'sass', 'less', 'styl'];
+    return (
+      this.cssModulesOptions.passthroughFileExtensions || [
+        'css',
+        'scss',
+        'sass',
+        'less',
+        'styl',
+      ]
+    );
   },
 
   getScopedNameGenerator() {
     if (!this._scopedNameGenerator) {
       let rootOptions = this._findRootApp().options.cssModules || {};
-      this._scopedNameGenerator = this.cssModulesOptions.generateScopedName
-        || rootOptions.generateScopedName
-        || require('./lib/generate-scoped-name');
+      this._scopedNameGenerator =
+        this.cssModulesOptions.generateScopedName ||
+        rootOptions.generateScopedName ||
+        require('./lib/generate-scoped-name');
     }
 
     return this._scopedNameGenerator;
@@ -156,7 +151,9 @@ module.exports = {
   },
 
   getFileExtension() {
-    return this.cssModulesOptions && this.cssModulesOptions.extension || 'css';
+    return (
+      (this.cssModulesOptions && this.cssModulesOptions.extension) || 'css'
+    );
   },
 
   includeExtensionInModulePath() {
@@ -167,15 +164,6 @@ module.exports = {
     return this.cssModulesOptions.postcssOptions;
   },
 
-  getAddonModulesRoot() {
-    // CLI 2.12 stopped exposing addon stuff nested under `modules/`
-    if (this.checker.for('ember-cli', 'npm').satisfies('< 2.12')) {
-      return 'modules/';
-    } else {
-      return '';
-    }
-  },
-
   getParentAddonTree() {
     return path.join(this.parentAddon.root, this.parentAddon.treePaths.addon);
   },
@@ -183,13 +171,16 @@ module.exports = {
   getFixedModules(type) {
     let modules = this.cssModulesOptions[`${type}Modules`] || [];
     let extension = this.getFileExtension();
-    return modules.map(file => file.endsWith(`.${extension}`) ? file : `${file}.${extension}`);
+    return modules.map((file) =>
+      file.endsWith(`.${extension}`) ? file : `${file}.${extension}`
+    );
   },
 
   enableSourceMaps() {
     if (this._enableSourceMaps === undefined) {
       var mapOptions = this._findRootApp().options.sourcemaps;
-      this._enableSourceMaps = mapOptions.enabled && mapOptions.extensions.indexOf('css') !== -1;
+      this._enableSourceMaps =
+        mapOptions.enabled && mapOptions.extensions.indexOf('css') !== -1;
     }
 
     return this._enableSourceMaps;
@@ -205,5 +196,5 @@ module.exports = {
       current = current.parent;
     }
     return current.app;
-  }
+  },
 };

package/lib/htmlbars-plugin/index.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const utils = require('./utils');
-const semver = require('semver');
 
 module.exports = class ClassTransformPlugin {
   constructor(env, options) {
@@ -9,27 +8,21 @@ module.exports = class ClassTransformPlugin {
     this.builders = env.syntax.builders;
     this.options = options;
     this.stylesModule = this.determineStylesModule(env);
-    this.isGlimmer = this.detectGlimmer();
     this.visitor = this.buildVisitor(env);
-
-    // Alias for 2.15 <= Ember < 3.1
-    this.visitors = this.visitor;
   }
 
-  static instantiate({ emberVersion, options }) {
+  static instantiate(options) {
     return {
       name: 'ember-css-modules',
-      plugin: semver.lt(emberVersion, '2.15.0-alpha')
-        ? LegacyAdapter.bind(null, this, options)
-        : env => new this(env, options),
+      plugin: (env) => new this(env, options),
       parallelBabel: {
         requireFile: __filename,
         buildUsing: 'instantiate',
-        params: { emberVersion, options },
+        params: options,
       },
       baseDir() {
         return `${__dirname}/../..`;
-      }
+      },
     };
   }
 
@@ -54,15 +47,6 @@ module.exports = class ClassTransformPlugin {
     return name;
   }
 
-  detectGlimmer() {
-    if (!this.syntax.parse) { return false; }
-
-    // HTMLBars builds ConcatStatements with StringLiterals + raw PathExpressions
-    // Glimmer builds ConcatStatements with TextNodes + MustacheStatements
-    let ast = this.syntax.parse('<div class="foo {{bar}}"></div>');
-    return ast.body[0].attributes[0].value.parts[0].type === 'TextNode';
-  }
-
   buildVisitor(env) {
     if (env.moduleName === env.filename) {
       // No-op for the stage 1 Embroider pass (which only contains relative paths)
@@ -70,10 +54,10 @@ module.exports = class ClassTransformPlugin {
     }
 
     return {
-      ElementNode: node => this.transformElementNode(node),
-      MustacheStatement: node => this.transformStatement(node),
-      BlockStatement: node => this.transformStatement(node),
-      SubExpression: node => this.transformSubexpression(node)
+      ElementNode: (node) => this.transformElementNode(node),
+      MustacheStatement: (node) => this.transformStatement(node),
+      BlockStatement: (node) => this.transformStatement(node),
+      SubExpression: (node) => this.transformSubexpression(node),
     };
   }
 
@@ -93,14 +77,18 @@ module.exports = class ClassTransformPlugin {
 
   // Transform {{local-class 'foo'}} into {{local-class 'foo' from='path/to/styles-module'}}
   transformLocalClassHelperInvocation(node) {
-    if (utils.getPair(node, 'from')) { return; }
+    if (utils.getPair(node, 'from')) {
+      return;
+    }
 
     node.hash.pairs.push(this.builders.pair('from', this.stylesModuleNode()));
   }
 
   transformPossibleComponentInvocation(node) {
     let localClassPair = utils.getPair(node, 'local-class');
-    if (!localClassPair) { return; }
+    if (!localClassPair) {
+      return;
+    }
 
     utils.removePair(node, localClassPair);
 
@@ -121,14 +109,15 @@ module.exports = class ClassTransformPlugin {
 
   transformElementNode(node) {
     let localClassAttr = utils.getAttr(node, 'local-class');
-    if (!localClassAttr) { return; }
+    if (!localClassAttr) {
+      return;
+    }
 
     utils.removeAttr(node, localClassAttr);
 
-    let stringBuilder = this.isGlimmer ? 'text' : 'string';
     let classAttr = utils.getAttr(node, 'class');
     let parts = [];
-    let classAttrValue
+    let classAttrValue;
 
     if (classAttr) {
       utils.removeAttr(node, classAttr);
@@ -138,21 +127,33 @@ module.exports = class ClassTransformPlugin {
       // the attr value into parts that make up the ConcatStatement
       // that is returned from this method
       if (classAttrValue.type === 'ConcatStatement') {
-        parts.push(this.builders.mustache(this.builders.path('concat'), utils.concatStatementToParams(this.builders, classAttrValue, this.isGlimmer)));
+        parts.push(
+          this.builders.mustache(
+            this.builders.path('concat'),
+            utils.concatStatementToParams(this.builders, classAttrValue)
+          )
+        );
       } else if (classAttrValue.type === 'TextNode') {
-        parts.push(this.builders[stringBuilder](classAttrValue.chars));
+        parts.push(this.builders.text(classAttrValue.chars));
       } else if (classAttrValue.type === 'MustacheStatement') {
-        if (classAttrValue.params.length || this.isGlimmer) {
-          parts.push(classAttrValue);
-        } else {
-          parts.push(this.builders.path(classAttrValue.path.original));
-        }
+        parts.push(classAttrValue);
       }
     }
 
     utils.pushAll(parts, this.localToPath(localClassAttr.value));
-    this.divide(parts, this.isGlimmer ? 'text' : 'string');
-    node.attributes.unshift(this.builders.attr('class', this.builders.concat(parts)));
+    this.divide(parts, 'text');
+
+    let newClassAttr = this.builders.attr('class', this.builders.concat(parts));
+    node.attributes.unshift(newClassAttr);
+
+    // In new-enough versions of Ember (>= 3.25 or so), we need to create a
+    // fake good-enough `loc` whose content will start with `class=` to avoid
+    // triggering https://github.com/emberjs/ember.js/issues/19392
+    if (typeof localClassAttr.loc.slice === 'function') {
+      newClassAttr.loc = localClassAttr.loc.slice({
+        skipStart: 'local-'.length,
+      });
+    }
   }
 
   localToPath(node) {
@@ -163,7 +164,11 @@ module.exports = class ClassTransformPlugin {
     } else if (~['TextNode', 'StringLiteral'].indexOf(node.type)) {
       return this.staticLocalPath(node);
     } else {
-      throw new TypeError('ember-css-modules - invalid type, ' + node.type + ', passed to local-class attribute.');
+      throw new TypeError(
+        'ember-css-modules - invalid type, ' +
+          node.type +
+          ', passed to local-class attribute.'
+      );
     }
   }
 
@@ -178,15 +183,23 @@ module.exports = class ClassTransformPlugin {
       builder = 'mustache';
     }
 
-    let hash = this.builders.hash([this.builders.pair('from', this.stylesModuleNode())]);
-    let localClassInvocation = this.builders[builder](localClassPath, [node], hash);
+    let hash = this.builders.hash([
+      this.builders.pair('from', this.stylesModuleNode()),
+    ]);
+    let localClassInvocation = this.builders[builder](
+      localClassPath,
+      [node],
+      hash
+    );
 
     return [localClassInvocation];
   }
 
   stylesModuleNode() {
     if (!this.stylesModule) {
-      throw new Error('Unable to bind a local class in a template with an unknown moduleName');
+      throw new Error(
+        'Unable to bind a local class in a template with an unknown moduleName'
+      );
     }
 
     return this.builders.string(this.stylesModule);
@@ -194,7 +207,7 @@ module.exports = class ClassTransformPlugin {
 
   concatLocalPath(node) {
     let concatPath = this.builders.path('concat');
-    let concatParts = utils.concatStatementToParams(this.builders, node, this.isGlimmer);
+    let concatParts = utils.concatStatementToParams(this.builders, node);
     let concatStatement = this.builders.mustache(concatPath, concatParts);
     return this.dynamicLocalPath(concatStatement);
   }
@@ -203,41 +216,33 @@ module.exports = class ClassTransformPlugin {
     let locals = typeof node.chars === 'string' ? node.chars : node.value;
     let exprBuilder = typeof node.chars === 'string' ? 'mustache' : 'sexpr';
 
-    return [this.builders[exprBuilder](
-      'local-class',
-      [this.builders.string(locals)],
-      this.builders.hash([this.builders.pair('from', this.stylesModuleNode())])
-    )];
+    return [
+      this.builders[exprBuilder](
+        'local-class',
+        [this.builders.string(locals)],
+        this.builders.hash([
+          this.builders.pair('from', this.stylesModuleNode()),
+        ])
+      ),
+    ];
   }
 
   divide(parts, builder) {
     for (let i = 0; i < parts.length - 1; i++) {
       if (~['StringLiteral', 'TextNode'].indexOf(parts[i].type)) {
-        utils.updateStringValue(parts[i], function(str) { return str + ' '; });
+        utils.updateStringValue(parts[i], function (str) {
+          return str + ' ';
+        });
       } else if (~['StringLiteral', 'TextNode'].indexOf(parts[i + 1].type)) {
-        utils.updateStringValue(parts[i + 1], function(str) { return ' ' + str; });
+        utils.updateStringValue(parts[i + 1], function (str) {
+          return ' ' + str;
+        });
       } else {
         parts.splice(i + 1, 0, this.builders[builder](' '));
-        i++
+        i++;
       }
     }
 
     return parts;
   }
-}
-
-// For Ember < 2.15
-class LegacyAdapter {
-  constructor(plugin, options, env) {
-    this.plugin = plugin;
-    this.options = options;
-    this.meta = env.meta;
-    this.syntax = null;
-  }
-
-  transform(ast) {
-    let plugin = new this.plugin(Object.assign({ syntax: this.syntax }, this.meta), this.options);
-    this.syntax.traverse(ast, plugin.visitor);
-    return ast;
-  }
-}
+};

package/lib/htmlbars-plugin/utils.js

@@ -28,7 +28,9 @@ function updateStringValue(node, updater) {
 }
 
 function mustacheToSexpr(builders, node) {
-  if (node.type !== 'MustacheStatement') { return node; }
+  if (node.type !== 'MustacheStatement') {
+    return node;
+  }
 
   var params = node.params.map(textToString.bind(null, builders));
   return builders.sexpr(node.path, params, node.hash);
@@ -42,10 +44,8 @@ function textToString(builders, node) {
   }
 }
 
-function concatStatementToParams(builders, node, isGlimmer) {
-  if (!isGlimmer) { return node.parts; }
-
-  return node.parts.map(function(part) {
+function concatStatementToParams(builders, node) {
+  return node.parts.map(function (part) {
     if (part.type === 'MustacheStatement') {
       if (!part.params.length && !part.hash.pairs.length) {
         return part.path;
@@ -69,7 +69,7 @@ function findBy(target, key, path) {
 }
 
 function pushAll(target, arr) {
-  for (var i=0;i<arr.length;i++) {
+  for (var i = 0; i < arr.length; i++) {
     target.push(arr[i]);
   }
 
@@ -84,5 +84,5 @@ module.exports = {
   removeAttr: removeAttr,
   mustacheToSexpr: mustacheToSexpr,
   updateStringValue: updateStringValue,
-  concatStatementToParams: concatStatementToParams
+  concatStatementToParams: concatStatementToParams,
 };