Merge pull request #764 from hernanmd/fix_css_download_errors

Fix css download errors
pillar-markup · Jun 3, 2024 · 1cb7caa · 1cb7caa
2 parents 577ace6 + 7a3d8b0
commit 1cb7caa
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 22 deletions.
diff --git a/src/BaselineOfMicrodown/BaselineOfMicrodown.class.st b/src/BaselineOfMicrodown/BaselineOfMicrodown.class.st
@@ -83,7 +83,8 @@ BaselineOfMicrodown >> baseline: spec [
 			group: 'Tests' with: #( 'Core' 'Microdown-Tests' );
 			group: 'RichText' with: #( 'Core' 'Microdown-RichTextComposer' );
 			group: 'Extensions'
-				with: #( #'Microdown-Evaluator' #'Microdown-Evaluator-Tests'                                       #'Microdown-ReferenceChecker'
+				with: #( #'Microdown-Evaluator' #'Microdown-Evaluator-Tests'
+				   #'Microdown-ReferenceChecker'
 				   #'Microdown-PrettyPrinter' #'Microdown-PrettyPrinter-Tests'
 				   #'Microdown-HTMLExporter' #'Microdown-HTMLExporter-Tests'
 				   #'Microdown-LaTeXExporter' #'Microdown-LaTeXExporter-Tests'

diff --git a/src/Microdown-HTMLExporter/MicCSSDownloader.class.st b/src/Microdown-HTMLExporter/MicCSSDownloader.class.st
@@ -83,6 +83,8 @@ MicCSSDownloader >> httpClient [
 	^ ZnClient new
 		systemPolicy;
 		signalProgress: true;
-		ifFail: [ :exception | self error: 'Could not load : ', exception printString ];
+		ifFail: [ :exception | 
+			exception messageText traceCr.
+			exception pass ];
 		yourself
 ]
diff --git a/src/Microdown-HTMLExporter/MicCSSProvider.class.st b/src/Microdown-HTMLExporter/MicCSSProvider.class.st
@@ -194,49 +194,49 @@ MicCSSProvider >> frameworksSpecs [
 
 		{ 
 		#name -> 'AwsmCSS' .
-		#css -> 'https://igoradamenko.github.io/awsm.css/css/awsm.css' .
-		#minCss -> 'https://igoradamenko.github.io/awsm.css/css/awsm.min.css' .
+		#css -> 'https://unpkg.com/awsm.css/dist/awsm.css' .
+		#minCss -> 'https://unpkg.com/awsm.css/dist/awsm.min.css' .
 		#repository -> 'https://github.com/igoradamenko/awsm.css' .
 		#themes -> ({
 			{ 
 			#name -> 'White' .
-			#css -> 'https://igoradamenko.github.io/awsm.css/css/awsm_theme_white.css' .
-			#minCss -> 'https://igoradamenko.github.io/awsm.css/css/awsm_theme_white.min.css'
+			#css -> 'https://unpkg.com/awsm.css/dist/awsm_theme_white.css' .
+			#minCss -> 'https://unpkg.com/awsm.css/dist/awsm_theme_white.min.css'
 			} .
 			{ 
 			#name -> 	'Gondola' .
-			#css -> 'https://igoradamenko.github.io/awsm.css/css/awsm_theme_gondola.css' .
-			#minCss -> 'https://igoradamenko.github.io/awsm.css/css/awsm_theme_gondola.min.css' 
+			#css -> 'https://unpkg.com/awsm.css/dist/awsm_theme_gondola.css' .
+			#minCss -> 'https://unpkg.com/awsm.css/dist/awsm_theme_gondola.min.css' 
 			} .
 			{ 
 			#name -> 'Mischnka' .
-			#css -> 'https://igoradamenko.github.io/awsm.css/css/awsm_theme_mischka.css' .
-			#minCss -> 'https://igoradamenko.github.io/awsm.css/css/awsm_theme_mischka.min.css' 
+			#css -> 'https://unpkg.com/awsm.css/dist/awsm_theme_mischka.css' .
+			#minCss -> 'https://unpkg.com/awsm.css/dist/awsm_theme_mischka.min.css' 
 			} .
 			{ 
 			#name -> 'Big Stone' .
-			#css -> 'https://igoradamenko.github.io/awsm.css/css/awsm_theme_big-stone.css' .
-			#minCss -> 'https://igoradamenko.github.io/awsm.css/css/awsm_theme_big-stone.min.css'
+			#css -> 'https://unpkg.com/awsm.css/dist/awsm_theme_big-stone.css' .
+			#minCss -> 'https://unpkg.com/awsm.css/dist/awsm_theme_big-stone.min.css'
 			} .
 			{ 
 			#name -> 'Black' .
-			#css -> 'https://igoradamenko.github.io/awsm.css/css/awsm_theme_black.css' .
-			#minCss -> 'https://igoradamenko.github.io/awsm.css/css/awsm_theme_black.min.css'
+			#css -> 'https://unpkg.com/awsm.css/dist/awsm_theme_black.css' .
+			#minCss -> 'https://unpkg.com/awsm.css/dist/awsm_theme_black.min.css'
 			} .
 			{ 
 			#name -> 'Tasman' .
-			#css -> 'https://igoradamenko.github.io/awsm.css/css/awsm_theme_tasman.css' .
-			#minCss -> 'https://igoradamenko.github.io/awsm.css/css/awsm_theme_tasman.min.css'
+			#css -> 'https://unpkg.com/awsm.css/dist/awsm_theme_tasman.css' .
+			#minCss -> 'https://unpkg.com/awsm.css/dist/awsm_theme_tasman.min.css'
 			} .
 			{ 
 			#name -> 'Pastel Pink' .
-			#css -> 'https://igoradamenko.github.io/awsm.css/css/awsm_theme_pastel-pink.css' .
-			#minCss -> 'https://igoradamenko.github.io/awsm.css/css/awsm_theme_pastel-pink.min.css' 
+			#css -> 'https://unpkg.com/awsm.css/dist/awsm_theme_pastel-pink.css' .
+			#minCss -> 'https://unpkg.com/awsm.css/dist/awsm_theme_pastel-pink.min.css' 
 			} .
 			{ 
 			#name -> 'Pearl Lusta' .
-			#css -> 'https://igoradamenko.github.io/awsm.css/css/awsm_theme_pearl-lusta.css' .
-			#minCss -> 'https://igoradamenko.github.io/awsm.css/css/awsm_theme_pearl-lusta.min.css'
+			#css -> 'https://unpkg.com/awsm.css/dist/awsm_theme_pearl-lusta.css' .
+			#minCss -> 'https://unpkg.com/awsm.css/dist/awsm_theme_pearl-lusta.min.css'
 			 } } collect: #asDictionary)
 		} .
 

diff --git a/src/Microdown-HTMLExporter/MicHTMLStylerApp.class.st b/src/Microdown-HTMLExporter/MicHTMLStylerApp.class.st
@@ -28,7 +28,7 @@ MicHTMLStylerApp class >> open [
 	self new run
 ]
 
-{ #category : 'accessing' }
+{ #category : 'running' }
 MicHTMLStylerApp >> start [
 	" Private - See superimplementor's comment "
 

diff --git a/src/Microdown-RichTextComposer/MicSemanticAction.class.st b/src/Microdown-RichTextComposer/MicSemanticAction.class.st
@@ -134,7 +134,7 @@ MicSemanticAction >> getMetaClassOrNil [
 
 { #category : 'instance creation' }
 MicSemanticAction >> getPackageOrNil [
-	entity := RPackageOrganizer default packageNamed: tokens first asString ifAbsent: [ nil ].
+	entity := self class packageOrganizer packageNamed: tokens first asString ifAbsent: [ nil ].
 	^ entity
 
 ]