Fix bin/checkLanguageKeys for system.js projects.

assetgraph · Dec 16, 2015 · ebdc2a3 · ebdc2a3
1 parent e3659ab
commit ebdc2a3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/bin/applyBabelJob b/bin/applyBabelJob
@@ -327,10 +327,7 @@ new AssetGraph({root: commandLineOptions.root})
                     });
                 }
                 asset._rawSrc = replacedText.toString('utf-8');
-                // Hack: Prevent system.js bundles from being written to disc:
-                if (assetGraph.findRelations({ from: asset, to: { type: 'SourceMap' } }).length === 0) {
-                    asset.hasReplacedLanguageKeys = true;
-                }
+                asset.hasReplacedLanguageKeys = true;
             });
         }
     })

diff --git a/bin/checkLanguageKeys b/bin/checkLanguageKeys
@@ -88,6 +88,7 @@ new AssetGraph({root: rootUrl})
     .loadAssets(inputUrls)
     .populate({from: {type: 'Html'}, followRelations: {type: 'HtmlScript', to: {url: /^file:/}}})
     .assumeRequireJsConfigHasBeenFound()
+    .bundleSystemJs({ sourceMaps: true })
     .populate({
         followRelations: query.or(
             {

diff --git a/bin/makeBabelJob b/bin/makeBabelJob
@@ -165,6 +165,8 @@ new AssetGraph({root: commandLineOptions.root})
     .populate({from: {type: 'Html'}, followRelations: {type: 'HtmlScript', to: {url: /^file:/}}})
     .assumeRequireJsConfigHasBeenFound()
     .bundleSystemJs()
+    .serializeSourceMaps()
+    .populate({ startAssets: { type: 'SourceMap' }, followRelations: { to: { url: /^file:\// } } })
     .fixBaseAssetsOfUnresolvedOutgoingRelationsFromHtmlFragments({isInitial: true})
     .assumeThatAllHtmlFragmentAssetsWithoutIncomingRelationsAreNotTemplates()
     .populate({

diff --git a/lib/i18nTools.js b/lib/i18nTools.js
@@ -405,7 +405,8 @@ i18nTools.findOccurrences = function (assetGraph, initialAssets) {
     var trOccurrencesByKey = {};
     initialAssets.forEach(function (htmlAsset) {
         assetGraph.collectAssetsPostOrder(htmlAsset, {type: assetGraph.query.not(['HtmlAnchor', 'HtmlMetaRefresh', 'SvgAnchor'])}).forEach(function (asset) {
-            if (asset.isLoaded) {
+            // Hack: Prevent system.js bundles from being written to disc:
+            if (asset.isLoaded && assetGraph.findRelations({ from: asset, to: { type: 'SourceMap' } }).length === 0) {
                 if (asset.type === 'JavaScript') {
                     if (asset.incomingRelations.length === 0 || !asset.incomingRelations.every(isBootstrapperRelation)) {
                         i18nTools.eachTrInAst(asset.parseTree, function (occurrence) {