From 687a42ba37439cf598721dde6f0e124936d21c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20M=C3=BCller?= Date: Wed, 23 Sep 2015 20:05:48 +0200 Subject: [PATCH] removed build task --- .gitignore | 1 + .vscode/tasks.json | 247 --------------------------------- server.js | 2 +- src/{storage.js => migrate.js} | 0 src/page.js | 2 +- 5 files changed, 3 insertions(+), 249 deletions(-) delete mode 100644 .vscode/tasks.json rename src/{storage.js => migrate.js} (100%) diff --git a/.gitignore b/.gitignore index ff8ac5a..ed50308 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ bin/ node_modules/ npm-debug.log database.sqlite +database.sqlite-journal diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index 5580973..0000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,247 +0,0 @@ -// Available variables which can be used inside of strings. -// ${workspaceRoot}: the root folder of the team -// ${file}: the current opened file -// ${fileBasename}: the current opened file's basename -// ${fileDirname}: the current opened file's dirname -// ${fileExtname}: the current opened file's extension -// ${cwd}: the current working directory of the spawned process - -{ - "version": "0.1.0", - - // The command is tsc. Assumes that tsc has been installed using npm install -g typescript - "command": "babel", - - // The command is a shell script - "isShellCommand": true, - - "tasks": [ - { - "taskName": "watch", - "suppressTaskName": true, - "isBuildCommand": true, - "isWatching": true, - "args": [ - "src", "--out-dir", "bin", "-w" - ] - } - ] -} - - -// A task runner that calls the Typescript compiler (tsc) and -// Compiles a HelloWorld.ts program -/* -{ - "version": "0.1.0", - - // The command is tsc. Assumes that tsc has been installed using npm install -g typescript - "command": "tsc", - - // The command is a shell script - "isShellCommand": true, - - // Show the output window only if unrecognized errors occur. - "showOutput": "silent", - - // args is the HelloWorld program to compile. - "args": ["HelloWorld.ts"], - - // use the standard tsc problem matcher to find compile problems - // in the output. - "problemMatcher": "$tsc" -} -*/ -// A task runner that calls the Typescript compiler (tsc) and -// compiles based on a tsconfig.json file that is present in -// the root of the folder open in VSCode -/* -{ - "version": "0.1.0", - - // The command is tsc. Assumes that tsc has been installed using npm install -g typescript - "command": "tsc", - - // The command is a shell script - "isShellCommand": true, - - // Show the output window only if unrecognized errors occur. - "showOutput": "silent", - - // Tell the tsc compiler to use the tsconfig.json from the open folder. - "args": ["-p", "."], - - // use the standard tsc problem matcher to find compile problems - // in the output. - "problemMatcher": "$tsc" -} -*/ - -// A task runner configuration for gulp. Gulp provides a less task -// which compiles less to css. -/* -{ - "version": "0.1.0", - "command": "gulp", - "isShellCommand": true, - "tasks": [ - { - "taskName": "less", - // Make this the default build command. - "isBuildCommand": true, - // Show the output window only if unrecognized errors occur. - "showOutput": "silent", - // Use the standard less compilation problem matcher. - "problemMatcher": "$lessCompile" - } - ] -} -*/ - -// Uncomment the following section to use gulp in a watching mode that compiles a -// less file. The gulp task prints "[hh:mm:ss] Starting 'clean-styles'" to the console -// when existing css files get deleted and "[hh:mm:ss] Finished 'styles'" when the -// overall less compilation has finished. When the clean pattern is detect internal less -// problems are cleaned. When the finshed pattern is detected in the output less -// problems are published. -/* -{ - "version": "0.1.0", - "command": "gulp", - "isShellCommand": true, - "tasks": [ - { - "taskName": "watch-less", - // Make this the default build command. - "isBuildCommand": true, - // Show the output window only if unrecognized errors occur. - "showOutput": "silent", - // Task is running in watching mode. - "isWatching": true, - "problemMatcher": { - // Use the standard less compilation problem matcher as the base. - "base": "$lessCompile", - // A regular expression signalling that a watched task begins executing (usually triggered through file watching). - "watchedTaskBeginsRegExp": "^\\[\\d+:\\d+:\\d+\\] Starting 'clean-styles'\\.\\.\\.$", - // A regular expression signalling that a watched tasks ends executing. - "watchedTaskEndsRegExp": "^\\[\\d+:\\d+:\\d+\\] Finished 'styles' after \\d+" - } - } - ] -} -*/ - -// Uncomment the following section to use jake to build a workspace -// cloned from https://github.com/Microsoft/TypeScript.git -/* -{ - "version": "0.1.0", - // Task runner is jake - "command": "jake", - // Need to be executed in shell / cmd - "isShellCommand": true, - "showOutput": "silent", - "tasks": [ - { - // TS build command is local. - "taskName": "local", - // Make this the default build command. - "isBuildCommand": true, - // Show the output window only if unrecognized errors occur. - "showOutput": "silent", - // Use the redefined Typescript output problem matcher. - "problemMatcher": [ - "$tsc" - ] - } - ] -} -*/ - -// Uncomment the section below to use msbuild and generate problems -// for csc, cpp, tsc and vb. The configuration assumes that msbuild -// is available on the path and a solution file exists in the -// workspace folder root. -/* -{ - "version": "0.1.0", - "command": "msbuild", - "args": [ - // Ask msbuild to generate full paths for file names. - "/property:GenerateFullPaths=true" - ], - "taskSelector": "/t:", - "showOutput": "silent", - "tasks": [ - { - "taskName": "build", - // Show the output window only if unrecognized errors occur. - "showOutput": "silent", - // Use the standard MS compiler pattern to detect errors, warnings - // and infos in the output. - "problemMatcher": "$msCompile" - } - ] -} -*/ - -// Uncomment the following section to use msbuild which compiles Typescript -// and less files. -/* -{ - "version": "0.1.0", - "command": "msbuild", - "args": [ - // Ask msbuild to generate full paths for file names. - "/property:GenerateFullPaths=true" - ], - "taskSelector": "/t:", - "showOutput": "silent", - "tasks": [ - { - "taskName": "build", - // Show the output window only if unrecognized errors occur. - "showOutput": "silent", - // Use the standard MS compiler pattern to detect errors, warnings - // and infos in the output. - "problemMatcher": [ - "$msCompile", - "$lessCompile" - ] - } - ] -} -*/ -// A task runner example that defines a problemMatcher inline instead of using -// a predfined one. -/* -{ - "version": "0.1.0", - "command": "tsc", - "isShellCommand": true, - "args": ["HelloWorld.ts"], - "showOutput": "silent", - "problemMatcher": { - // The problem is owned by the typescript language service. Ensure that the problems - // are merged with problems produced by Visual Studio's language service. - "owner": "typescript", - // The file name for reported problems is relative to the current working directory. - "fileLocation": ["relative", "${cwd}"], - // The actual pattern to match problems in the output. - "pattern": { - // The regular expression. Matches HelloWorld.ts(2,10): error TS2339: Property 'logg' does not exist on type 'Console'. - "regexp": "^([^\\s].*)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\):\\s+(error|warning|info)\\s+(TS\\d+)\\s*:\\s*(.*)$", - // The match group that denotes the file containing the problem. - "file": 1, - // The match group that denotes the problem location. - "location": 2, - // The match group that denotes the problem's severity. Can be omitted. - "severity": 3, - // The match group that denotes the problem code. Can be omitted. - "code": 4, - // The match group that denotes the problem's message. - "message": 5 - } - } -} -*/ \ No newline at end of file diff --git a/server.js b/server.js index bd9eee4..b29ca3d 100644 --- a/server.js +++ b/server.js @@ -1,5 +1,5 @@ var express = require('express'); -var page = require('./bin/page'); +var page = require('./src/page'); var app = express(); app.use(express.static(__dirname + '/resources/public')); diff --git a/src/storage.js b/src/migrate.js similarity index 100% rename from src/storage.js rename to src/migrate.js diff --git a/src/page.js b/src/page.js index e719ad8..700e32b 100644 --- a/src/page.js +++ b/src/page.js @@ -9,7 +9,7 @@ var buildHTML = (title, content) => template .replace("%CONTENT%", content); var apiPage = buildHTML("API", marked(fs.readFileSync("API.md", "utf-8"))); -export var build = id => { +module.exports.build = id => { if (CACHE.has(id)) return CACHE.get(id); var content = id == "api" ? apiPage : "This is page " + id; CACHE.set(id, content);