diff --git a/Gruntfile.js b/Gruntfile.js index 9ab4584..5431e4d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -7,13 +7,13 @@ module.exports = grunt => { }, copy: { images: { - files: [{expand: true, cwd: "src/", src: ["**/*.png", "**/*.ico"], dest: "build/"}] + files: [{expand: true, cwd: "src/main/", src: ["**/*.png", "**/*.ico"], dest: "build/"}] }, html: { - files: [{expand: true, cwd: "src/", src: "**/*.html", dest: "build/"}] + files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "build/"}] }, css: { - files: [{expand: true, cwd: "src/", src: "**/*.css", dest: "build/"}] + files: [{expand: true, cwd: "src/main/", src: "**/*.css", dest: "build/"}] } }, cssmin: { @@ -72,6 +72,7 @@ module.exports = grunt => { // Post "clean:after" ]); + grunt.registerTask("dev", ["default"]); grunt.registerTask("deploy", [ // Pre "clean:before", diff --git a/README.md b/README.md index acb13c3..d8a643a 100644 --- a/README.md +++ b/README.md @@ -14,10 +14,12 @@ $> npm install ```shell script # Build the application in `build/` for development -$> grunt -``` - -```shell script +$> grunt dev # Build the application in `build/` for deployment $> grunt deploy ``` + +```shell script +# Run tests on the application in `build/` +$> npm test +``` diff --git a/package-lock.json b/package-lock.json index 69ba2a6..4fea9f9 100644 Binary files a/package-lock.json and b/package-lock.json differ diff --git a/package.json b/package.json index 517dfcf..da43155 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "description": "The source code of [my personal website](https://fwdekker.com/).", "dependencies": {}, "devDependencies": { + "ava": "2.4.0", "grunt": "1.0.4", "grunt-contrib-clean": "2.0.0", "grunt-contrib-copy": "1.0.0", @@ -13,6 +14,9 @@ "grunt-ts": "6.0.0-beta.22", "typescript": "3.6.4" }, + "scripts": { + "test": "ava" + }, "repository": { "type": "git", "url": "git@git.fwdekker.com:FWDekker/fwdekker.com.git" diff --git a/src/css/main.css b/src/main/css/main.css similarity index 100% rename from src/css/main.css rename to src/main/css/main.css diff --git a/src/favicon.ico b/src/main/favicon.ico similarity index 100% rename from src/favicon.ico rename to src/main/favicon.ico diff --git a/src/favicon.png b/src/main/favicon.png similarity index 100% rename from src/favicon.png rename to src/main/favicon.png diff --git a/src/index.html b/src/main/index.html similarity index 100% rename from src/index.html rename to src/main/index.html diff --git a/src/js/commands.ts b/src/main/js/commands.ts similarity index 100% rename from src/js/commands.ts rename to src/main/js/commands.ts diff --git a/src/js/extensions.d.ts b/src/main/js/extensions.d.ts similarity index 100% rename from src/js/extensions.d.ts rename to src/main/js/extensions.d.ts diff --git a/src/js/extensions.ts b/src/main/js/extensions.ts similarity index 100% rename from src/js/extensions.ts rename to src/main/js/extensions.ts diff --git a/src/js/fs.ts b/src/main/js/fs.ts similarity index 100% rename from src/js/fs.ts rename to src/main/js/fs.ts diff --git a/src/js/main.ts b/src/main/js/main.ts similarity index 100% rename from src/js/main.ts rename to src/main/js/main.ts diff --git a/src/js/shared.ts b/src/main/js/shared.ts similarity index 100% rename from src/js/shared.ts rename to src/main/js/shared.ts diff --git a/src/js/terminal.ts b/src/main/js/terminal.ts similarity index 100% rename from src/js/terminal.ts rename to src/main/js/terminal.ts diff --git a/src/js/user-session.ts b/src/main/js/user-session.ts similarity index 100% rename from src/js/user-session.ts rename to src/main/js/user-session.ts diff --git a/src/test/PathTest.js b/src/test/PathTest.js new file mode 100644 index 0000000..5537455 --- /dev/null +++ b/src/test/PathTest.js @@ -0,0 +1,6 @@ +import test from "ava"; +// import {Path} from "./../../build/js/fs.js"; + +test("paths", t => { + t.is("a", "a", "OH YES"); +}); diff --git a/tsconfig.json b/tsconfig.json index ab92e4f..27cdfc2 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,10 +3,10 @@ "module": "esnext", "target": "es2019", "strict": true, - "rootDir": "./src/js/", + "rootDir": "./src/main/js/", "outDir": "./build/js/" }, "include": [ - "src/js/**/*.ts" + "src/main/js/**/*.ts" ] }