Merge pull request #323 from RobbieTheWagner/master

Fix .original deprecation

Author: dfreeman

CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
 
+## 2.1.1 (April 4, 2019)
+### Fixed
+- Remove usage of .original in Ember 5.9+ to fix deprecation warnings.
+
 ## 2.1.0 (April 2, 2024)
 
 ### Added

packages/ember-css-modules/lib/htmlbars-plugin/index.js

@@ -62,15 +62,15 @@ module.exports = class ClassTransformPlugin {
   }
 
   transformStatement(node) {
-    if (node.path.original === 'local-class') {
+    if (getValue(node.path) === 'local-class') {
       this.transformLocalClassHelperInvocation(node);
     } else {
       this.transformPossibleComponentInvocation(node);
     }
   }
 
   transformSubexpression(node) {
-    if (node.path.original === 'local-class') {
+    if (getValue(node.path) === 'local-class') {
       this.transformLocalClassHelperInvocation(node);
     }
   }
@@ -246,3 +246,17 @@ module.exports = class ClassTransformPlugin {
     return parts;
   }
 };
+
+function getValue(path) {
+  if (!path) return;
+
+  if ('value' in path) {
+    return path.value;
+  }
+
+  /**
+   * Deprecated in ember 5.9+
+   * (so we use the above for newer embers)
+   */
+  return path.original;
+}

packages/ember-css-modules/lib/htmlbars-plugin/utils.js

@@ -21,7 +21,11 @@ function updateStringValue(node, updater) {
     node.chars = updater(node.chars);
   } else if (node.type === 'StringLiteral') {
     node.value = updater(node.value);
-    node.original = updater(node.original);
+    // Avoid `original` deprecation in Ember 5.9+
+    let originalDesc = Object.getOwnPropertyDescriptor(node, 'original');
+    if (originalDesc && originalDesc.value) {
+      node.original = updater(node.original);
+    }
   } else {
     throw new Error('Unknown node type ' + node.type + ' (not a string?)');
   }

packages/ember-css-modules/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-css-modules",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "CSS Modules for ambitious applications",
   "scripts": {
     "build": "ember build --environment=production",

yarn.lock

@@ -5873,7 +5873,7 @@ ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0, ember-co
     semver "^5.4.1"
 
 "ember-css-modules@link:packages/ember-css-modules":
-  version "2.0.1"
+  version "2.1.1"
   dependencies:
     broccoli-bridge "^1.0.0"
     broccoli-concat "^4.2.5"