From b18199ed3eb9de32bb7c570e67d8d0d1e6f768df Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 16 Dec 2019 11:12:10 +0200 Subject: [PATCH] Remove the individual sass scripts. Signed-off-by: XhmikosR --- .gitignore | 1 - package-lock.json | 100 ------------------------------- package.json | 11 +--- src/index.tsx | 2 +- src/scss/style.scss | 6 +- src/scss/vendors/_variables.scss | 10 ++-- 6 files changed, 12 insertions(+), 118 deletions(-) diff --git a/.gitignore b/.gitignore index 44052dd..dfbc028 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,6 @@ node_modules # Compiled Files build -src/scss/style.css # Test Files coverage diff --git a/package-lock.json b/package-lock.json index eaf3e4b..8412bb1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10465,12 +10465,6 @@ } } }, - "memorystream": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", - "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=", - "dev": true - }, "meow": { "version": "3.7.0", "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", @@ -11266,22 +11260,6 @@ } } }, - "node-sass-chokidar": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/node-sass-chokidar/-/node-sass-chokidar-1.4.0.tgz", - "integrity": "sha512-yQWApNiQhg7tMGSbcbeOY0P7v1nKofGBMpX0N4bnOjYlOaN1s+Lw+gqAwuqNu8iuGZobZJlDDCiC6NCIv5/ejA==", - "dev": true, - "requires": { - "async-foreach": "^0.1.3", - "chokidar": "^2.0.4", - "get-stdin": "^4.0.1", - "glob": "^7.0.3", - "meow": "^3.7.0", - "node-sass": "4.13", - "sass-graph": "^2.1.1", - "stdout-stream": "^1.4.0" - } - }, "nopt": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", @@ -11330,68 +11308,6 @@ "sort-keys": "^1.0.0" } }, - "npm-run-all": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz", - "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "chalk": "^2.4.1", - "cross-spawn": "^6.0.5", - "memorystream": "^0.3.1", - "minimatch": "^3.0.4", - "pidtree": "^0.3.0", - "read-pkg": "^3.0.0", - "shell-quote": "^1.6.1", - "string.prototype.padend": "^3.0.0" - }, - "dependencies": { - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true - }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, - "requires": { - "shebang-regex": "^1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true - }, - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } - }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", @@ -12014,12 +11930,6 @@ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, - "pidtree": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.0.tgz", - "integrity": "sha512-9CT4NFlDcosssyg8KVFltgokyKZIFjoBxw8CTGy+5F38Y1eQWrt8tRayiUOXE+zVKQnYu5BR8JjCtvK3BcnBhg==", - "dev": true - }, "pify": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", @@ -15760,16 +15670,6 @@ "strip-ansi": "^3.0.0" } }, - "string.prototype.padend": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz", - "integrity": "sha512-3aIv8Ffdp8EZj8iLwREGpQaUZiPyrWrpzMBHvkiSW/bK/EGve9np07Vwy7IJ5waydpGXzQZu/F8Oze2/IWkBaA==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1" - } - }, "string.prototype.trim": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz", diff --git a/package.json b/package.json index 96d73da..892506d 100644 --- a/package.json +++ b/package.json @@ -31,8 +31,7 @@ "jest-enzyme": "^7.1.2", "jest-localstorage-mock": "^2.4.0", "node-fetch": "^2.6.0", - "node-sass-chokidar": "^1.4.0", - "npm-run-all": "^4.1.5", + "node-sass": "^4.13.0", "prettier": "^1.19.1", "react-scripts": "^3.3.0", "redux-saga-test-plan": "^4.0.0-rc.3", @@ -68,14 +67,10 @@ "sha.js": "^2.4.11" }, "scripts": { - "start": "npm run build-css && npm-run-all -p watch-css start-js", - "start-js": "npm run generate-language-list && react-scripts start", + "start": "npm run generate-language-list && react-scripts start", "start-fake": "npm run make-fake-data && cross-env REACT_APP_FAKE_API=1 npm run start", - "build": "npm-run-all build-css build-js", + "build": "npm run generate-language-list && react-scripts build", "build-fake": "npm run make-fake-data && cross-env REACT_APP_FAKE_API=1 npm run build", - "build-js": "npm run generate-language-list && react-scripts build", - "build-css": "node-sass-chokidar --include-path ./node_modules ./src/scss -o ./src/scss", - "watch-css": "node-sass-chokidar --include-path ./node_modules ./src/scss -o ./src/scss --watch --recursive", "generate-language-list": "node scripts/generate-language-list.js", "make-fake-data": "node scripts/make-fake-data.js", "test": "react-scripts test --env=jsdom", diff --git a/src/index.tsx b/src/index.tsx index 7ec4a62..d56c7db 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -14,7 +14,7 @@ import * as ReactDOM from "react-dom"; import { BrowserRouter, Route, Switch } from "react-router-dom"; import "@fortawesome/fontawesome-free/css/all.min.css"; import "react-bootstrap-typeahead/css/Typeahead.css"; -import "./scss/style.css"; +import "./scss/style.scss"; import Full from "./containers/Full"; import api from "./util/api"; import { setupI18n } from "./util/i18n"; diff --git a/src/scss/style.scss b/src/scss/style.scss index 51683f6..c096920 100644 --- a/src/scss/style.scss +++ b/src/scss/style.scss @@ -2,10 +2,10 @@ @import "variables"; // Import styles -@import "@coreui/coreui/scss/coreui.scss"; -@import "vendors/chart.js/chart.scss"; +@import "~@coreui/coreui/scss/coreui"; +@import "vendors/chart.js/chart"; // Temp fix for reactstrap -@import "@coreui/coreui/scss/dropdown-menu-right.scss"; +@import "~@coreui/coreui/scss/dropdown-menu-right"; // If you want to add something do it here @import "custom"; diff --git a/src/scss/vendors/_variables.scss b/src/scss/vendors/_variables.scss index 01192e8..10d775b 100644 --- a/src/scss/vendors/_variables.scss +++ b/src/scss/vendors/_variables.scss @@ -1,7 +1,7 @@ // Override Boostrap variables @import "../variables"; -@import "node_modules/@coreui/coreui/scss/bootstrap/variables"; -@import "node_modules/bootstrap/scss/mixins"; -@import "node_modules/bootstrap/scss/functions"; -@import "node_modules/bootstrap/scss/variables"; -@import "node_modules/@coreui/coreui/scss/variables"; +@import "~@coreui/coreui/scss/bootstrap/variables"; +@import "~bootstrap/scss/mixins"; +@import "~bootstrap/scss/functions"; +@import "~bootstrap/scss/variables"; +@import "~@coreui/coreui/scss/variables";