From a04195ee0ebe4ad9cc04a13fd65473a2f0efe503 Mon Sep 17 00:00:00 2001 From: Daniel Stolt Date: Sun, 16 Aug 2015 17:38:16 +0100 Subject: [PATCH] Added a simple skeleton Assets.json to codegen module template. Fixes #5606. --- .../CodeGenerationTemplates/ModuleAssetsJson.txt | 6 ++++++ .../CodeGenerationTemplates/ModuleStylesCss.txt | 2 ++ .../CodeGenerationTemplates/ModuleStylesLess.txt | 2 ++ .../CodeGenerationTemplates/ModuleStylesMinCss.txt | 1 + .../Commands/CodeGenerationCommands.cs | 11 ++++++++++- .../Orchard.CodeGeneration.csproj | 7 +++++++ 6 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleAssetsJson.txt create mode 100644 src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleStylesCss.txt create mode 100644 src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleStylesLess.txt create mode 100644 src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleStylesMinCss.txt diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleAssetsJson.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleAssetsJson.txt new file mode 100644 index 000000000..e21c3a304 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleAssetsJson.txt @@ -0,0 +1,6 @@ +[ + { + "inputs": [ "Assets/Styles.less" ], + "output": "Styles/Styles.css" + } +] \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleStylesCss.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleStylesCss.txt new file mode 100644 index 000000000..b2b409889 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleStylesCss.txt @@ -0,0 +1,2 @@ + +/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsImZpbGUiOiJTdHlsZXMuY3NzIiwic291cmNlc0NvbnRlbnQiOltdLCJzb3VyY2VSb290IjoiL3NvdXJjZS8ifQ== */ \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleStylesLess.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleStylesLess.txt new file mode 100644 index 000000000..d27ea00e0 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleStylesLess.txt @@ -0,0 +1,2 @@ +body { +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleStylesMinCss.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleStylesMinCss.txt new file mode 100644 index 000000000..5f282702b --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleStylesMinCss.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs index 5b0f68639..79471c499 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs @@ -24,7 +24,7 @@ namespace Orchard.CodeGeneration.Commands { "", "Content", "Styles", "Scripts", "Views" }; private static readonly string[] _moduleDirectories = new[] { - "", "Properties", "Controllers", "Views", "Models", "Scripts", "Styles" + "", "Properties", "Assets", "Controllers", "Views", "Models", "Scripts", "Styles" }; private static readonly string[] _moduleTestsDirectories = new[] { "", "Properties" @@ -281,6 +281,15 @@ namespace Orchard.CodeGeneration.Commands { } } + File.WriteAllText(modulePath + "Assets.json", File.ReadAllText(_codeGenTemplatePath + "ModuleAssetsJson.txt")); + content.Add(modulePath + "Assets.json"); + File.WriteAllText(modulePath + "Assets\\Styles.less", File.ReadAllText(_codeGenTemplatePath + "ModuleStylesLess.txt")); + content.Add(modulePath + "Assets\\Styles.less"); + File.WriteAllText(modulePath + "Styles\\Styles.css", File.ReadAllText(_codeGenTemplatePath + "ModuleStylesCss.txt")); + content.Add(modulePath + "Styles\\Styles.css"); + File.WriteAllText(modulePath + "Styles\\Styles.min.css", File.ReadAllText(_codeGenTemplatePath + "ModuleStylesMinCss.txt")); + content.Add(modulePath + "Styles\\Styles.min.css"); + File.WriteAllText(modulePath + "Web.config", File.ReadAllText(_codeGenTemplatePath + "ModuleRootWebConfig.txt")); content.Add(modulePath + "Web.config"); File.WriteAllText(modulePath + "Scripts\\Web.config", File.ReadAllText(_codeGenTemplatePath + "StaticFilesWebConfig.txt")); diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj index 22d72d16f..c88f72069 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj @@ -26,6 +26,7 @@ + true @@ -69,6 +70,9 @@ + + + @@ -101,6 +105,9 @@ + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)