ember-css-modules 1.5.0 → 1.6.2

package/index.js

@@ -43,7 +43,13 @@ module.exports = {
 
   treeForAddon() {
     let addonTree = this._super.treeForAddon.apply(this, arguments);
-    return new MergeTrees([addonTree, `${__dirname}/vendor`]);
+
+    // Allow to opt-out from automatic Component.reopen()
+    if (this.cssModulesOptions.patchClassicComponent !== false) {
+      return new MergeTrees([addonTree, `${__dirname}/vendor`]);
+    } else {
+      return addonTree;
+    }
   },
 
   cacheKeyForTree(treeType) {

package/lib/htmlbars-plugin/index.js

@@ -152,7 +152,18 @@ module.exports = class ClassTransformPlugin {
 
     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)));
+
+    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) {

package/lib/resolve-path.js

@@ -44,18 +44,16 @@ function resolveRelativePath(importPath, fromFile, options) {
 
 // Resolve absolute paths pointing to the same app/addon as the importer
 function resolveLocalPath(importPath, fromFile, options) {
-  let appOrAddonDirIndex = fromFile.indexOf(options.ownerName, options.root.length);
+  const fromFileStartsWithOwnerName = fromFile.substring(options.root.length + 1).startsWith(options.ownerName);
 
   // Depending on the exact version of Ember CLI and/or Embroider in play, the
   // app/addon name may or may not be included in `fromFile`'s path. If not, we
   // need to strip that prefix from the import path.
-  if (appOrAddonDirIndex === -1) {
-    appOrAddonDirIndex = options.root.length;
-    importPath = ensurePosixPath(importPath).replace(new RegExp('^' + options.ownerName + '/?'), '');
+  if (!fromFileStartsWithOwnerName) {
+    importPath = importPath.substring(options.ownerName.length + 1);
   }
 
-  let prefix = fromFile.substring(0, appOrAddonDirIndex);
-  let absolutePath = ensurePosixPath(path.resolve(prefix, importPath));
+  let absolutePath = ensurePosixPath(path.resolve(options.root, importPath));
   return internalDep(absolutePath, options);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-css-modules",
-  "version": "1.5.0",
+  "version": "1.6.2",
   "description": "CSS Modules for ambitious applications",
   "scripts": {
     "build": "ember build",
@@ -25,7 +25,7 @@
     "broccoli-plugin": "^1.3.1",
     "console-ui": "^2.2.2",
     "ember-ajax": "^3.1.0",
-    "ember-auto-import": "^1.5.3",
+    "ember-auto-import": "^2.4.0",
     "ember-cli": "~3.4.1",
     "ember-cli-addon-tests": "^0.11.0",
     "ember-cli-dependency-checker": "^3.0.0",
@@ -56,7 +56,7 @@
     "qunitjs": "^2.4.1",
     "sinon": "^4.3.0",
     "template-stuff": "link:tests/dummy/lib/template-stuff",
-    "webpack": "^4.41.2"
+    "webpack": "^5.70.0"
   },
   "keywords": [
     "ember-addon",
@@ -78,7 +78,7 @@
     "calculate-cache-key-for-tree": "^1.1.0",
     "debug": "^3.1.0",
     "ember-cli-babel": "^7.7.3",
-    "ember-cli-htmlbars": "^3.0.0",
+    "ember-cli-htmlbars": "^3.0.0 || ^6.0.0",
     "ember-cli-version-checker": "^2.1.0",
     "ensure-posix-path": "^1.0.2",
     "hash-string": "^1.0.0",