Rename RichEnumerationIO ->EnumerationIO, delete old version, move fi…

…le to tandem (with history), phetsims/phet-core#97
phetsims · Jan 13, 2022 · 66aee3f · 66aee3f
1 parent 8a802b1
commit 66aee3f
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 55 deletions.
diff --git a/js/EnumerationDeprecatedProperty.js b/js/EnumerationDeprecatedProperty.js
@@ -6,7 +6,7 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import EnumerationIO from '../../phet-core/js/EnumerationIO.js';
+import EnumerationIO from '../../tandem/js/types/EnumerationIO.js';
 import merge from '../../phet-core/js/merge.js';
 import axon from './axon.js';
 import Property from './Property.js';

diff --git a/js/EnumerationPropertyDeprecatedTests.js b/js/EnumerationPropertyDeprecatedTests.js
@@ -7,7 +7,7 @@
  */
 
 import EnumerationDeprecated from '../../phet-core/js/EnumerationDeprecated.js';
-import EnumerationIO from '../../phet-core/js/EnumerationIO.js';
+import EnumerationIO from '../../tandem/js/types/EnumerationIO.js';
 import EnumerationDeprecatedProperty from './EnumerationDeprecatedProperty.js';
 
 QUnit.module( 'EnumerationDeprecatedProperty' );

diff --git a/js/RichEnumerationIO.ts b/js/RichEnumerationIO.ts
diff --git a/js/RichEnumerationProperty.ts b/js/RichEnumerationProperty.ts
@@ -7,7 +7,7 @@
  */
 
 import Property, { PropertyOptions } from './Property.js';
-import RichEnumerationIO from './RichEnumerationIO.js';
+import EnumerationIO from '../../tandem/js/types/EnumerationIO.js';
 import merge from '../../phet-core/js/merge.js';
 import EnumerationValue from '../../phet-core/js/EnumerationValue.js';
 
@@ -26,7 +26,7 @@ class RichEnumerationProperty<T extends EnumerationValue> extends Property<T> {
 
     const options = merge( {}, providedOptions, {
       validValues: value.enumeration!.values,
-      phetioType: Property.PropertyIO( RichEnumerationIO<T>( {
+      phetioType: Property.PropertyIO( EnumerationIO<T>( {
         enumeration: value.enumeration!
       } ) )
     } );

diff --git a/tsconfig-module.json b/tsconfig-module.json
@@ -16,7 +16,6 @@
   "include": [
     "../axon/js/**/*",
     "../tandem/js/**/*",
-    "../phet-core/js/EnumerationIO.js",
     "../dot/js/Range.js",
     "../dot/js/dot.js",
     "../chipper/phet-types.d.ts",