pinstripe 0.14.0 → 0.15.0

package/cli.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node --unhandled-rejections=strict
+#!/usr/bin/env node
 
 import { spawn } from 'child_process';
 

package/lib/command.js

@@ -19,6 +19,18 @@ export const Command = Base.extend().include({
 
             run(name = 'list-commands', ...args){
                 return this.create(name, ...args).run();
+            },
+
+            get schedules(){
+                if(!this.hasOwnProperty('_schedules')){
+                    this._schedules = [];
+                }
+                return this._schedules;
+            },
+
+            schedule(...args){
+                this.schedules.push(args);
+                return this;
             }
         });
     },

package/lib/commands/generate_static_site.js

@@ -8,12 +8,12 @@ export default {
 
     async run(){
         this.pages = {};
-        const paths = Object.keys(View.classes).filter(path => !path.match(/(^|\/)_/)).map(path => {
-            return `/${path.replace(/(^|\/)index$/, '')}`.replace(/^\/+/, '/');
+        const urls = Object.keys(View.classes).filter(path => !path.match(/(^|\/)_/)).map(path => {
+            return Url.fromString(`/${path.replace(/(^|\/)index$/, '')}`.replace(/^\/+/, '/'));
         });
 
-        while(paths.length){
-            await this.crawlPage({ _path: paths.shift() });
+        while(urls.length){
+            await this.crawlPage({ _url: urls.shift() });
         }
 
         const pages = Object.values(this.pages).filter(page => page.status == 200 && Object.keys(page.params).length == 1);
@@ -25,7 +25,7 @@ export default {
                     const { params, headers } = pages.shift();
                     const contentType = headers['content-type'];
 
-                    const path = params._path;
+                    const path = params._url.path;
                     let filePath = path.replace(/^\//, '');
                     if(filePath.match(/(^|\/)$/)){
                         filePath = `${filePath}index`;
@@ -34,7 +34,7 @@ export default {
                         filePath = `${filePath}.${mimeTypes.extension(contentType)}`
                     }
                     
-                    const data = (await this.fetch({ _path: path }))[2];
+                    const data = (await this.fetch({ _url: Url.fromString(path) }))[2];
 
                     await generateFile(filePath, () => {
                         echo(data.join(''));
@@ -58,7 +58,7 @@ export default {
         const urls = this.extractUrls(virtualDom);
         while(urls.length){
             const url = urls.shift();
-            await this.crawlPage({ ...url.params, _path: url.path });
+            await this.crawlPage({ ...url.params, _url: url });
         }
     },
 
@@ -68,7 +68,7 @@ export default {
             ['src', 'href'].forEach(name => {
                 const value = attributes[name];
                 if(!value) return;
-                const url = Url.fromString(value, 'http://localhost/');
+                const url = Url.fromString(value);
                 if(url.host != 'localhost') return;
                 out.push(url);
             });

package/lib/commands/generate_view.js

@@ -1,7 +1,8 @@
 
 export default async ({
     cliUtils: { extractArg },
-    fsBuilder: { inProjectRootDir, generateFile, line, indent }
+    fsBuilder: { inProjectRootDir, generateFile, line, indent },
+    app
 }) => {
     let name = extractArg('').replace(/^\//, '');
     if(name == ''){
@@ -10,7 +11,7 @@ export default async ({
     }
 
     if(!name.match(/\.[^\/]+$/)){
-        name = `${name}.tpl.js`;
+        name = `${name}.js`;
     }
 
     await inProjectRootDir(async () => {
@@ -21,7 +22,7 @@ export default async ({
             line();
         });
 
-        await generateFile(`lib/views/${name}`, () => {
+        await generateFile(`lib/views/${await app}/${name}`, () => {
             line();
             line('export default ({ renderHtml, params }) => renderHtml(`');
             indent(() => {

package/lib/commands/purge_old_sessions.js

@@ -0,0 +1,12 @@
+
+export default {
+    meta(){
+        this.schedule('*/5 * * * *');
+    },
+
+    minutesUntilExpiry: 30,
+
+    async run(){
+        await this.database.withoutMultiTenancy.sessions.lastAccessedAtLt(Date.now() - (1000 * 60 * this.minutesUntilExpiry)).delete();
+    }
+};

package/lib/commands/start_server.js

@@ -1,10 +1,9 @@
 
 import http from 'http';
 import Busboy from 'busboy';
-import { default as qs} from 'qs';
-const { parse: parseQueryString } = qs;
+import { Url } from '../url.js';
 
-export default async ({ fetch }) => {
+export default async ({ fetch, bot }) => {
     const host = process.env.HOST || '127.0.0.1';
     const port = process.env.PORT || 3000;
 
@@ -27,20 +26,23 @@ export default async ({ fetch }) => {
     }).listen(port, host, () => {
         console.log(`Pinstripe running at http://${host}:${port}/`)
     });
+
+    bot.start();
+
+    return new Promise(() => {});
 };
 
 const extractParams = async (request) => {
     const { method, url, headers } = request;
-    const matches = url.match(/^([^\?]+)\?(.*)$/);
-    const path = matches ? matches[1] : url;
-    const queryString = parseQueryString(matches ? matches[2] : "");
+    const _url = Url.fromString(url);
+    if(headers['x-host']) _url.host = headers['x-host'];
     const body = method.match(/^POST|PUT|PATCH$/) ? await parseBody(request) : {};
     
     return {
-        ...queryString,
+        ..._url.params,
         ...body,
         _method: method,
-        _path: path,
+        _url,
         _headers: headers
     };
 };

package/lib/database/adapters/mysql.js

@@ -207,7 +207,7 @@ Adapter.register('mysql').include({
                 const table = this._table;
                 const database = table._database;
         
-                await table.create();
+                if(!await table.exists()) await table.create();
         
                 if(!await this.exists()){
                     await database.run`
@@ -281,9 +281,20 @@ Adapter.register('mysql').include({
                 return this;
             },
 
-            _generateInsertSql(){
+            async _generateInsertSql(){
                 this._fields['id'] = crypto.randomUUID();
                 this._alteredFields['id'] = this._fields['id'];
+
+                const database = await this._database;
+                const { isMultiTenant } = database;
+                const isScopedToTenant = isMultiTenant && !this.constructor.name.match(/^(pinstripe[A-Z]|tenant$)/);
+                const tenant = isScopedToTenant && database._environment ? await database._environment.tenant : undefined;
+                if(tenant){
+                    this._fields['tenantId'] = tenant.id;
+                    this._alteredFields['tenantId'] = tenant.id;
+                } else if(isScopedToTenant) {
+                    return this._database.renderSql`select NULL`;
+                }
         
                 return this._database.renderSql`
                     insert into ${this._adapter.escapeIdentifier(Inflector.pluralize(this.constructor.name))}(
@@ -486,12 +497,32 @@ Adapter.register('mysql').include({
                     out.push(this.renderSql` from ${joinRoot._fromSql}`);
                 }
         
+                const { isMultiTenant } = this._database;
+                const isScopedToTenant = isMultiTenant && !this.constructor.name.match(/^(pinstripe[A-Z]|tenants$)/);
+                const tenant = isScopedToTenant ? await this._database._environment.tenant : undefined;
+        
                 if (options.hasOwnProperty('where')){
                     if(options.where){
                         out.push(this.renderSql` where ${options.where}`);
+                        if(tenant){
+                            out.push(this.renderSql` and ${this.tenantId} = uuid_to_bin(${tenant.id})`);
+                        } else if(isScopedToTenant){
+                            out.push(this.renderSql` and 1 = 2`);
+                        }
+                    } else if(isScopedToTenant){
+                        out.push(this.renderSql` where 1 = 2`);
                     }
                 } else if(joinRoot._whereSql.length) {
                     out.push(this.renderSql` where ${joinRoot._whereSql}`);
+                    if(tenant){
+                        out.push(this.renderSql` and ${this.tenantId} = uuid_to_bin(${tenant.id})`);
+                    } else if(isScopedToTenant){
+                        out.push(this.renderSql` and 1 = 2`);
+                    }
+                } else if(tenant){
+                    out.push(this.renderSql` where ${this.tenantId} = uuid_to_bin(${tenant.id})`);
+                } else if(isScopedToTenant){
+                    out.push(this.renderSql` where 1 = 2`);
                 }
         
                 if(options.hasOwnProperty('orderBy')){

package/lib/database/adapters/sqlite.js

@@ -182,7 +182,7 @@ Adapter.register('sqlite').include({
                 const table = this._table;
                 const database = table._database;
         
-                await table.create();
+                if(!await table.exists()) await table.create();
         
                 if(!await this.exists()){
                     let defaultSql = options.default;
@@ -265,10 +265,21 @@ Adapter.register('sqlite').include({
                 return this;
             },
 
-            _generateInsertSql(){
+            async _generateInsertSql(){
                 this._fields['id'] = crypto.randomUUID();
                 this._alteredFields['id'] = this._fields['id'];
-        
+
+                const database = await this._database;
+                const { isMultiTenant } = database;
+                const isScopedToTenant = isMultiTenant && !this.constructor.name.match(/^(pinstripe[A-Z]|tenant$)/);
+                const tenant = isScopedToTenant && database._environment ? await database._environment.tenant : undefined;
+                if(tenant){
+                    this._fields['tenantId'] = tenant.id;
+                    this._alteredFields['tenantId'] = tenant.id;
+                } else if(isScopedToTenant) {
+                    return this._database.renderSql`select NULL`;
+                }
+
                 return this._database.renderSql`
                     insert into ${this._adapter.escapeIdentifier(Inflector.pluralize(this.constructor.name))}(
                         ${Object.keys(this._alteredFields).map((key, i) =>
@@ -459,23 +470,43 @@ Adapter.register('sqlite').include({
                     }
                     out.push(this.renderSql`${Inflector.singularize(this.constructor.name)} as \`_type\``);
                 }
-        
-                const joinRoot = this._joinRoot;
                 
+                const joinRoot = this._joinRoot;
                 if(options.hasOwnProperty('from')){
                     if(options.from){
                         out.push(this.renderSql` from ${options.from}`);
                     }
                 } else {
                     out.push(this.renderSql` from ${joinRoot._fromSql}`);
+                    
                 }
+
+                const { isMultiTenant } = this._database;
+                const isScopedToTenant = isMultiTenant && !this.constructor.name.match(/^(pinstripe[A-Z]|tenants$)/);
+                const tenant = isScopedToTenant ? await this._database._environment.tenant : undefined;
         
                 if (options.hasOwnProperty('where')){
                     if(options.where){
                         out.push(this.renderSql` where ${options.where}`);
+                        if(tenant){
+                            out.push(this.renderSql` and ${this.tenantId} = ${tenant.id}`);
+                        } else if(isScopedToTenant){
+                            out.push(this.renderSql` where 1 = 2`);
+                        }
+                    } else if(isScopedToTenant){
+                        out.push(this.renderSql` where 1 = 2`);
                     }
                 } else if(joinRoot._whereSql.length) {
                     out.push(this.renderSql` where ${joinRoot._whereSql}`);
+                    if(tenant){
+                        out.push(this.renderSql` and ${this.tenantId} = ${tenant.id}`);
+                    } else if(isScopedToTenant){
+                        out.push(this.renderSql` and 1 = 2`);
+                    }
+                } else if(tenant){
+                    out.push(this.renderSql` where ${this.tenantId} = ${tenant.id}`);
+                } else if(isScopedToTenant){
+                    out.push(this.renderSql` where 1 = 2`);
                 }
         
                 if(options.hasOwnProperty('orderBy')){

package/lib/database/row.js

@@ -187,9 +187,10 @@ export const Row = Base.extend().include({
     },
 
     __setMissing(name, value){
-        if(name == 'id'){
-            throw "Id fields can't be set directly on a row";
+        if(name == 'id' || name == 'tenantId'){
+            throw `'${name}' fields can't be set directly on a row`;
         }
+        
         const normalizedValue = this._normalizeField(name, value)
         if(this._fields[name] != normalizedValue){
             this._alteredFields[name] = normalizedValue;

package/lib/database.js

@@ -9,7 +9,8 @@ import { Adapter, createAdapterDeligator } from './database/adapter.js';
 const deligateToAdapter = createAdapterDeligator('database');
 
 export const Database = Base.extend().include({
-    async initialize({ environment, config }){
+    async initialize({ environment, config }, skipInit = false){
+        if(skipInit) return
         this._environment = environment;
         const { adapter = 'mysql', ...adapterConfig } = await config.database;
         this._adapter = Adapter.create(adapter, adapterConfig);
@@ -21,6 +22,16 @@ export const Database = Base.extend().include({
         this._isInitialized = true;
     },
 
+    isMultiTenant: false,
+
+    get withoutMultiTenancy(){
+        return (async () => {
+            const out = await Database.new({}, true);
+            out.assignProps(this, { isMultiTenant: false });
+            return out;
+        })();
+    },
+
     renderSql: deligateToAdapter('renderSql'),
 
     toSql: deligateToAdapter('toSql'),

package/lib/extensions/_importer.js

@@ -0,0 +1,2 @@
+
+export default undefined;

package/lib/extensions/multi-tenant/database/table.js

@@ -0,0 +1,18 @@
+
+import { Table } from '../../../database/table.js';
+
+Table.include({
+    meta(){
+        const { create } = this.prototype;
+
+        this.include({
+            async create(...args){
+                const out = await create.call(this, ...args);
+                if(this.constructor.name.match(/^pinstripe[A-Z]/)) return out;
+                if(this.constructor.name == 'tenants') return out;
+                await this.addColumn('tenantId', 'foreign_key');
+                return out;
+            }
+        });
+    }
+});

package/lib/extensions/multi-tenant/database.js

@@ -0,0 +1,6 @@
+
+import { Database } from '../../database.js';
+
+Database.include({
+    isMultiTenant: true
+});

package/lib/extensions/multi-tenant/index.js

@@ -0,0 +1,4 @@
+
+import { importAll } from 'pinstripe';
+
+importAll(import.meta.url);

package/lib/extensions/multi-tenant/migrations/1627976174_create_tenant_table_and_add_tenant_id_to_existing_tables.js

@@ -0,0 +1,16 @@
+
+export default async ({ tenants, database }) => {
+
+    await tenants.addColumn('name', 'string', { index: true });
+    await tenants.addColumn('host', 'string', { index: true });
+
+    const tableNames = Object.keys(await database.tables());
+
+    while(tableNames.length){
+        const tableName = tableNames.shift();
+        if(tableName.match(/^pinstripe[A-Z]/)) continue;
+        if(tableName == 'tenants') continue;
+        if(await database[tableName].tenantId.exists()) continue;
+        await database[tableName].addColumn('tenantId', 'foreign_key');
+    }
+};

package/lib/extensions/multi-tenant/migrations/_importer.js

@@ -0,0 +1,2 @@
+
+export { migrationImporter as default } from 'pinstripe';

package/lib/extensions/multi-tenant/models/_importer.js

@@ -0,0 +1,2 @@
+
+export { modelImporter as default } from 'pinstripe';

package/lib/extensions/multi-tenant/models/tenant.js

@@ -0,0 +1,7 @@
+
+export default {
+    meta(){
+        this.mustNotBeBlank('name');
+        this.mustNotBeBlank('host');
+    }
+};

package/lib/extensions/multi-tenant/services/_importer.js

@@ -0,0 +1,2 @@
+
+export { serviceImporter as default } from 'pinstripe';

package/lib/extensions/multi-tenant/services/tenant.js

@@ -0,0 +1,7 @@
+
+export default ({ params, tenants }) => {
+    if(params._headers?.['x-tenant']){
+        return tenants.nameEq(params._headers['x-tenant']).first();
+    }
+    return tenants.hostEq(params._url.host).first();
+};

package/lib/import_all.js

@@ -62,6 +62,7 @@ const importAllRecursive = async (dirPath, importer = defaultImporter) => {
             const importerFilePath = `${current}/_importer.js`;
             if(existsSync(importerFilePath)){
                 const importerFactory = await ( await import(importerFilePath) ).default;
+                if(!importerFactory) continue;
                 const importer = await importerFactory(current);
                 await importAllRecursive(current, importer);
             } else {

package/lib/migrations/1628057822_create_session.js

@@ -3,5 +3,6 @@ export default async ({ sessions }) => {
     
     await sessions.addColumn('passString', 'string');
     await sessions.addColumn('userId', 'foreign_key');
+    await sessions.addColumn('lastAccessedAt', 'datetime', { index: true });
     
 };

package/lib/services/app.js

@@ -0,0 +1,2 @@
+
+export default async ({ params: { _headers = {} } }) => _headers['x-app'] || 'main';

package/lib/services/bot.js

@@ -0,0 +1,69 @@
+
+import cronParser from 'cron-parser';
+
+import { Command } from '../command.js';
+
+export default {
+
+    meta(){
+        this.scope = 'root';
+    },
+
+    start(){
+        if(this._loop) this._loop;
+
+        this._loop = new Promise(async resolve => {
+            let current = getUnixTime();
+            while(true){
+                const target = getUnixTime();
+                while(current < target){
+                    current++;
+                    await this.runCommands(current);
+                }
+                await new Promise(resolve => setTimeout(resolve, 1000));
+
+                if(!this._loop) break;
+            }
+
+            resolve();
+        });
+        
+        return this._loop;
+    },
+
+    async stop(){
+        const loop = this._loop;
+        delete this._loop;
+        await loop;
+    },
+
+    async runCommands(unixTime){
+        const currentDate = new Date(unixTime * 1000);
+        const endDate = new Date((unixTime + 1) * 1000);
+        const commands = Object.values(Command.classes);
+        while(commands.length){
+            const command = commands.shift();
+            const schedules = [ ...command.schedules ];
+            while(schedules.length){
+                const [ crontab, ...args ] = schedules.shift();
+                const interval = cronParser.parseExpression(crontab, {
+                    currentDate,
+                    endDate
+                }); 
+                
+                if(interval.hasNext()){
+                    await this.runCommand(command.name, ...args);
+                }
+            }
+        }
+    },
+
+    
+
+    destroy(){
+        return this.stop();
+    }
+
+};
+
+const getUnixTime = () => Math.floor(Date.now() / 1000);

package/lib/services/fetch.js

@@ -3,9 +3,8 @@ import { View } from '../view.js';
 export default ({ createEnvironment }) => {
     return (_params = {}) => createEnvironment(async ({ environment, renderView }) => {
         const params = normalizeParams(_params);
-        const viewName = params._path.replace(/^\/|\/$/g, '');
-
         environment.params = params;
+        const viewName = `${await environment.app}${params._url.path}`.replace(/^\/|\/$/g, '');
         
         let out = await renderGuardViews(renderView, viewName, params);
         if(out){
@@ -62,7 +61,7 @@ const renderDefaultViews = async (renderView, viewName,  params) => {
     while(true){
         const out = normalizeResponse(await renderView(prefixSegments.length ? [...prefixSegments, 'default'].join('/') : 'default', {
             ...params,
-            _pathOffset: params._path.substr(`/${prefixSegments.join('/')}`.length).replace(/^\//, '')
+            _pathOffset: params._url.path.substr(`/${prefixSegments.join('/')}`.length).replace(/^\//, '')
         }));
         if(out){
             return out;
@@ -79,8 +78,8 @@ const normalizeParams = (params) => {
     if(!out._method){
         out._method = 'get';
     }
-    if(!params._path){
-        out._path = '/';
+    if(!params._url){
+        out._url = Url.new();
     }
     if(!params._headers){
         out._headers = {};

package/lib/services/params.js

@@ -1,2 +1,7 @@
 
-export default () => ({});
+import { Url } from '../url.js';
+
+export default () => ({
+    _url: Url.new(),
+    _headers: {}
+});

package/lib/services/session.js

@@ -1,9 +1,15 @@
 
-export default ({ cookies, database }) => {
+export default async ({ cookies, database }) => {
     const { pinstripeSession } = cookies;
     if(!pinstripeSession){
         return;
     }
     const [ sessionId, passString ] = pinstripeSession.split(/:/);
-    return database.sessions.idEq(sessionId).passStringEq(passString).first();
+    const session = await database.sessions.idEq(sessionId).passStringEq(passString).first();
+    if(session && session.lastAccessedAt < (Date.now() - 1000 * 60 * 5)){
+        await session.update({
+            lastAccessedAt: Date.now()
+        });
+    }
+    return session;
 };

package/lib/services/stylesheets.js

@@ -0,0 +1,16 @@
+
+export default async ({ viewNames, environment }) => {
+    const app = await environment.app;
+    const prefixStylesheets = [
+        'stylesheets/vars.css',
+        'stylesheets/reset.css',
+        'stylesheets/global.css',
+    ];
+    const componentStylesheetViewNames = viewNames.filter(viewName => {
+        const isCss = viewName.match(/\.css$/);
+        const isNotPrefixStylesheet = !prefixStylesheets.includes(viewName.replace(/^[^\/]*\//, ''))
+        const isAppView = viewName.startsWith(`${app}/`);
+        return isCss && isNotPrefixStylesheet && isAppView;
+    }).map(viewName => viewName.replace(/^[^\/]*\//, ''))
+    return [ ...prefixStylesheets, ...componentStylesheetViewNames ];
+};

package/lib/url.js

@@ -5,11 +5,11 @@ import { StringReader } from './string_reader.js';
 export const Url = Base.extend().include({
     meta(){
         this.assignProps({
-            fromString(url, referenceUrl){
+            fromString(url, referenceUrl = 'http://localhost'){
                 const out = new Url()
                 url = new StringReader(url)
                 if(!(referenceUrl instanceof Url)){
-                    referenceUrl = Url.fromString(referenceUrl || window.location, new Url())
+                    referenceUrl = Url.fromString(referenceUrl, new Url())
                 }
                 
                 let matches;

package/lib/views/{_layout.js → main/_layout.js}

@@ -1,10 +1,10 @@
 
-export default async ({ params: { title, body, isSignedIn, user }, renderHtml, stylesheetViewNames }) => renderHtml`
+export default async ({ params: { title, body, isSignedIn, user }, renderHtml, stylesheets }) => renderHtml`
     <!DOCTYPE html>
     <html>
         <head>
             <title>${title}</title>
-            ${stylesheetViewNames.map(viewName => renderHtml`
+            ${stylesheets.map(viewName => renderHtml`
                 <link rel="stylesheet" href="/${viewName}">
             `)}
             <script src="/bundle.js"></script>

package/lib/views/{blocks → main/blocks}/default.js

@@ -1,12 +1,10 @@
 
-import { View } from '../../view.js';
+export default ({ renderHtml, viewNames, params }) => {
+    const path = params._url.path
+    const name = path.replace(/\/blocks\//, '');
+    const prefix = path.replace(/^\/blocks\//, '');
 
-export default ({ renderHtml, params: { _path } }) => {
-    const name = _path.replace(/\/blocks\//, '');
-    const prefix = _path.replace(/^\/blocks\//, '');
-
-    const names = Object
-        .keys(View.classes)
+    const names = viewNames
         .filter(name => name.match(/^blocks\/.+/) && name != 'blocks/default')
         .map(name => name.replace(/^blocks\//, ''))
         .filter(name => name.startsWith(prefix))

package/lib/views/{bundle.js.js → main/bundle.js.js}

@@ -2,7 +2,7 @@
 import { Volume as MemFs } from 'memfs';
 import webpack from 'webpack';
 
-import { client } from '../client.js';
+import { client } from '../../client.js';
 
 let cache;
 

package/lib/views/{sign_in.js → main/sign_in.js}

@@ -25,7 +25,8 @@ export default async ({ renderForm, database, renderHtml }) => renderForm({
         const passString = crypto.randomUUID();
         const session = await database.sessions.insert({
             userId: id,
-            passString
+            passString,
+            lastAccessedAt: Date.now()
         });
         
         const [ status, headers, body ] = await renderHtml`

package/package.json

@@ -2,11 +2,12 @@
   "type": "module",
   "name": "pinstripe",
   "description": "Pinstripe is a fullstack JavaScript web framework for Node.js.",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "author": "Jody Salt",
   "license": "MIT",
   "exports": {
-    ".": "./lib/index.js"
+    ".": "./lib/index.js",
+    "./multi-tenant": "./lib/extensions/multi-tenant/index.js"
   },
   "bin": {
     "pinstripe": "./cli.js"
@@ -18,13 +19,14 @@
     "test:unit": "NODE_OPTIONS=--experimental-vm-modules jest lib"
   },
   "devDependencies": {
-    "jest": "^27.5.1",
+    "jest": "^28.0.1",
     "ramda": "^0.27.0"
   },
   "dependencies": {
     "bcrypt": "^5.0.1",
     "busboy": "^0.3.1",
     "chalk": "^4.1.0",
+    "cron-parser": "^4.3.0",
     "html-entities": "^2.3.2",
     "js-yaml": "^4.1.0",
     "luxon": "^2.3.1",
@@ -33,10 +35,9 @@
     "mime-types": "^2.1.28",
     "mysql2": "^2.3.3",
     "nodemailer": "^6.7.2",
-    "qs": "^6.9.4",
     "sqlite3": "^5.0.2",
     "unionfs": "^4.4.0",
     "webpack": "^5.39.1"
   },
-  "gitHead": "9ccfe82e9630b92f21add4ad72963faf8c8135c3"
+  "gitHead": "f68a5a5143098d3d42d60c5ba64e89fbf2db7ebe"
 }

package/lib/services/stylesheet_view_names.js

@@ -1,10 +0,0 @@
-
-export default ({ viewNames }) => {
-    const nonComponentStylesheetViewNames = [
-        'stylesheets/vars.css',
-        'stylesheets/reset.css',
-        'stylesheets/global.css',
-    ];
-    const componentStylesheetViewNames = viewNames.filter(viewName => viewName.match(/\.css$/) && !nonComponentStylesheetViewNames.includes(viewName))
-    return [ ...nonComponentStylesheetViewNames, ...componentStylesheetViewNames ];
-};