From 65a57c1528a8ad33c22beafd6d0bbe7c8dbd703e Mon Sep 17 00:00:00 2001 From: "Felix W. Dekker" Date: Sun, 7 Jun 2020 12:24:40 +0200 Subject: [PATCH] Fix some config files --- Gruntfile.js | 54 +++++++++++++++++++++++++--------------------------- README.md | 12 ++---------- package.json | 2 +- 3 files changed, 29 insertions(+), 39 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index b8c8a77..e404c27 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -7,12 +7,12 @@ module.exports = grunt => { default: ["dist/"], }, copy: { - html: { - files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "dist/"}] - }, css: { files: [{expand: true, cwd: "src/main/", src: "**/*.css", dest: "dist/"}] }, + html: { + files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "dist/"}] + }, }, focus: { dev: { @@ -41,6 +41,24 @@ module.exports = grunt => { overwrite: true }, }, + watch: { + css: { + files: ["src/main/**/*.css"], + tasks: ["copy:css"], + }, + html: { + files: ["src/main/**/*.html"], + tasks: ["copy:html"], + }, + js: { + files: ["src/main/**/*.js"], + tasks: ["webpack:dev", "replace:dev"], + }, + link: { + files: ["node_modules/@fwdekker/*/dist/**"], + tasks: ["webpack:dev", "replace:dev"], + }, + }, webpack: { options: { entry: "./src/main/js/index.js", @@ -68,24 +86,6 @@ module.exports = grunt => { mode: "production", }, }, - watch: { - css: { - files: ["src/main/**/*.css"], - tasks: ["copy:css"], - }, - html: { - files: ["src/main/**/*.html"], - tasks: ["copy:html"], - }, - js: { - files: ["src/main/**/*.js"], - tasks: ["webpack:dev", "replace:dev"], - }, - link: { - files: ["node_modules/@fwdekker/*/dist/**"], - tasks: ["webpack:dev", "replace:dev"], - }, - }, }); grunt.loadNpmTasks("grunt-contrib-clean"); @@ -99,24 +99,22 @@ module.exports = grunt => { // Pre "clean", // Copy files - "copy:html", "copy:css", - // Compile + "copy:html", + // Compile JS "webpack:dev", - // Post - "replace:dev" + "replace:dev", ]); grunt.registerTask("dev:server", ["dev", "focus:dev"]); grunt.registerTask("deploy", [ // Pre "clean", // Copy files - "copy:html", "copy:css", + "copy:html", // Compile JS "webpack:deploy", - // Post - "replace:deploy" + "replace:deploy", ]); grunt.registerTask("default", ["dev"]); diff --git a/README.md b/README.md index 30aa360..d9137eb 100644 --- a/README.md +++ b/README.md @@ -17,18 +17,10 @@ $> npm ci ### Building ```shell script -# Build the template in `dist/` for development +# Build the tool in `dist/` for development $> npm run dev # Same as above, but automatically rerun it whenever files are changed $> npm run dev:server -# Build the template in `dist/` for deployment +# Build the tool in `dist/` for deployment $> npm run deploy ``` - -### Publishing -```shell script -# Log in to npm -$> npm login -# Push to npm -$> npm publish --access public -``` diff --git a/package.json b/package.json index c2ddb18..3522bfd 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "browser": "dist/bundle.js", "repository": { "type": "git", - "url": "git@git.fwdekker.com:FWDekker/interlanguage-checker.git" + "url": "git@git.fwdekker.com:FWDekker/doomsday.git" }, "private": true, "scripts": {