Skip to content

Commit

Permalink
sort imports by module name in TypeScript too, #1462
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Kauzmann <michael.kauzmann@colorado.edu>
  • Loading branch information
zepumph committed Sep 23, 2024
1 parent baa4436 commit bd7e3b1
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
6 changes: 3 additions & 3 deletions js/LocalizedString.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
*/

import TinyProperty from '../../axon/js/TinyProperty.js';
import TProperty from '../../axon/js/TProperty.js';
import localeProperty, { Locale } from '../../joist/js/i18n/localeProperty.js';
import arrayRemove from '../../phet-core/js/arrayRemove.js';
import Tandem from '../../tandem/js/Tandem.js';
import { PhetioID } from '../../tandem/js/TandemConstants.js';
import chipper from './chipper.js';
import TProperty from '../../axon/js/TProperty.js';
import { localizedStrings } from './getStringModule.js';
import arrayRemove from '../../phet-core/js/arrayRemove.js';
import { PhetioID } from '../../tandem/js/TandemConstants.js';
import LocalizedStringProperty from './LocalizedStringProperty.js';

// constants
Expand Down
2 changes: 1 addition & 1 deletion js/LocalizedStringProperty.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
import DynamicProperty from '../../axon/js/DynamicProperty.js';
import localeProperty, { Locale } from '../../joist/js/i18n/localeProperty.js';
import Tandem from '../../tandem/js/Tandem.js';
import TandemConstants from '../../tandem/js/TandemConstants.js';
import StringIO from '../../tandem/js/types/StringIO.js';
import chipper from './chipper.js';
import TandemConstants from '../../tandem/js/TandemConstants.js';
import LocalizedString from './LocalizedString.js';

class LocalizedStringProperty extends DynamicProperty<string, string, Locale> {
Expand Down
8 changes: 4 additions & 4 deletions js/getStringModule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
* @author Jonathan Olson <jonathan.olson>
*/

import TReadOnlyProperty from '../../axon/js/TReadOnlyProperty.js';
import { Locale } from '../../joist/js/i18n/localeProperty.js';
import CouldNotYetDeserializeError from '../../tandem/js/CouldNotYetDeserializeError.js';
import PhetioObject from '../../tandem/js/PhetioObject.js';
import Tandem from '../../tandem/js/Tandem.js';
import CouldNotYetDeserializeError from '../../tandem/js/CouldNotYetDeserializeError.js';
import { PhetioID } from '../../tandem/js/TandemConstants.js';
import IOType from '../../tandem/js/types/IOType.js';
import ObjectLiteralIO from '../../tandem/js/types/ObjectLiteralIO.js';
import LocalizedString, { LocalizedStringStateDelta, StringsStateStateObject } from './LocalizedString.js';
import TReadOnlyProperty from '../../axon/js/TReadOnlyProperty.js';
import { Locale } from '../../joist/js/i18n/localeProperty.js';
import { PhetioID } from '../../tandem/js/TandemConstants.js';

// constants
const FALLBACK_LOCALE = 'en';
Expand Down
2 changes: 2 additions & 0 deletions js/grunt/modulify.js
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,7 @@ const createImageModule = async ( repo, supportedRegionsAndCultures ) => {
* Auto-generated from modulify, DO NOT manually modify.
*/
/* eslint-disable */
/* @formatter:off */
import LocalizedImageProperty from '../../joist/js/i18n/LocalizedImageProperty.js';
import ${namespace} from './${namespace}.js';
${imageFiles.map( imageFile => `import ${getImportName( imageFile )} from '../${imageFile.replace( '.ts', '.js' )}';` ).join( '\n' )}
Expand Down Expand Up @@ -445,6 +446,7 @@ const createStringModule = async repo => {
* Auto-generated from modulify, DO NOT manually modify.
*/
/* eslint-disable */
/* @formatter:off */
import getStringModule from '../../chipper/js/getStringModule.js';
import type LocalizedStringProperty from '../../chipper/js/LocalizedStringProperty.js';
import ${namespace} from './${namespace}.js';
Expand Down

0 comments on commit bd7e3b1

Please sign in to comment.