Upgrade to v33

.dockerignore

@@ -0,0 +1,2 @@
+*/node_modules
+*/npm-debug.log

.github/workflows/build.yml

@@ -31,5 +31,5 @@ jobs:
             echo TESTS FAILED
             exit 1
           fi
-        working-directory: ./VuetifyNuxtTemplate.Tests
+        working-directory: ./VuetifyNuxt.Tests
 

.github/workflows/release.yml

@@ -49,7 +49,7 @@ jobs:
           LETSENCRYPT_EMAIL: ${{ env.letsencrypt_email }}
         with:
           input: deploy/docker-compose-template.yml
-          output: deploy/VuetifyNuxtTemplate-docker-compose.yml
+          output: deploy/VuetifyNuxt-docker-compose.yml
 
       - name: copy compose file via scp
         uses: appleboy/[email protected]
@@ -58,7 +58,7 @@ jobs:
           username: ${{ secrets.DEPLOY_USERNAME }}
           port: ${{ secrets.DEPLOY_PORT }}
           key: ${{ secrets.DEPLOY_KEY }}
-          source: "deploy/VuetifyNuxtTemplate-docker-compose.yml"
+          source: "deploy/VuetifyNuxt-docker-compose.yml"
           target: "~/"
 
       - name: Set the value
@@ -79,4 +79,4 @@ jobs:
           envs: APPTOKEN,USERNAME
           script: |
             echo $APPTOKEN | docker login ghcr.io -u $USERNAME --password-stdin
-            docker-compose -f ~/deploy/VuetifyNuxtTemplate-docker-compose.yml up -d
+            docker-compose -f ~/deploy/VuetifyNuxt-docker-compose.yml up -d

.vscode/launch.json

@@ -10,9 +10,9 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/VuetifyNuxtTemplate/bin/Debug/net5/VuetifyNuxtTemplate.dll",
+            "program": "${workspaceFolder}/VuetifyNuxt/bin/Debug/net5/VuetifyNuxt.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/VuetifyNuxtTemplate",
+            "cwd": "${workspaceFolder}/VuetifyNuxt",
             "console": "internalConsole",
             "stopAtEntry": false,
             "internalConsoleOptions": "openOnSessionStart",
@@ -25,9 +25,9 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/VuetifyNuxtTemplate/bin/Debug/net5/VuetifyNuxtTemplate.dll",
+            "program": "${workspaceFolder}/VuetifyNuxt/bin/Debug/net5/VuetifyNuxt.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/VuetifyNuxtTemplate",
+            "cwd": "${workspaceFolder}/VuetifyNuxt",
             "stopAtEntry": false,
             "internalConsoleOptions": "openOnSessionStart",
             "launchBrowser": {

Dockerfile

@@ -1,24 +1,19 @@
 FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
-WORKDIR /source
+WORKDIR /app
 
 RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
  && apt-get install -y --no-install-recommends nodejs \
  && echo "node version: $(node --version)" \
  && echo "npm version: $(npm --version)" \
  && rm -rf /var/lib/apt/lists/*
 
-COPY VuetifyNuxtTemplate/package.json .
-COPY VuetifyNuxtTemplate/npm-shrinkwrap.json .
-
-RUN npm --prefix VuetifyNuxtTemplate install
-
 COPY . .
 RUN dotnet restore
 
-WORKDIR /source/VuetifyNuxtTemplate
-RUN dotnet publish -c release -o /app --no-restore
+WORKDIR /app/VuetifyNuxt
+RUN dotnet publish -c release -o /out --no-restore
 
 FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS runtime
 WORKDIR /app
-COPY --from=build /app ./
-ENTRYPOINT ["dotnet", "VuetifyNuxtTemplate.dll"]
+COPY --from=build /out ./
+ENTRYPOINT ["dotnet", "VuetifyNuxt.dll"]

README.md

@@ -10,6 +10,12 @@
 
     $ x new vuetify-nuxt ProjectName
 
+Alternatively write new project files directly into an empty repository, using the Directory Name as the ProjectName:
+
+    $ git clone https://github.com/<User>/<ProjectName>.git
+    $ cd <ProjectName>
+    $ x new vuetify-nuxt
+
 ## Description
 
 Nuxt is an opinionated structured framework for rapidly developing Web Applications utilizing developer-friendly [Vue Single Page Components](https://vuejs.org/v2/guide/single-file-components.html) and featuring Hot module replacement that together with [.NET Core's watched builds](https://docs.servicestack.net/templates-websites#watched-net-core-builds) provides an highly productive development experience.
@@ -45,7 +51,7 @@ Whilst Nuxt.js is a JavaScript (ES 6/7) App it still benefits from [ServiceStack
     $ npm run dtos
 
 This will update the Servers `dtos.ts` and generate its corresponding `dtos.js` which can be imported as normal classes as seen in 
-[gateway.js](https://github.com/NetCoreTemplates/vuetify-nuxt/blob/master/VuetifyNuxtTemplate/src/shared/gateway.js#L3). Despite the App not being built with TypeScript, developing using a "TypeScript-aware" IDE like VS Code will still be able to utilize the TypeScript classes in [@servicestack/client](https://github.com/ServiceStack/servicestack-client) and the generated `dtos.ts` to provide a rich, typed intelli-sense experience.
+[gateway.js](https://github.com/NetCoreTemplates/vuetify-nuxt/blob/master/VuetifyNuxt/src/shared/gateway.js#L3). Despite the App not being built with TypeScript, developing using a "TypeScript-aware" IDE like VS Code will still be able to utilize the TypeScript classes in [@servicestack/client](https://github.com/ServiceStack/servicestack-client) and the generated `dtos.ts` to provide a rich, typed intelli-sense experience.
 
 ## Generate Static Production Build
 

VuetifyNuxtTemplate.ServiceInterface/MyServices.cs → VuetifyNuxt.ServiceInterface/MyServices.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using ServiceStack;
-using VuetifyNuxtTemplate.ServiceModel;
+using VuetifyNuxt.ServiceModel;
 
-namespace VuetifyNuxtTemplate.ServiceInterface
+namespace VuetifyNuxt.ServiceInterface
 {
     public class MyServices : Service
     {
@@ -17,14 +17,15 @@ public object Any(Hello request)
             Results = new Dictionary<string, string> 
             {
                 {"servicestack.net", "https://servicestack.net"},
-                {"StackOverflow", "http://stackoverflow.com/search?q=servicestack"},
+                {"Documentation", "https://docs.servicestack.net"},
                 {"Customer Forums", "https://forums.servicestack.net"},
                 {"Issue Tracker", "https://github.com/ServiceStack/Issues"},
+                {"StackOverflow", "http://stackoverflow.com/search?q=servicestack"},
                 {"Feature Requests", "http://servicestack.uservoice.com/forums/176786-feature-requests"},
-                {"Release Notes", "https://servicestack.net/release-notes"},
-                {"Live Demos", "https://github.com/ServiceStackApps/LiveDemos"},
-                {".NET Core Live Demos", "https://github.com/NetCoreApps/LiveDemos"},
-                {"Gistlyn", "http://gistlyn.com"},
+                {".NET 5 Live Demos", "https://github.com/NetCoreApps/LiveDemos"},
+                {".NET Framework Demos", "https://github.com/ServiceStackApps/LiveDemos"},
+                {"Instant Client Apps", "https://apps.servicestack.net"},
+                {"What's New", "https://servicestack.net/whatsnew"},
             }
         };
 

VuetifyNuxtTemplate.ServiceInterface/VuetifyNuxtTemplate.ServiceInterface.csproj → VuetifyNuxt.ServiceInterface/VuetifyNuxt.ServiceInterface.csproj

@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\VuetifyNuxtTemplate.ServiceModel\VuetifyNuxtTemplate.ServiceModel.csproj" />
+    <ProjectReference Include="..\VuetifyNuxt.ServiceModel\VuetifyNuxt.ServiceModel.csproj" />
   </ItemGroup>
 
 </Project>

VuetifyNuxtTemplate.ServiceModel/GetLinks.cs → VuetifyNuxt.ServiceModel/GetLinks.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using ServiceStack;
 
-namespace VuetifyNuxtTemplate.ServiceModel
+namespace VuetifyNuxt.ServiceModel
 {
     [Route("/links")]
     public class GetLinks : IReturn<GetLinksResponse> {}

VuetifyNuxtTemplate.ServiceModel/GetPost.cs → VuetifyNuxt.ServiceModel/GetPost.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using ServiceStack;
 
-namespace VuetifyNuxtTemplate.ServiceModel
+namespace VuetifyNuxt.ServiceModel
 {
     [Route("/posts")]
     public class GetPost : IReturn<GetPostResponse> 

VuetifyNuxtTemplate.ServiceModel/Hello.cs → VuetifyNuxt.ServiceModel/Hello.cs

@@ -1,6 +1,6 @@
 using ServiceStack;
 
-namespace VuetifyNuxtTemplate.ServiceModel
+namespace VuetifyNuxt.ServiceModel
 {
     [Route("/hello")]
     [Route("/hello/{Name}")]

VuetifyNuxtTemplate.Tests/IntegrationTest.cs → VuetifyNuxt.Tests/IntegrationTest.cs

@@ -1,10 +1,10 @@
 using Funq;
 using ServiceStack;
 using NUnit.Framework;
-using VuetifyNuxtTemplate.ServiceInterface;
-using VuetifyNuxtTemplate.ServiceModel;
+using VuetifyNuxt.ServiceInterface;
+using VuetifyNuxt.ServiceModel;
 
-namespace VuetifyNuxtTemplate.Tests
+namespace VuetifyNuxt.Tests
 {
     public class IntegrationTest
     {

VuetifyNuxtTemplate.Tests/UnitTest.cs → VuetifyNuxt.Tests/UnitTest.cs

@@ -1,10 +1,10 @@
 using NUnit.Framework;
 using ServiceStack;
 using ServiceStack.Testing;
-using VuetifyNuxtTemplate.ServiceInterface;
-using VuetifyNuxtTemplate.ServiceModel;
+using VuetifyNuxt.ServiceInterface;
+using VuetifyNuxt.ServiceModel;
 
-namespace VuetifyNuxtTemplate.Tests
+namespace VuetifyNuxt.Tests
 {
     public class UnitTest
     {

VuetifyNuxtTemplate.Tests/VuetifyNuxtTemplate.Tests.csproj → VuetifyNuxt.Tests/VuetifyNuxt.Tests.csproj

@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\VuetifyNuxtTemplate.ServiceInterface\VuetifyNuxtTemplate.ServiceInterface.csproj" />
-    <ProjectReference Include="..\VuetifyNuxtTemplate.ServiceModel\VuetifyNuxtTemplate.ServiceModel.csproj" />
+    <ProjectReference Include="..\VuetifyNuxt.ServiceInterface\VuetifyNuxt.ServiceInterface.csproj" />
+    <ProjectReference Include="..\VuetifyNuxt.ServiceModel\VuetifyNuxt.ServiceModel.csproj" />
 
     <PackageReference Include="NUnit" Version="3.12.*" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.*" />

VuetifyNuxtTemplate.sln → VuetifyNuxt.sln

@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26730.3
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VuetifyNuxtTemplate", "VuetifyNuxtTemplate\VuetifyNuxtTemplate.csproj", "{5F817400-1A3A-48DF-98A6-E7E5A3DC762F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VuetifyNuxt", "VuetifyNuxt\VuetifyNuxt.csproj", "{5F817400-1A3A-48DF-98A6-E7E5A3DC762F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VuetifyNuxtTemplate.ServiceInterface", "VuetifyNuxtTemplate.ServiceInterface\VuetifyNuxtTemplate.ServiceInterface.csproj", "{5B8FFF01-1E0B-477D-9D7F-93016C128B23}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VuetifyNuxt.ServiceInterface", "VuetifyNuxt.ServiceInterface\VuetifyNuxt.ServiceInterface.csproj", "{5B8FFF01-1E0B-477D-9D7F-93016C128B23}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VuetifyNuxtTemplate.ServiceModel", "VuetifyNuxtTemplate.ServiceModel\VuetifyNuxtTemplate.ServiceModel.csproj", "{0127B6CA-1B79-46A6-8307-B36836D107F0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VuetifyNuxt.ServiceModel", "VuetifyNuxt.ServiceModel\VuetifyNuxt.ServiceModel.csproj", "{0127B6CA-1B79-46A6-8307-B36836D107F0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VuetifyNuxtTemplate.Tests", "VuetifyNuxtTemplate.Tests\VuetifyNuxtTemplate.Tests.csproj", "{455EC1EF-134F-4CD4-9C78-E813E4E6D8F6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VuetifyNuxt.Tests", "VuetifyNuxt.Tests\VuetifyNuxt.Tests.csproj", "{455EC1EF-134F-4CD4-9C78-E813E4E6D8F6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

VuetifyNuxtTemplate/.editorconfig → VuetifyNuxt/.editorconfig

@@ -2,15 +2,12 @@
 root = true
 
 [*]
-indent_size = 2
 indent_style = space
+indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.cs]
-indent_size = 4
-
 [*.md]
 trim_trailing_whitespace = false

VuetifyNuxt/.eslintrc.js

@@ -0,0 +1,15 @@
+module.exports = {
+  root: true,
+  env: {
+    browser: true,
+    node: true
+  },
+  extends: [
+    '@nuxtjs/eslint-config-typescript',
+    'plugin:nuxt/recommended'
+  ],
+  plugins: [
+  ],
+  // add your custom rules here
+  rules: {}
+}

VuetifyNuxtTemplate/Configure.Ui.cs → VuetifyNuxt/Configure.Ui.cs

@@ -4,7 +4,7 @@
 using System.Web;
 using ServiceStack;
 
-namespace VuetifyNuxtTemplate
+namespace VuetifyNuxt
 {
     public class ConfigureUi : IConfigureAppHost
     {

VuetifyNuxtTemplate/Program.cs → VuetifyNuxt/Program.cs

@@ -6,7 +6,7 @@
 using Microsoft.Extensions.Logging;
 using ServiceStack;
 
-namespace VuetifyNuxtTemplate
+namespace VuetifyNuxt
 {
     public class Program
     {

VuetifyNuxtTemplate/Properties/launchSettings.json → VuetifyNuxt/Properties/launchSettings.json

@@ -15,7 +15,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "VuetifyNuxtTemplate": {
+    "VuetifyNuxt": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {

VuetifyNuxtTemplate/README.md → VuetifyNuxt/README.md

@@ -1,4 +1,4 @@
-# vuetify-nuxt-template
+# vuetify-nuxt
 
 > Nuxt.js project
 

VuetifyNuxtTemplate/Startup.cs → VuetifyNuxt/Startup.cs

@@ -1,5 +1,6 @@
-using System.Collections.Generic;
+using System;
 using System.Linq;
+using System.Collections.Generic;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
@@ -8,14 +9,14 @@
 using Funq;
 using ServiceStack;
 using ServiceStack.Configuration;
-using VuetifyNuxtTemplate.ServiceInterface;
 using ServiceStack.Script;
 using ServiceStack.Web;
-using System;
 using ServiceStack.Text;
 using ServiceStack.Logging;
+using ServiceStack.NativeTypes.TypeScript;
+using VuetifyNuxt.ServiceInterface;
 
-namespace VuetifyNuxtTemplate
+namespace VuetifyNuxt
 {
     public class Startup : ModularStartup
     {
@@ -42,7 +43,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 
     public class AppHost : AppHostBase
     {
-        public AppHost() : base("VuetifyNuxtTemplate", typeof(MyServices).Assembly) { }
+        public AppHost() : base("VuetifyNuxt", typeof(MyServices).Assembly) { }
 
         // Configure your AppHost with the necessary configuration and dependencies your App needs
         public override void Configure(Container container)
@@ -57,6 +58,9 @@ public override void Configure(Container container)
                 AddRedirectParamsToQueryString = true,
                 DebugMode = AppSettings.Get(nameof(HostConfig.DebugMode), HostingEnvironment.IsDevelopment()),
             });
+
+            TypeScriptGenerator.InsertTsNoCheck = true;
+            TypeScriptGenerator.UseNullableProperties = true;
         }
     }
 }

VuetifyNuxtTemplate/VuetifyNuxtTemplate.csproj → VuetifyNuxt/VuetifyNuxt.csproj

@@ -20,8 +20,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\VuetifyNuxtTemplate.ServiceInterface\VuetifyNuxtTemplate.ServiceInterface.csproj" />
-    <ProjectReference Include="..\VuetifyNuxtTemplate.ServiceModel\VuetifyNuxtTemplate.ServiceModel.csproj" />
+    <ProjectReference Include="..\VuetifyNuxt.ServiceInterface\VuetifyNuxt.ServiceInterface.csproj" />
+    <ProjectReference Include="..\VuetifyNuxt.ServiceModel\VuetifyNuxt.ServiceModel.csproj" />
   </ItemGroup>
 
   <Target Name="OnFirstUse" BeforeTargets="Build" Condition=" !Exists('wwwroot\dist') ">