Copy phet-io wrappers on build, see #785

phetsims · Aug 5, 2019 · cbefe57 · cbefe57
1 parent 0dcc680
commit cbefe57
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/js/grunt/buildRunnable.js b/js/grunt/buildRunnable.js
@@ -303,7 +303,7 @@ module.exports = async function( repo, minifyOptions, instrument, allHTML, brand
   }
 
   if ( brand === 'phet-io' ) {
-    await copySupplementalPhetioFiles( repo, version, englishTitle );
+    await copySupplementalPhetioFiles( repo, version, englishTitle, packageObject );
   }
 
   // Thumbnails and twitter card

diff --git a/js/grunt/getPhetLibs.js b/js/grunt/getPhetLibs.js
@@ -68,6 +68,11 @@ module.exports = function getPhetLibs( repo, brand ) {
       phetLibs = phetLibs.concat( packageObject.phet[ brand ].phetLibs );
     }
 
+    // wrappers are also marked as phetLibs, so we can get their shas without listing them twice
+    if ( brand === 'phet-io' ) {
+      phetLibs = phetLibs.concat( packageObject.phet[ brand ].wrappers || [] );
+    }
+
     // sort and remove duplicates
     return _.uniq( phetLibs.sort() );
   }

diff --git a/js/grunt/phet-io/copySupplementalPhetioFiles.js b/js/grunt/phet-io/copySupplementalPhetioFiles.js
@@ -72,7 +72,7 @@ const JSDOC_FILES = [
 ];
 const JSDOC_README_FILE = '../phet-io/doc/wrapper/phet-io-documentation_README.md';
 
-module.exports = async function( repo, version, simulationDisplayName ) {
+module.exports = async function( repo, version, simulationDisplayName, packageObject ) {
 
   const buildDir = `../${repo}/build/phet-io/`;
   const wrappersLocation = `${buildDir}${WRAPPERS_FOLDER}`;
@@ -238,6 +238,11 @@ module.exports = async function( repo, version, simulationDisplayName ) {
 
   // Make sure to copy the phet-io-wrappers common wrapper code too.
   wrappers.push( WRAPPER_COMMON_FOLDER );
+
+  // Add sim-specific wrappers
+  const simSpecificWrappers = packageObject.phet && packageObject.phet[ 'phet-io' ] && packageObject.phet[ 'phet-io' ].wrappers ? packageObject.phet[ 'phet-io' ].wrappers : [];
+  simSpecificWrappers.forEach( simSpecificWrapper => wrappers.push( simSpecificWrapper ) );
+
   wrappers.forEach( function( wrapper ) {
 
     const wrapperParts = wrapper.split( '/' );