Skip to content

Commit

Permalink
Add Dart SASS / Remove Node SASS & Others Misc (#314)
Browse files Browse the repository at this point in the history
* Added dart-sass In replacement of node-sass due to dependencies issues with new version of NodeJs LTS

* Update _variable.sass to work with dart-sass

* Update _layout.sass to work with dart-sass

* Update index.sass to work with dart-sass

* Update Docker file back to LTS from node14

* Image Updates for Report Player & Clan Management pages
  • Loading branch information
Rowey authored Dec 28, 2021
1 parent 564bb64 commit 05c11e9
Show file tree
Hide file tree
Showing 12 changed files with 411 additions and 407 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use an ubuntu-image for building assets for use in a runtime image...
FROM node:14 as builder
FROM node:lts as builder

RUN mkdir code

Expand All @@ -13,7 +13,7 @@ RUN yarn install
RUN ./node_modules/.bin/grunt prod

# Slimmer runtime image without python/make/gcc etc.
FROM node:14-alpine as runtime
FROM node:lts-alpine as runtime

COPY --from=builder /code /code

Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,7 @@ The purpose behind each one is for dev and prod. In prod, it will minify the CSS

The same goes for Javascript. Any javascript needed will need to be registered under grunt/concat.js. This script
puts all Javascript in one file, and will minify it in PROD.


## To Do
Remove the use of Node-SASS dependency due to depreciation and replace with Dart-SASS
2 changes: 1 addition & 1 deletion grunt/sass.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const sass = require('node-sass');
const sass = require('dart-sass');

module.exports = {
dev: {
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@
"jshint-stylish": "2.2.1",
"load-grunt-config": "4.0.1",
"load-grunt-tasks": "5.1.0",
"node-sass": "6.0.1",
"node-sass-middleware": "0.11.0",
"open": "8.2.1",
"time-grunt": "2.0.0"
"time-grunt": "2.0.0",
"dart-sass": "^1.25.0",
"dart-sass-middleware": "^0.1.0"
},
"engines": {
"node": ">=12.13.0",
Expand Down
Binary file added public/images/Report_Replays.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/clans.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/images/report_replays.png
Binary file not shown.
Binary file removed public/images/spider.jpg
Binary file not shown.
Loading

0 comments on commit 05c11e9

Please sign in to comment.