Compare commits

..

No commits in common. "master" and "develop" have entirely different histories.

5 changed files with 8 additions and 21 deletions

6
package-lock.json generated
View File

@ -2542,12 +2542,6 @@
} }
} }
}, },
"case-sensitive-paths-webpack-plugin": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz",
"integrity": "sha512-/4YgnZS8y1UXXmC02xD5rRrBEu6T5ub+mQHLNRj0fzTRbgdBYhsNo2V5EqwgqrExjxsjtF/OpAKAMkKsxbD5XQ==",
"dev": true
},
"caseless": { "caseless": {
"version": "0.12.0", "version": "0.12.0",
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",

View File

@ -20,7 +20,6 @@
"@types/react-dom": "^16.9.6", "@types/react-dom": "^16.9.6",
"@typescript-eslint/eslint-plugin": "^2.28.0", "@typescript-eslint/eslint-plugin": "^2.28.0",
"@typescript-eslint/parser": "^2.28.0", "@typescript-eslint/parser": "^2.28.0",
"case-sensitive-paths-webpack-plugin": "^2.3.0",
"copy-webpack-plugin": "^5.1.1", "copy-webpack-plugin": "^5.1.1",
"css-loader": "^3.5.2", "css-loader": "^3.5.2",
"eslint": "^6.8.0", "eslint": "^6.8.0",

View File

@ -2,7 +2,7 @@ import * as React from "react";
import "../style/search.scss"; import "../style/search.scss";
import Sugestion from "./Sugestion"; import Sugestion from "./Sugestion";
import { Suggestion, SuggestionType } from "../types/Suggestion"; import { Suggestion, SuggestionType } from "../types/suggestion";
import getGoogleSuggestions from "../functions/getGoogleSuggestions"; import getGoogleSuggestions from "../functions/getGoogleSuggestions";
interface State { interface State {

View File

@ -1,7 +1,7 @@
import * as React from "react"; import * as React from "react";
import "../style/suggestion.scss"; import "../style/suggestion.scss";
import { Suggestion } from "../types/Suggestion"; import { Suggestion } from "../types/suggestion";
interface Props { interface Props {
suggestion: Suggestion; suggestion: Suggestion;

View File

@ -4,22 +4,17 @@
const HtmlWebpackPlugin = require("html-webpack-plugin"); const HtmlWebpackPlugin = require("html-webpack-plugin");
const MiniCssExtractPlugin = require("mini-css-extract-plugin"); const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const CopyWebpackPlugin = require('copy-webpack-plugin'); const CopyWebpackPlugin = require('copy-webpack-plugin');
const CaseSensitivePathsPlugin = require("case-sensitive-paths-webpack-plugin");
const Webpack = require("webpack"); const Webpack = require("webpack");
const path = require("path"); const path = require("path");
const DEVELOPMENT = process.env.NODE_ENV === "development"; const DEVELOPMENT = process.env.NODE_ENV === "development";
let version = process.env.DRONE_TAG; const version = require('child_process')
.execSync("git describe --abbrev=0")
if(!version){ .toString()
version = require('child_process') .replace("v", "")
.execSync("git describe --abbrev=0") .trim();
.toString();
}
version = version.replace("v", "").trim();
module.exports = { module.exports = {
context: path.join(__dirname, "src"), context: path.join(__dirname, "src"),
@ -87,7 +82,6 @@ module.exports = {
]), ]),
new Webpack.DefinePlugin({ new Webpack.DefinePlugin({
VERSION: JSON.stringify(version), VERSION: JSON.stringify(version),
}), })
new CaseSensitivePathsPlugin()
] ]
}; };