Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Non-minified version of DotVVM in debug mode #970

Merged
merged 2 commits into from Mar 14, 2021
Merged

Non-minified version of DotVVM in debug mode #970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b555290
Support for different resources for debug and production
tomasherceg Mar 14, 2021
3f9cd88
Fixed referential tests results
quigamdev Mar 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion ....Framework.Tests.Common/Runtime/config-tests/ConfigurationSerializationTests.RestAPI.json
View file
Open in desktop
Expand Up @@ -41,7 +41,8 @@
"Defer": true,
"Location": {
"$type": "DotVVM.Framework.ResourceManagement.FileResourceLocation, DotVVM.Framework",
"FilePath": "./apiscript.js"
"FilePath": "./apiscript.js",
"DebugFilePath": "./apiscript.js"
},
"MimeType": "text/javascript",
"RenderPosition": "Anywhere"
Expand Down
30 changes: 20 additions & 10 deletions ...s.Common/Runtime/config-tests/ConfigurationSerializationTests.SerializeDefaultConfig.json
View file
Open in desktop
Expand Up @@ -32,13 +32,15 @@
"NomoduleLocation": {
"$type": "DotVVM.Framework.ResourceManagement.EmbeddedResourceLocation, DotVVM.Framework",
"Assembly": "DotVVM.Framework, Version=***, Culture=neutral, PublicKeyToken=23f3607db32275da",
"Name": "DotVVM.Framework.obj.javascript.root_only_system.dotvvm-root.js"
"Name": "DotVVM.Framework.obj.javascript.root_only_system.dotvvm-root.js",
"DebugName": "DotVVM.Framework.obj.javascript.root_only_system_debug.dotvvm-root.js"
},
"Defer": true,
"Location": {
"$type": "DotVVM.Framework.ResourceManagement.EmbeddedResourceLocation, DotVVM.Framework",
"Assembly": "DotVVM.Framework, Version=***, Culture=neutral, PublicKeyToken=23f3607db32275da",
"Name": "DotVVM.Framework.obj.javascript.root_only.dotvvm-root.js"
"Name": "DotVVM.Framework.obj.javascript.root_only.dotvvm-root.js",
"DebugName": "DotVVM.Framework.obj.javascript.root_only_debug.dotvvm-root.js"
},
"MimeType": "text/javascript",
"Dependencies": [
Expand All @@ -51,13 +53,15 @@
"NomoduleLocation": {
"$type": "DotVVM.Framework.ResourceManagement.EmbeddedResourceLocation, DotVVM.Framework",
"Assembly": "DotVVM.Framework, Version=***, Culture=neutral, PublicKeyToken=23f3607db32275da",
"Name": "DotVVM.Framework.obj.javascript.root_spa_system.dotvvm-root.js"
"Name": "DotVVM.Framework.obj.javascript.root_spa_system.dotvvm-root.js",
"DebugName": "DotVVM.Framework.obj.javascript.root_spa_system_debug.dotvvm-root.js"
},
"Defer": true,
"Location": {
"$type": "DotVVM.Framework.ResourceManagement.EmbeddedResourceLocation, DotVVM.Framework",
"Assembly": "DotVVM.Framework, Version=***, Culture=neutral, PublicKeyToken=23f3607db32275da",
"Name": "DotVVM.Framework.obj.javascript.root_spa.dotvvm-root.js"
"Name": "DotVVM.Framework.obj.javascript.root_spa.dotvvm-root.js",
"DebugName": "DotVVM.Framework.obj.javascript.root_spa_debug.dotvvm-root.js"
},
"MimeType": "text/javascript",
"Dependencies": [
Expand All @@ -70,13 +74,15 @@
"NomoduleLocation": {
"$type": "DotVVM.Framework.ResourceManagement.EmbeddedResourceLocation, DotVVM.Framework",
"Assembly": "DotVVM.Framework, Version=***, Culture=neutral, PublicKeyToken=23f3607db32275da",
"Name": "DotVVM.Framework.obj.javascript.polyfill.bundle.js"
"Name": "DotVVM.Framework.obj.javascript.polyfill.bundle.js",
"DebugName": "DotVVM.Framework.obj.javascript.polyfill.bundle.js"
},
"Defer": true,
"Location": {
"$type": "DotVVM.Framework.ResourceManagement.EmbeddedResourceLocation, DotVVM.Framework",
"Assembly": "DotVVM.Framework, Version=***, Culture=neutral, PublicKeyToken=23f3607db32275da",
"Name": "DotVVM.Framework.obj.javascript.polyfill.bundle.js"
"Name": "DotVVM.Framework.obj.javascript.polyfill.bundle.js",
"DebugName": "DotVVM.Framework.obj.javascript.polyfill.bundle.js"
},
"MimeType": "text/javascript",
"RenderPosition": "Anywhere"
Expand All @@ -88,7 +94,8 @@
"Location": {
"$type": "DotVVM.Framework.ResourceManagement.EmbeddedResourceLocation, DotVVM.Framework",
"Assembly": "DotVVM.Framework, Version=***, Culture=neutral, PublicKeyToken=23f3607db32275da",
"Name": "DotVVM.Framework.Resources.Scripts.DotVVM.Debug.js"
"Name": "DotVVM.Framework.Resources.Scripts.DotVVM.Debug.js",
"DebugName": "DotVVM.Framework.Resources.Scripts.DotVVM.Debug.js"
},
"MimeType": "text/javascript",
"Dependencies": [
Expand All @@ -101,7 +108,8 @@
"Location": {
"$type": "DotVVM.Framework.ResourceManagement.EmbeddedResourceLocation, DotVVM.Framework",
"Assembly": "DotVVM.Framework, Version=***, Culture=neutral, PublicKeyToken=23f3607db32275da",
"Name": "DotVVM.Framework.Resources.Scripts.Globalize.globalize.min.js"
"Name": "DotVVM.Framework.Resources.Scripts.Globalize.globalize.min.js",
"DebugName": "DotVVM.Framework.Resources.Scripts.Globalize.globalize.min.js"
},
"MimeType": "text/javascript",
"RenderPosition": "Anywhere"
Expand All @@ -111,7 +119,8 @@
"Location": {
"$type": "DotVVM.Framework.ResourceManagement.EmbeddedResourceLocation, DotVVM.Framework",
"Assembly": "DotVVM.Framework, Version=***, Culture=neutral, PublicKeyToken=23f3607db32275da",
"Name": "DotVVM.Framework.Resources.Scripts.knockout-latest.js"
"Name": "DotVVM.Framework.Resources.Scripts.knockout-latest.js",
"DebugName": "DotVVM.Framework.Resources.Scripts.knockout-latest.debug.js"
},
"MimeType": "text/javascript",
"RenderPosition": "Anywhere"
Expand All @@ -122,7 +131,8 @@
"Location": {
"$type": "DotVVM.Framework.ResourceManagement.EmbeddedResourceLocation, DotVVM.Framework",
"Assembly": "DotVVM.Framework, Version=***, Culture=neutral, PublicKeyToken=23f3607db32275da",
"Name": "DotVVM.Framework.Resources.Scripts.DotVVM.FileUpload.css"
"Name": "DotVVM.Framework.Resources.Scripts.DotVVM.FileUpload.css",
"DebugName": "DotVVM.Framework.Resources.Scripts.DotVVM.FileUpload.css"
},
"MimeType": "text/css"
}
Expand Down
18 changes: 12 additions & 6 deletions ...Tests.Common/Runtime/config-tests/ConfigurationSerializationTests.SerializeResources.json
View file
Open in desktop
Expand Up @@ -41,7 +41,8 @@
"Defer": true,
"Location": {
"$type": "DotVVM.Framework.ResourceManagement.UrlResourceLocation, DotVVM.Framework",
"Url": "x"
"Url": "x",
"DebugUrl": "x"
},
"MimeType": "text/javascript",
"VerifyResourceIntegrity": true,
Expand All @@ -51,22 +52,26 @@
"Defer": true,
"Location": {
"$type": "DotVVM.Framework.ResourceManagement.UrlResourceLocation, DotVVM.Framework",
"Url": "x"
"Url": "x",
"DebugUrl": "x"
},
"LocationFallback": {
"JavascriptCondition": "window.x",
"AlternativeLocations": [
{
"$type": "DotVVM.Framework.ResourceManagement.UrlResourceLocation, DotVVM.Framework",
"Url": "y"
"Url": "y",
"DebugUrl": "y"
},
{
"$type": "DotVVM.Framework.ResourceManagement.UrlResourceLocation, DotVVM.Framework",
"Url": "z"
"Url": "z",
"DebugUrl": "z"
},
{
"$type": "DotVVM.Framework.ResourceManagement.FileResourceLocation, DotVVM.Framework",
"FilePath": "some-script.js"
"FilePath": "some-script.js",
"DebugFilePath": "some-script.js"
}
]
},
Expand All @@ -81,7 +86,8 @@
"r3": {
"Location": {
"$type": "DotVVM.Framework.ResourceManagement.UrlResourceLocation, DotVVM.Framework",
"Url": "s"
"Url": "s",
"DebugUrl": "s"
},
"MimeType": "text/css",
"VerifyResourceIntegrity": true,
Expand Down
15 changes: 10 additions & 5 deletions src/DotVVM.Framework/Configuration/DotvvmConfiguration.cs
View file
Open in desktop
Expand Up @@ -335,27 +335,32 @@ private static void RegisterResources(DotvvmConfiguration configuration)
configuration.Resources.Register(ResourceConstants.KnockoutJSResourceName,
new ScriptResource(location: new EmbeddedResourceLocation(
typeof(DotvvmConfiguration).GetTypeInfo().Assembly,
"DotVVM.Framework.Resources.Scripts.knockout-latest.js")));
"DotVVM.Framework.Resources.Scripts.knockout-latest.js",
debugName: "DotVVM.Framework.Resources.Scripts.knockout-latest.debug.js")));

configuration.Resources.Register(ResourceConstants.DotvvmResourceName + ".internal",
new ScriptModuleResource(
location: new EmbeddedResourceLocation(
typeof(DotvvmConfiguration).GetTypeInfo().Assembly,
"DotVVM.Framework.obj.javascript.root_only.dotvvm-root.js"),
"DotVVM.Framework.obj.javascript.root_only.dotvvm-root.js",
debugName: "DotVVM.Framework.obj.javascript.root_only_debug.dotvvm-root.js"),
nomoduleLocation: new EmbeddedResourceLocation(
typeof(DotvvmConfiguration).GetTypeInfo().Assembly,
"DotVVM.Framework.obj.javascript.root_only_system.dotvvm-root.js")
"DotVVM.Framework.obj.javascript.root_only_system.dotvvm-root.js",
debugName: "DotVVM.Framework.obj.javascript.root_only_system_debug.dotvvm-root.js")
) {
Dependencies = new[] { ResourceConstants.KnockoutJSResourceName, ResourceConstants.PolyfillBundleResourceName }
});
configuration.Resources.Register(ResourceConstants.DotvvmResourceName + ".internal-spa",
new ScriptModuleResource(
location: new EmbeddedResourceLocation(
typeof(DotvvmConfiguration).GetTypeInfo().Assembly,
"DotVVM.Framework.obj.javascript.root_spa.dotvvm-root.js"),
"DotVVM.Framework.obj.javascript.root_spa.dotvvm-root.js",
debugName: "DotVVM.Framework.obj.javascript.root_spa_debug.dotvvm-root.js"),
nomoduleLocation: new EmbeddedResourceLocation(
typeof(DotvvmConfiguration).GetTypeInfo().Assembly,
"DotVVM.Framework.obj.javascript.root_spa_system.dotvvm-root.js")
"DotVVM.Framework.obj.javascript.root_spa_system.dotvvm-root.js",
debugName: "DotVVM.Framework.obj.javascript.root_spa_system_debug.dotvvm-root.js")
) {
Dependencies = new[] { ResourceConstants.KnockoutJSResourceName, ResourceConstants.PolyfillBundleResourceName }
});
Expand Down
12 changes: 5 additions & 7 deletions src/DotVVM.Framework/DotVVM.Framework.csproj
View file
Open in desktop
Expand Up @@ -71,25 +71,26 @@
<EmbeddedResource Remove="node_modules\**" />
<None Remove="node_modules\**" />
</ItemGroup>
<ItemGroup>
<None Remove="Resources\Scripts\knockout-latest.debug.js" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Scripts\DotVVM.FileUpload.css" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Scripts\DotVVM.Debug.js" />
<EmbeddedResource Include="obj/javascript/root-only/dotvvm-root.js" />
<EmbeddedResource Include="obj/javascript/root-only-debug/dotvvm-root.js" />
<EmbeddedResource Include="obj/javascript/root-spa/dotvvm-root.js" />
<EmbeddedResource Include="obj/javascript/root-spa-debug/dotvvm-root.js" />
<EmbeddedResource Include="obj/javascript/root-only-system/dotvvm-root.js" />
<EmbeddedResource Include="obj/javascript/root-only-system-debug/dotvvm-root.js" />
<EmbeddedResource Include="obj/javascript/root-spa-system/dotvvm-root.js" />
<EmbeddedResource Include="obj/javascript/root-spa-system-debug/dotvvm-root.js" />
<EmbeddedResource Include="obj/javascript/polyfill.bundle.js" />
<EmbeddedResource Include="Resources\Scripts\Globalize\globalize.min.js" />
<EmbeddedResource Include="Resources\Scripts\knockout-latest.js" />
<EmbeddedResource Include="Resources\Scripts\knockout-latest.debug.js" />
<EmbeddedResource Include="Resources\Scripts\Globalize\globalize.js" />
<None Include="Resources\Scripts\DotVVM.Globalize.ts" />
<None Include="Resources\Scripts\typings\globalize\globalize.d.ts" />
<None Include="Resources\Scripts\typings\knockout.mapper\knockout.mapper.d.ts" />
<None Include="Resources\Scripts\typings\knockout\knockout.d.ts" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -127,9 +128,6 @@
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Scripts\knockout-latest.debug.js" />
</ItemGroup>
<ItemGroup>
<None Update="Controls\DelegateTemplate.d.ts">
<DependentUpon>DelegateTemplate.cs</DependentUpon>
Expand Down
18 changes: 15 additions & 3 deletions src/DotVVM.Framework/ResourceManagement/EmbeddedResourceLocation.cs
View file
Open in desktop
Expand Up @@ -16,25 +16,37 @@ public class EmbeddedResourceLocation : LocalResourceLocation, IDebugFileLocalLo
[JsonConverter(typeof(ReflectionAssemblyJsonConverter))]
public Assembly Assembly { get; }
public string Name { get; }
public string DebugName { get; }
/// <summary>
/// File where the resource is located for debug purposes
/// </summary>
public string? DebugFilePath { get; set; }
public EmbeddedResourceLocation(Assembly assembly, string name, string? debugFileName = null)
public EmbeddedResourceLocation(Assembly assembly, string name, string? debugFilePath = null, string? debugName = null)
{
if (assembly.GetManifestResourceInfo(name) == null) throw new ArgumentException($"Could not find resource '{name}' in assembly {assembly.GetName().Name}. Did you mean one of {string.Join(", ", assembly.GetManifestResourceNames())}?", nameof(name));

this.Name = name;
this.Assembly = assembly;
this.DebugFilePath = debugFileName;

if (debugName != null)
{
if (assembly.GetManifestResourceInfo(debugName) == null) throw new ArgumentException($"Could not find resource '{debugName}' in assembly {assembly.GetName().Name}. Did you mean one of {string.Join(", ", assembly.GetManifestResourceNames())}?", nameof(debugName));
this.DebugName = debugName;
}
else
{
this.DebugName = name;
}

this.DebugFilePath = debugFilePath;
}

public override Stream LoadResource(IDotvvmRequestContext context)
{
var debugPath = DebugFilePath == null ? null : Path.Combine(context.Configuration.ApplicationPhysicalPath, DebugFilePath);
return context.Configuration.Debug && debugPath != null && File.Exists(debugPath) ?
File.OpenRead(debugPath) :
Assembly.GetManifestResourceStream(Name).NotNull();
Assembly.GetManifestResourceStream(context.Configuration.Debug ? DebugName : Name).NotNull();
}

public string? GetFilePath(IDotvvmRequestContext context) => DebugFilePath;
Expand Down
14 changes: 12 additions & 2 deletions src/DotVVM.Framework/ResourceManagement/FileResourceLocation.cs
View file
Open in desktop
Expand Up @@ -11,14 +11,24 @@ namespace DotVVM.Framework.ResourceManagement
public class FileResourceLocation: LocalResourceLocation, IDebugFileLocalLocation
{
public string FilePath { get; }
public FileResourceLocation(string filePath)
public string DebugFilePath { get; }
public FileResourceLocation(string filePath, string? debugFilePath = null)
{
if (filePath.StartsWith("~/", StringComparison.Ordinal)) filePath = filePath.Substring(2); // trim ~/ from the path
this.FilePath = filePath;

if (debugFilePath != null)
{
if (debugFilePath.StartsWith("~/", StringComparison.Ordinal)) debugFilePath = debugFilePath.Substring(2); // trim ~/ from the path
this.DebugFilePath = debugFilePath;
} else
{
this.DebugFilePath = filePath;
}
}

public override Stream LoadResource(IDotvvmRequestContext context) =>
File.OpenRead(Path.Combine(context.Configuration.ApplicationPhysicalPath, FilePath));
File.OpenRead(Path.Combine(context.Configuration.ApplicationPhysicalPath, context.Configuration.Debug ? DebugFilePath : FilePath));

public string GetFilePath(IDotvvmRequestContext context) => FilePath;
}
Expand Down
6 changes: 4 additions & 2 deletions src/DotVVM.Framework/ResourceManagement/UrlResourceLocation.cs
View file
Open in desktop
Expand Up @@ -13,14 +13,16 @@ namespace DotVVM.Framework.ResourceManagement
public class UrlResourceLocation: IResourceLocation
{
public string Url { get; }
public UrlResourceLocation(string url)
public string DebugUrl { get; set; }
public UrlResourceLocation(string url, string? debugUrl = null)
{
this.Url = url;
this.DebugUrl = debugUrl ?? url;
}

public string GetUrl(IDotvvmRequestContext context, string name)
{
return context.TranslateVirtualPath(Url);
return context.TranslateVirtualPath(context.Configuration.Debug ? DebugUrl : Url);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/DotVVM.Framework/package.json
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@
},
"scripts": {
"build-development": "rollup -c",
"build": "npm run build-production && npm run build-polyfills",
"build": "npm run build-production && npm run build-development && npm run build-polyfills",
"build-production": "rollup -c --environment BUILD:production",
"tsc-build": "tsc -p .",
"tsc-types": "tsc -d -p . --outFile ./obj/typescript-types/dotvvm.d.ts --emitDeclarationOnly --skipLibCheck",
Expand Down
9 changes: 5 additions & 4 deletions src/DotVVM.Framework/rollup.config.js
View file
Open in desktop
Expand Up @@ -7,6 +7,7 @@ import replace from '@rollup/plugin-replace';

const build = process.env.BUILD || "debug";
const production = build == "production";
const suffix = production ? "" : "-debug";

const config = ({ minify, input, output, spa, legacy }) => ({
input,
Expand Down Expand Up @@ -87,28 +88,28 @@ export default [
config({
minify: production,
input: ['./Resources/Scripts/dotvvm-root.ts'],
output: "root-only",
output: "root-only" + suffix,
spa: false
}),
config({
minify: production,
input: ['./Resources/Scripts/dotvvm-root.ts'],
output: "root-spa",
output: "root-spa" + suffix,
spa: true,
}),
config({
// this configuration is for IE (system.js)
minify: production,
input: ['./Resources/Scripts/dotvvm-root.ts'],
output: "root-only-system",
output: "root-only-system" + suffix,
spa: false,
legacy: true
}),
config({
// this configuration is for IE (system.js)
minify: production,
input: ['./Resources/Scripts/dotvvm-root.ts'],
output: "root-spa-system",
output: "root-spa-system" + suffix,
spa: true,
legacy: true
}),
Expand Down
4 changes: 2 additions & 2 deletions src/DotVVM.Samples.Common/CommonConfiguration.cs
View file
Open in desktop
Expand Up @@ -120,8 +120,8 @@ private static void RegisterResources(DotvvmResourceRepository resources)

// dev files
resources.SetEmbeddedResourceDebugFile("knockout", "../DotVVM.Framework/Resources/Scripts/knockout-latest.debug.js");
resources.SetEmbeddedResourceDebugFile("dotvvm.internal", "../DotVVM.Framework/obj/javascript/root-only/dotvvm-root.js");
resources.SetEmbeddedResourceDebugFile("dotvvm.internal-spa", "../DotVVM.Framework/obj/javascript/root-spa/dotvvm-root.js");
resources.SetEmbeddedResourceDebugFile("dotvvm.internal", "../DotVVM.Framework/obj/javascript/root-only-debug/dotvvm-root.js");
resources.SetEmbeddedResourceDebugFile("dotvvm.internal-spa", "../DotVVM.Framework/obj/javascript/root-spa-debug/dotvvm-root.js");
resources.SetEmbeddedResourceDebugFile("dotvvm.debug", "../DotVVM.Framework/Resources/Scripts/DotVVM.Debug.js");
resources.SetEmbeddedResourceDebugFile("dotvvm.fileupload-css", "../DotVVM.Framework/Resources/Scripts/DotVVM.FileUploads.css");
resources.SetEmbeddedResourceDebugFile("dotvvm.polyfill.bundle", "../DotVVM.Framework/obj/javascript/polyfill.bundle.js");
Expand Down