Merge pull request #323 from RobbieTheWagner/master

dfreeman · web-flow · commit d0b87420c704 · 2025-04-24T19:29:09.000+01:00
Fix .original deprecation
diff --git a/CHANGELOG.md b/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
diff --git a/packages/ember-css-modules/lib/htmlbars-plugin/index.js b/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;
+}
diff --git a/packages/ember-css-modules/lib/htmlbars-plugin/utils.js b/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?)');
   }
diff --git a/packages/ember-css-modules/package.json b/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",
diff --git a/yarn.lock b/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"

Original file line number	Diff line number	Diff line change
`@@ -62,15 +62,15 @@ module.exports = class ClassTransformPlugin {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`transformStatement(node) {`
`65`		`- if (node.path.original === 'local-class') {`
	`65`	`+ if (getValue(node.path) === 'local-class') {`
`66`	`66`	`this.transformLocalClassHelperInvocation(node);`
`67`	`67`	`} else {`
`68`	`68`	`this.transformPossibleComponentInvocation(node);`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`transformSubexpression(node) {`
`73`		`- if (node.path.original === 'local-class') {`
	`73`	`+ if (getValue(node.path) === 'local-class') {`
`74`	`74`	`this.transformLocalClassHelperInvocation(node);`
`75`	`75`	`}`
`76`	`76`	`}`
`@@ -246,3 +246,17 @@ module.exports = class ClassTransformPlugin {`
`246`	`246`	`return parts;`
`247`	`247`	`}`
`248`	`248`	`};`
	`249`	`+`
	`250`	`+function getValue(path) {`
	`251`	`+ if (!path) return;`
	`252`	`+`
	`253`	`+ if ('value' in path) {`
	`254`	`+ return path.value;`
	`255`	`+ }`
	`256`	`+`
	`257`	`+ /**`
	`258`	`+ * Deprecated in ember 5.9+`
	`259`	`+ * (so we use the above for newer embers)`
	`260`	`+ */`
	`261`	`+ return path.original;`
	`262`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ember-css-modules",`
`3`		`- "version": "2.1.0",`
	`3`	`+ "version": "2.1.1",`
`4`	`4`	`"description": "CSS Modules for ambitious applications",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"build": "ember build --environment=production",`