Merge pull request #11 from ahawtho/master

Adds ability to specify relative mapping by using a null or empty str…
coursehero · Mar 15, 2021 · a099f4c · a099f4c
2 parents bb48792 + bc86650
commit a099f4c
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 1 deletion.
diff --git a/src/Assetic/SourceMapFilter.php b/src/Assetic/SourceMapFilter.php
@@ -129,7 +129,11 @@ protected function doFilterDump(CHAssetBag $assetBag, string $tmpOutput, array $
     {
         $assetCollectionTargetPath = $assetBag->getAssetCollectionTargetPath();
         $targetPathForSourceMap = $assetCollectionTargetPath . '.map';
-        $sourceMapURL = "{$this->siteUrl}/$targetPathForSourceMap";
+        if ($this->siteUrl === null || $this->siteUrl === '') {
+            $sourceMapURL = pathinfo($targetPathForSourceMap, PATHINFO_BASENAME);
+        } else {
+            $sourceMapURL = "{$this->siteUrl}/$targetPathForSourceMap";
+        }
 
         $cmd = "{$this->uglifyBin} {$this->uglifyOpts} --source-map \"content=auto,root='{$this->sourceMapRoot}',includeSources,url='$sourceMapURL',filename='$assetCollectionTargetPath'\" -o $tmpOutput " . implode(' ', $inputs);
 

diff --git a/tests/SourceMapFilterTest.php b/tests/SourceMapFilterTest.php
@@ -46,6 +46,68 @@ public function testSourceMapFilterSimple()
         $this->assertEquals($this->loadSourceMap('tests/simple/expected.js.map'), $sourceMap);
     }
 
+    public function testSourceMapFilterSimpleRelativeMapPathEmpty()
+    {
+        $asseticWriteTo = sys_get_temp_dir();
+        $worker = new FlattenWorker([
+            [
+                'match' => '/\.js$/',
+                'class' => SourceMapFilter::class,
+                'args' => [[
+                    'site_url' => '', // empty siteURL
+                    'assetic_write_to' => $asseticWriteTo,
+                    'source_map_source_path_trim' => dirname(__DIR__)
+                ]]
+            ]
+        ]);
+
+        $factory = $this->createMock(AssetFactory::class);
+
+        $collection = new AssetCollection();
+        $collection->setTargetPath('asset.js');
+        $collection->add($this->makeStringAsset(__DIR__ . '/relative', 'asset1.js'));
+        $collection->add($this->makeStringAsset(__DIR__ . '/relative', 'asset2.js'));
+        $collection->add($this->makeStringAsset(__DIR__ . '/relative', 'asset3.js'));
+        $collection->add($this->makeStringAsset('/../..', 'climb-above-root.js'));
+        $collection = $worker->process($collection, $factory);
+
+        $this->assertEquals(file_get_contents('tests/relative/expected.js'), $collection->dump());
+
+        $sourceMap = $this->loadSourceMap("$asseticWriteTo/asset.js.map");
+        $this->assertEquals($this->loadSourceMap('tests/relative/expected.js.map'), $sourceMap);
+    }
+
+    public function testSourceMapFilterSimpleRelativeMapPathNull()
+    {
+        $asseticWriteTo = sys_get_temp_dir();
+        $worker = new FlattenWorker([
+            [
+                'match' => '/\.js$/',
+                'class' => SourceMapFilter::class,
+                'args' => [[
+                    'site_url' => null, // empty siteURL
+                    'assetic_write_to' => $asseticWriteTo,
+                    'source_map_source_path_trim' => dirname(__DIR__)
+                ]]
+            ]
+        ]);
+
+        $factory = $this->createMock(AssetFactory::class);
+
+        $collection = new AssetCollection();
+        $collection->setTargetPath('asset.js');
+        $collection->add($this->makeStringAsset(__DIR__ . '/relative', 'asset1.js'));
+        $collection->add($this->makeStringAsset(__DIR__ . '/relative', 'asset2.js'));
+        $collection->add($this->makeStringAsset(__DIR__ . '/relative', 'asset3.js'));
+        $collection->add($this->makeStringAsset('/../..', 'climb-above-root.js'));
+        $collection = $worker->process($collection, $factory);
+
+        $this->assertEquals(file_get_contents('tests/relative/expected.js'), $collection->dump());
+
+        $sourceMap = $this->loadSourceMap("$asseticWriteTo/asset.js.map");
+        $this->assertEquals($this->loadSourceMap('tests/relative/expected.js.map'), $sourceMap);
+    }
+
     public function testSourceMapFilterComplex()
     {
         $asseticWriteTo = sys_get_temp_dir();

diff --git a/tests/relative/expected.js b/tests/relative/expected.js
diff --git a/tests/relative/expected.js.map b/tests/relative/expected.js.map