Merge branch 'master' into a11ystring-plugin

phetsims · Sep 30, 2019 · ba4f356 · ba4f356
2 parents 7e3a8fe + abf477c
commit ba4f356
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 43 deletions.
diff --git a/eslint/.eslintrc.js b/eslint/.eslintrc.js
@@ -161,7 +161,9 @@ module.exports = {
     'phet-object-shorthand': 2,
 
     // disallow parens surrounding single args in arrow functions
-    'arrow-parens': [ 2, 'as-needed' ]
+    'arrow-parens': [ 2, 'as-needed' ],
+
+    'no-trailing-spaces': [ 2, { skipBlankLines: true, ignoreComments: true } ]
   },
   env: {
     browser: true,

diff --git a/eslint/sim_es6_eslintrc_review.js b/eslint/sim_es6_eslintrc_review.js
diff --git a/js/SimVersion.js b/js/SimVersion.js
@@ -6,7 +6,7 @@
  **************************************************************
  * IMPORTANT NOTE: This file is copied from PERENNIAL to CHIPPER frequently. If this is in CHIPPER, then it is AUTO
  * GENERATED; do not edit, as it will be overwritten. Make sure that any change here is supported by usages of
- * CHIPPER's SimVersion (i.e. in JOIST/UpdateCheck.js), see https://github.com/phetsims/perennial/issues/111 for more
+ * CHIPPER's SimVersion (i.e. in JOIST/updateCheck.js), see https://github.com/phetsims/perennial/issues/111 for more
  **************************************************************
  *
  * See https://github.com/phetsims/chipper/issues/560 for discussion on version ID definition.
@@ -113,6 +113,18 @@ const assert = typeof module !== 'undefined' ? require( 'assert' ) : window && w
       };
     }
 
+    /**
+     * @returns {boolean}
+     * @public
+     */
+    get isSimNotPublished() {
+      return this.major < 1 || // e.g. 0.0.0-dev.1
+             ( this.major === 1 && // e.g. 1.0.0-dev.1
+               this.minor === 0 &&
+               this.maintenance === 0 &&
+               this.testType );
+    }
+
     /**
      * Takes a serialized form of the SimVersion and returns an actual instance.
      * @public