Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat sass upgrade #125

Merged
merged 6 commits into from
Aug 29, 2021
Merged

Feat sass upgrade #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d145f63
feat: migrated from node-sass to sass
Jul 15, 2021
b9a3f82
wip: sass upgrade
Jul 18, 2021
d8a906d
fix: missing packages
Aug 29, 2021
f21176f
fix: sass loader version
Aug 29, 2021
7133437
fix: updated vulnerable packages with npm audit
Aug 29, 2021
28fd2da
feat: updated packages to latest minor versions
Aug 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4,743 changes: 2,475 additions & 2,268 deletions client/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

75 changes: 38 additions & 37 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"js": "webpack",
"watch-js": "webpack --watch",
"css": "npm-run-all --sequential css-compile css-minify",
"css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 src/scss/ivis.scss dist/ivis.css",
"css-compile": "sass --quiet-deps --style expanded --source-map --embed-sources --precision 6 src/scss/ivis.scss dist/ivis.css",
"css-minify": "cleancss --level 1 --source-map --source-map-inline-sources --output dist/ivis.min.css dist/ivis.css",
"watch-css": "nodemon --watch src/scss -e scss -x \"npm run css\"",
"watch": "node pre-build.js && npm-run-all --parallel watch-css watch-js",
Expand All @@ -17,69 +17,70 @@
"license": "MIT",
"dependencies": {
"@coreui/coreui": "^2.1.16",
"@fortawesome/fontawesome-free": "^5.11.2",
"@fortawesome/fontawesome-free": "^5.15.4",
"ansi-to-react": "^4.0.0-alpha.0",
"axios": "^0.21.1",
"base64-url": "^2.3.2",
"bootstrap": "^4.4.1",
"d3-array": "^2.4.0",
"base64-url": "^2.3.3",
"bootstrap": "^4.6.0",
"d3-array": "^2.12.1",
"d3-axis": "^1.0.12",
"d3-brush": "^1.1.5",
"d3-color": "^1.4.0",
"d3-ease": "^1.0.6",
"d3-format": "^1.4.2",
"d3-brush": "^1.1.6",
"d3-color": "^1.4.1",
"d3-ease": "^1.0.7",
"d3-format": "^1.4.5",
"d3-interpolate": "^1.4.0",
"d3-regression": "^1.3.9",
"d3-scale": "^2.1.2",
"d3-selection": "^1.4.1",
"d3-scale-chromatic": "^1.5.0",
"d3-selection": "^1.4.2",
"d3-shape": "^1.3.7",
"d3-transition": "^1.3.2",
"d3-zoom": "^1.8.3",
"d3-regression": "^1.3.4",
"d3-interpolate": "^1.4.0",
"d3-scale-chromatic": "^1.5.0",
"datatables.net": "^1.10.22",
"datatables.net-bs4": "^1.10.20",
"datatables.net": "^1.10.25",
"datatables.net-bs4": "^1.10.25",
"fast-deep-equal": "^2.0.1",
"i18next": "^13.0.1",
"i18next-browser-languagedetector": "^2.2.4",
"immutable": "^4.0.0-rc.12",
"jquery": "^3.5.0",
"immutable": "^4.0.0-rc.14",
"jquery": "^3.6.0",
"lodash": "^4.17.21",
"lz-string": "^1.4.4",
"memoize-one": "^5.1.1",
"moment": "^2.23.0",
"popper.js": "^1.16.0",
"memoize-one": "^5.2.1",
"moment": "^2.29.1",
"popper.js": "^1.16.1",
"prop-types": "^15.6.2",
"react": "^16.12.0",
"react": "^16.14.0",
"react-ace": "^6.6.0",
"react-color": "^2.17.3",
"react-day-picker": "^7.4.0",
"react-dom": "^16.12.0",
"react-color": "^2.19.3",
"react-day-picker": "^7.4.10",
"react-dom": "^16.14.0",
"react-dropzone": "^8.2.0",
"react-i18next": "^9.0.1",
"react-router-dom": "^4.3.1",
"shallowequal": "^1.1.0",
"url-parse": "^1.5.0"
"url-parse": "^1.5.3"
},
"devDependencies": {
"@babel/cli": "^7.7.5",
"@babel/core": "^7.7.5",
"@babel/plugin-proposal-class-properties": "^7.7.4",
"@babel/plugin-proposal-decorators": "^7.7.4",
"@babel/plugin-proposal-function-bind": "^7.7.4",
"@babel/preset-env": "^7.7.5",
"@babel/preset-react": "^7.7.4",
"babel-loader": "^8.0.6",
"@babel/cli": "^7.14.8",
"@babel/core": "^7.15.0",
"@babel/plugin-proposal-class-properties": "^7.14.5",
"@babel/plugin-proposal-decorators": "^7.14.5",
"@babel/plugin-proposal-function-bind": "^7.14.5",
"@babel/plugin-proposal-private-methods": "^7.14.5",
"@babel/preset-env": "^7.15.0",
"@babel/preset-react": "^7.14.5",
"babel-loader": "^8.2.2",
"clean-css-cli": "^4.3.0",
"css-loader": "^2.1.1",
"file-loader": "^3.0.1",
"node-sass": "^4.13.1",
"nodemon": "^1.19.4",
"npm-run-all": "^4.1.5",
"raw-loader": "^1.0.0",
"sass-loader": "^7.3.1",
"sass": "^1.38.2",
"sass-loader": "^10.1.0",
"style-loader": "^0.23.1",
"url-loader": "^1.1.2",
"webpack": "^4.41.2",
"webpack-cli": "^3.3.10"
"webpack": "^4.46.0",
"webpack-cli": "^3.3.12"
}
}
8 changes: 4 additions & 4 deletions client/src/scss/ivis.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ $fa-font-path: "../static-npm/fontawesome";
$enable-print-styles: false;

@import "./variables.scss";
@import "node_modules/@coreui/coreui/scss/coreui.scss";
@import "node_modules/@fortawesome/fontawesome-free/scss/fontawesome.scss";
@import "node_modules/@fortawesome/fontawesome-free/scss/regular.scss";
@import "node_modules/@fortawesome/fontawesome-free/scss/solid.scss";
@import "../../node_modules/@coreui/coreui/scss/coreui.scss";
@import "../../node_modules/@fortawesome/fontawesome-free/scss/fontawesome.scss";
@import "../../node_modules/@fortawesome/fontawesome-free/scss/regular.scss";
@import "../../node_modules/@fortawesome/fontawesome-free/scss/solid.scss";

.custom-select {
-webkit-appearance: none; // This is a fix for Chrome
Expand Down
15 changes: 8 additions & 7 deletions client/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ module.exports = {
'@babel/preset-react'
],
plugins: [
["@babel/plugin-proposal-decorators", { "legacy": true }],
["@babel/plugin-proposal-class-properties", { "loose" : true }],
["@babel/plugin-proposal-decorators", {"legacy": true}],
["@babel/plugin-proposal-class-properties", {"loose": true}],
["@babel/plugin-proposal-private-methods", {"loose": true}],
["@babel/plugin-proposal-private-property-in-object", { "loose": true }],
"@babel/plugin-proposal-function-bind"
]
}
Expand All @@ -42,7 +44,7 @@ module.exports = {
},
{
test: /\.css$/,
use: [ 'style-loader', 'css-loader' ]
use: ['style-loader', 'css-loader']
},
{
test: /\.(png|jpg|gif|woff2?)$/,
Expand Down Expand Up @@ -78,12 +80,12 @@ module.exports = {
localIdentName: '[path][name]__[local]--[hash:base64:5]'
}
},
'sass-loader'
'sass-loader',
]
},
{
test: /\.(ttf|eot)$/,
use: [ 'file-loader' ]
use: ['file-loader']
}
]
},
Expand All @@ -99,6 +101,5 @@ module.exports = {
ignored: 'node_modules/',
poll: 1000
},
resolve: {
}
resolve: {}
};
Loading