From a5413a64d3f89c1d7efae0e4fb93c7a1dfc370fb Mon Sep 17 00:00:00 2001
From: Ruben Verborgh <ruben@verborgh.org>
Date: Thu, 14 Jan 2021 23:53:26 +0100
Subject: [PATCH] refactor: Move pod templates to pod subfolder.

---
 package.json                                                | 3 ++-
 src/init/CliRunner.ts                                       | 2 +-
 templates/{ => pod}/.acl                                    | 0
 templates/{ => pod}/.meta                                   | 0
 templates/{ => pod}/profile/card$.ttl                       | 0
 test/integration/WebSocketsProtocol.test.ts                 | 2 +-
 test/unit/init/CliRunner.test.ts                            | 2 +-
 test/unit/pods/generate/TemplatedResourcesGenerator.test.ts | 2 +-
 8 files changed, 6 insertions(+), 5 deletions(-)
 rename templates/{ => pod}/.acl (100%)
 rename templates/{ => pod}/.meta (100%)
 rename templates/{ => pod}/profile/card$.ttl (100%)

diff --git a/package.json b/package.json
index ca00298f1..f040c8904 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,8 @@
   "files": [
     "bin",
     "dist",
-    "config"
+    "config",
+    "templates"
   ],
   "dependencies": {
     "@rdfjs/data-model": "^1.2.0",
diff --git a/src/init/CliRunner.ts b/src/init/CliRunner.ts
index 5a6ef6c1f..4c522027e 100644
--- a/src/init/CliRunner.ts
+++ b/src/init/CliRunner.ts
@@ -88,7 +88,7 @@ export class CliRunner {
         this.resolveFilePath(params.rootFilePath),
       'urn:solid-server:default:variable:sparqlEndpoint': params.sparqlEndpoint,
       'urn:solid-server:default:variable:podTemplateFolder':
-         this.resolveFilePath(params.podTemplateFolder, 'templates'),
+         this.resolveFilePath(params.podTemplateFolder, 'templates/pod'),
     };
   }
 
diff --git a/templates/.acl b/templates/pod/.acl
similarity index 100%
rename from templates/.acl
rename to templates/pod/.acl
diff --git a/templates/.meta b/templates/pod/.meta
similarity index 100%
rename from templates/.meta
rename to templates/pod/.meta
diff --git a/templates/profile/card$.ttl b/templates/pod/profile/card$.ttl
similarity index 100%
rename from templates/profile/card$.ttl
rename to templates/pod/profile/card$.ttl
diff --git a/test/integration/WebSocketsProtocol.test.ts b/test/integration/WebSocketsProtocol.test.ts
index 210af516a..afb97c7fb 100644
--- a/test/integration/WebSocketsProtocol.test.ts
+++ b/test/integration/WebSocketsProtocol.test.ts
@@ -16,7 +16,7 @@ describe('A server with the Solid WebSockets API behind a proxy', (): void => {
       'urn:solid-server:default:ServerFactory', 'server-without-auth.json', {
         'urn:solid-server:default:variable:port': port,
         'urn:solid-server:default:variable:baseUrl': 'https://example.pod/',
-        'urn:solid-server:default:variable:podTemplateFolder': 'templates',
+        'urn:solid-server:default:variable:podTemplateFolder': 'templates/pod',
       },
     ) as HttpServerFactory;
     server = factory.startServer(port);
diff --git a/test/unit/init/CliRunner.test.ts b/test/unit/init/CliRunner.test.ts
index 19cc805e0..ab0afc46e 100644
--- a/test/unit/init/CliRunner.test.ts
+++ b/test/unit/init/CliRunner.test.ts
@@ -59,7 +59,7 @@ describe('CliRunner', (): void => {
           'urn:solid-server:default:variable:rootFilePath': '/var/cwd/',
           'urn:solid-server:default:variable:sparqlEndpoint': undefined,
           'urn:solid-server:default:variable:loggingLevel': 'info',
-          'urn:solid-server:default:variable:podTemplateFolder': joinFilePath(__dirname, '../../../templates'),
+          'urn:solid-server:default:variable:podTemplateFolder': joinFilePath(__dirname, '../../../templates/pod'),
         },
       },
     );
diff --git a/test/unit/pods/generate/TemplatedResourcesGenerator.test.ts b/test/unit/pods/generate/TemplatedResourcesGenerator.test.ts
index 5f387c580..7b4c92bab 100644
--- a/test/unit/pods/generate/TemplatedResourcesGenerator.test.ts
+++ b/test/unit/pods/generate/TemplatedResourcesGenerator.test.ts
@@ -38,7 +38,7 @@ async function genToArray<T>(iterable: AsyncIterable<T>): Promise<T[]> {
 }
 
 describe('A TemplatedResourcesGenerator', (): void => {
-  const rootFilePath = 'templates';
+  const rootFilePath = 'templates/pod';
   // Using handlebars engine since it's smaller than any possible dummy
   const generator = new TemplatedResourcesGenerator(rootFilePath, new DummyFactory(), new HandlebarsTemplateEngine());
   let cache: { data: any };