remove Gulp and other obsolete packages
This commit is contained in:
Amri Toufali
Родитель
fe5b3e77bc
Коммит
84ad05ba69
|
|
@ -21,4 +21,4 @@ COPY --chown=app:app . /app
|
|||
|
||||
RUN npm run build:all
|
||||
|
||||
CMD NODE_ICU_DATA=./node_modules/full-icu node server.js
|
||||
CMD node server.js
|
||||
|
|
|
|||
51
gulpfile.js
51
gulpfile.js
|
|
@ -1,51 +0,0 @@
|
|||
'use strict'
|
||||
|
||||
const { src, watch, series, dest } = require('gulp')
|
||||
const sass = require('gulp-sass')(require('sass'))
|
||||
const del = require('del')
|
||||
const sourcemaps = require('gulp-sourcemaps')
|
||||
|
||||
// directory for building SCSS, and bundles
|
||||
const buildDir = './public/scss/libs/protocol/'
|
||||
const finalDir = './public/css/'
|
||||
|
||||
const compiledCssDirectories = [
|
||||
'./public/css/*',
|
||||
'!./public/css/legacy/**'
|
||||
]
|
||||
|
||||
function cleanCompiledCssDirectory () {
|
||||
return del(compiledCssDirectories)
|
||||
}
|
||||
|
||||
function resetCssDirectories () {
|
||||
return del(compiledCssDirectories.concat(buildDir))
|
||||
}
|
||||
|
||||
function styles () {
|
||||
return src('./public/scss/app.scss')
|
||||
.pipe(sourcemaps.init())
|
||||
.pipe(sass().on('error', sass.logError))
|
||||
.pipe(sourcemaps.write('.'))
|
||||
.pipe(dest(finalDir))
|
||||
}
|
||||
|
||||
function assetsCopyLegacy () {
|
||||
return src(['./public/scss/partials/legacy/**/*']).pipe(dest('./public/css/legacy/'))
|
||||
}
|
||||
|
||||
function watchCss () {
|
||||
return watch('./public/scss/**/*.scss', { ignoreInitial: false }, series(cleanCompiledCssDirectory, styles))
|
||||
}
|
||||
|
||||
function assetsCopy () {
|
||||
return src(['./node_modules/@mozilla-protocol/core/protocol/**/*']).pipe(dest(buildDir))
|
||||
}
|
||||
|
||||
exports.watchCss = watchCss
|
||||
|
||||
exports.build = series(resetCssDirectories, assetsCopy, assetsCopyLegacy, styles)
|
||||
|
||||
exports.default = series(
|
||||
cleanCompiledCssDirectory, assetsCopy, styles, watchCss
|
||||
)
|
||||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
40
package.json
40
package.json
|
|
@ -8,13 +8,10 @@
|
|||
"dependencies": {
|
||||
"@maxmind/geoip2-node": "^3.1.0",
|
||||
"@sentry/node": "5.27.2",
|
||||
"babel-minify": "0.5.1",
|
||||
"body-parser": "1.19.0",
|
||||
"clean-css-cli": "4.3.0",
|
||||
"client-oauth2": "4.3.2",
|
||||
"concat": "1.0.3",
|
||||
"cookie-parser": "^1.4.6",
|
||||
"connect-redis": "5.0.0",
|
||||
"cookie-parser": "^1.4.6",
|
||||
"csurf": "1.11.0",
|
||||
"del": "^6.0.0",
|
||||
"dotenv": "8.2.0",
|
||||
|
|
@ -25,12 +22,8 @@
|
|||
"express-session": "1.17.1",
|
||||
"fluent": "0.12.0",
|
||||
"fluent-langneg": "0.2.0",
|
||||
"full-icu": "1.3.1",
|
||||
"git-rev-sync": "^3.0.2",
|
||||
"got": "10.7.0",
|
||||
"gulp": "^4.0.2",
|
||||
"gulp-sass": "^5.0.0",
|
||||
"gulp-sourcemaps": "^3.0.0",
|
||||
"helmet": "4.2.0",
|
||||
"intl-pluralrules": "1.2.1",
|
||||
"isemail": "3.2.0",
|
||||
|
|
@ -39,10 +32,8 @@
|
|||
"mozlog": "3.0.2",
|
||||
"nodemailer": "^6.6.5",
|
||||
"nodemailer-express-handlebars": "^4.0.0",
|
||||
"npm-run-all": "4.1.5",
|
||||
"pg": "^8.7.1",
|
||||
"redis": "3.1.1",
|
||||
"sass": "^1.42.1",
|
||||
"sns-validator": "0.3.4",
|
||||
"uuid": "3.4.0"
|
||||
},
|
||||
|
|
@ -67,18 +58,13 @@
|
|||
"node-mocks-http": "1.9.0",
|
||||
"nodemon": "2.0.4",
|
||||
"npm-audit-ci-wrapper": "3.0.1",
|
||||
"onchange": "6.1.1",
|
||||
"redis-mock": "^0.56.3",
|
||||
"stylelint": "^13.13.1",
|
||||
"stylelint-config-standard": "^22.0.0",
|
||||
"stylelint-scss": "^3.19.0",
|
||||
"wdio-docker-service": "2.4.0",
|
||||
"wdio-image-comparison-service": "^3.0.0",
|
||||
"wdio-video-reporter": "2.0.1"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"sass": "^1.42.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": "14.17.x",
|
||||
"npm": "6.x"
|
||||
|
|
@ -86,11 +72,6 @@
|
|||
"homepage": "https://github.com/mozilla/blurts-server",
|
||||
"license": "MPL-2.0",
|
||||
"main": "server.js",
|
||||
"nodemonConfig": {
|
||||
"ignore": [
|
||||
"version.json"
|
||||
]
|
||||
},
|
||||
"jest": {
|
||||
"collectCoverageFrom": [
|
||||
"**/*.js",
|
||||
|
|
@ -116,29 +97,14 @@
|
|||
"dev": "npm run build & nodemon server.js",
|
||||
"build": "node esbuild.js",
|
||||
"clean": "rm -rf public/dist",
|
||||
"//js:minify": "minify public/dist/app.min.js -o public/dist/app.min.js",
|
||||
"//js:concat": "concat -o public/dist/app.min.js public/js/*.js",
|
||||
"//js:allBreaches": "minify public/js/all-breaches/all-breaches.js -o public/dist/all-breaches.min.js",
|
||||
"css:dev": "gulp",
|
||||
"css:minify": "cleancss -o public/dist/app.min.css public/css/app.css",
|
||||
"//build:css": "gulp build",
|
||||
"//build:js": "run-s js:concat js:allBreaches js:minify",
|
||||
"//build:polyfills": "minify public/js/polyfills/edge.js -o public/dist/edge.min.js",
|
||||
"//watch:js": "onchange 'public/js/*.js' -- npm run build:js",
|
||||
"//watch:css": "gulp watchCss",
|
||||
"//watch:all": "run-p watch:css watch:js",
|
||||
"build:dev": "run-s build:js build:css watch:all",
|
||||
"build:all": "run-s build:js build:css css:minify build:polyfills",
|
||||
"db:migrate": "knex migrate:latest --knexfile db/knexfile.js",
|
||||
"docker:build": "docker build -t blurts-server .",
|
||||
"docker:run": "docker run -p 6060:6060 blurts-server",
|
||||
"lint": "npm-run-all lint:*",
|
||||
"lint": "npm run lint:js && npm run lint:css && npm run lint:audit",
|
||||
"lint:js": "eslint .",
|
||||
"lint:css": "stylelint --fix public/scss/ public/css/app.css",
|
||||
"lint:audit": "npm-audit-ci-wrapper -t 'high'",
|
||||
"get-hashsets": "node scripts/get-hashsets",
|
||||
"//server": "NODE_ICU_DATA=./node_modules/full-icu nodemon server.js --ignore public/",
|
||||
"//start": "run-p build:all watch:all server",
|
||||
"test:db:migrate": "NODE_ENV=tests knex migrate:latest --knexfile db/knexfile.js --env tests",
|
||||
"test:tests": "NODE_ENV=tests HIBP_THROTTLE_DELAY=1000 HIBP_THROTTLE_MAX_TRIES=3 jest --runInBand --coverage tests/",
|
||||
"test:coveralls": "cat ./coverage/lcov.info | coveralls",
|
||||
|
|
@ -146,7 +112,7 @@
|
|||
"test:integration-headless": "MOZ_HEADLESS=1 wdio tests/integration/wdio.conf.js",
|
||||
"test:integration-headless-ci": "MOZ_HEADLESS=1 ERROR_SHOTS=1 wdio tests/integration/wdio.conf.js",
|
||||
"test:integration-docker": "MOZ_HEADLESS=1 wdio tests/integration/wdio.docker.js",
|
||||
"test": "run-s test:db:migrate test:tests test:coveralls"
|
||||
"test": "npm run test:db:migrate && npm run test:tests && npm run test:coveralls"
|
||||
},
|
||||
"supportedLocales": "cak,cs,cy,da,de,el,en,en-CA,en-GB,es-AR,es-CL,es-ES,es-MX,fi,fr,fy-NL,gn,hu,kab,ia,id,it,ja,nb-NO,nl,nn-NO,pt-BR,pt-PT,ro,ru,sk,sl,sq,sv-SE,tr,uk,vi,zh-CN,zh-TW"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,4 +23,4 @@ COPY --chown=app:root . /app
|
|||
|
||||
RUN npm run build:all
|
||||
|
||||
CMD NODE_ICU_DATA=./node_modules/full-icu node server.js
|
||||
CMD node server.js
|
||||
Загрузка…
Ссылка в новой задаче