refactor: Move pod templates to pod subfolder.

This commit is contained in:
Ruben Verborgh 2021-01-14 23:53:26 +01:00 committed by Joachim Van Herwegen
parent 4638ba4bce
commit a5413a64d3
8 changed files with 6 additions and 5 deletions

View File

@ -70,7 +70,8 @@
"files": [ "files": [
"bin", "bin",
"dist", "dist",
"config" "config",
"templates"
], ],
"dependencies": { "dependencies": {
"@rdfjs/data-model": "^1.2.0", "@rdfjs/data-model": "^1.2.0",

View File

@ -88,7 +88,7 @@ export class CliRunner {
this.resolveFilePath(params.rootFilePath), this.resolveFilePath(params.rootFilePath),
'urn:solid-server:default:variable:sparqlEndpoint': params.sparqlEndpoint, 'urn:solid-server:default:variable:sparqlEndpoint': params.sparqlEndpoint,
'urn:solid-server:default:variable:podTemplateFolder': 'urn:solid-server:default:variable:podTemplateFolder':
this.resolveFilePath(params.podTemplateFolder, 'templates'), this.resolveFilePath(params.podTemplateFolder, 'templates/pod'),
}; };
} }

View File

@ -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:ServerFactory', 'server-without-auth.json', {
'urn:solid-server:default:variable:port': port, 'urn:solid-server:default:variable:port': port,
'urn:solid-server:default:variable:baseUrl': 'https://example.pod/', '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; ) as HttpServerFactory;
server = factory.startServer(port); server = factory.startServer(port);

View File

@ -59,7 +59,7 @@ describe('CliRunner', (): void => {
'urn:solid-server:default:variable:rootFilePath': '/var/cwd/', 'urn:solid-server:default:variable:rootFilePath': '/var/cwd/',
'urn:solid-server:default:variable:sparqlEndpoint': undefined, 'urn:solid-server:default:variable:sparqlEndpoint': undefined,
'urn:solid-server:default:variable:loggingLevel': 'info', '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'),
}, },
}, },
); );

View File

@ -38,7 +38,7 @@ async function genToArray<T>(iterable: AsyncIterable<T>): Promise<T[]> {
} }
describe('A TemplatedResourcesGenerator', (): void => { describe('A TemplatedResourcesGenerator', (): void => {
const rootFilePath = 'templates'; const rootFilePath = 'templates/pod';
// Using handlebars engine since it's smaller than any possible dummy // Using handlebars engine since it's smaller than any possible dummy
const generator = new TemplatedResourcesGenerator(rootFilePath, new DummyFactory(), new HandlebarsTemplateEngine()); const generator = new TemplatedResourcesGenerator(rootFilePath, new DummyFactory(), new HandlebarsTemplateEngine());
let cache: { data: any }; let cache: { data: any };