diff --git a/Gruntfile.js b/Gruntfile.js index 409ed7a..fa9e201 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -8,10 +8,10 @@ module.exports = grunt => { }, copy: { css: { - files: [{expand: true, cwd: "src/main/css/", src: "**/*.css", dest: "dist/"}], + files: [{expand: true, cwd: "src/main/", src: "**/*.css", dest: "dist/", flatten: true}], }, html: { - files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "dist/"}], + files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "dist/", flatten: true}], }, }, focus: { @@ -68,24 +68,10 @@ module.exports = grunt => { test: /\.js$/, exclude: /node_modules/, }, - { - test: /\.css$/i, - use: ["style-loader", "css-loader"], - }, - { - test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/, - use: [{ - loader: "file-loader", - options: { - name: "[name].[ext]", - outputPath: "./", - }, - }], - }, ], }, resolve: { - extensions: [".js", ".css"], + extensions: [".js"], }, output: { filename: "bundle.js", diff --git a/package-lock.json b/package-lock.json index 0c80566..00c5d41 100644 Binary files a/package-lock.json and b/package-lock.json differ diff --git a/package.json b/package.json index 82b5995..1b639d2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "interlanguage-checker", - "version": "1.10.24", + "version": "1.10.25", "description": "Check the consistency of MediaWiki interlanguage links in a simple overview.", "author": "Felix W. Dekker", "browser": "dist/bundle.js", @@ -16,12 +16,9 @@ "deploy": "grunt deploy" }, "dependencies": { - "fetch-jsonp": "^1.1.3", - "fork-awesome": "^1.1.7" + "fetch-jsonp": "^1.1.3" }, "devDependencies": { - "css-loader": "^5.2.2", - "file-loader": "^6.2.0", "grunt": "^1.3.0", "grunt-cli": "^1.4.2", "grunt-contrib-clean": "^2.0.0", @@ -30,7 +27,6 @@ "grunt-focus": "^1.0.0", "grunt-text-replace": "^0.4.0", "grunt-webpack": "^4.0.2", - "style-loader": "^2.0.0", "webpack": "^5.33.2", "webpack-cli": "^4.6.0" } diff --git a/src/main/index.html b/src/main/index.html index 929c53e..5778110 100644 --- a/src/main/index.html +++ b/src/main/index.html @@ -11,6 +11,7 @@ Interlanguage Checker | FWDekker + diff --git a/src/main/js/Main.js b/src/main/js/Main.js index 5b209c4..81355c0 100644 --- a/src/main/js/Main.js +++ b/src/main/js/Main.js @@ -1,6 +1,5 @@ // noinspection JSUnresolvedVariable const {$, doAfterLoad, footer, header, nav, showPage, stringToHtml} = window.fwdekker; -import "fork-awesome/css/fork-awesome.css"; import {InterlangTable, MessageHandler, ValidatableInput} from "./DOM"; import {discoverNetwork, InterlangNetwork, MediaWiki, MediaWikiManager} from "./MediaWiki";