Commit 85d0fdfc authored by Dominika Liberda's avatar Dominika Liberda 💽
Browse files

Merge branch 'master' of ssh://git.sakamoto.pl:2137/laudom/ocw

parents 1df1bbf2 3bd6618a
Pipeline #101 passed with stage
in 30 seconds
front-lint:
image: node:15-alpine
allow_failure: true
before_script:
- apk add python build-base cmake
script:
- cd front
- yarn
......@@ -10,8 +8,6 @@ front-lint:
front-build:
image: node:15-alpine
before_script:
- apk add python build-base cmake
script:
- cd front
- yarn
......
......@@ -2,8 +2,7 @@ const gulp = require("gulp");
const ts = require("gulp-typescript");
const sourceMaps = require("gulp-sourcemaps");
const babel = require("gulp-babel");
const sass = require("gulp-sass");
sass.compiler = require("sass");
const sass = require("@selfisekai/gulp-sass");
const buildTs = () =>
ts
......
......@@ -19,9 +19,9 @@
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.11.5",
"@selfisekai/gulp-sass": "^4.2.0",
"@types/gulp": "^4.0.7",
"@types/gulp-babel": "^6.1.29",
"@types/gulp-sass": "^4.0.0",
"@types/gulp-sourcemaps": "^0.0.32",
"@types/leaflet": "^1.5.19",
"@types/sass": "^1.16.0",
......@@ -36,7 +36,6 @@
"eslint-plugin-prettier": "^3.1.4",
"gulp": "^4.0.2",
"gulp-babel": "^8.0.0",
"gulp-sass": "^4.1.0",
"gulp-sourcemaps": "^2.6.5",
"gulp-typescript": "^6.0.0-alpha.1",
"prettier": "^2.1.2",
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment