tonyair/silverstripe-comments
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-comments synced 2024-10-22 11:05:49 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.3' into 3.4

Browse Source
This commit is contained in:
Steve Boyd 2021-03-21 10:27:53 +13:00
commit e6971b82c6
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -1,4 +1,12 @@
version: ~> 1.0 version: ~> 1.0
import: import:
<<<<<<< HEAD
- silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range.yml - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range.yml
=======
- silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range-npm.yml
env:
global:
- REQUIRE_EXTRA:"ezyang/htmlpurifier:*"
>>>>>>> 3.3

2
package.json
View File

@ -12,7 +12,7 @@
"build": "yarn && NODE_ENV=production webpack -p --bail --progress", "build": "yarn && NODE_ENV=production webpack -p --bail --progress",
"watch": "yarn && NODE_ENV=development webpack --watch --progress", "watch": "yarn && NODE_ENV=development webpack --watch --progress",
"css": "yarn && WEBPACK_CHILD=css webpack -p --bail --progress", "css": "yarn && WEBPACK_CHILD=css webpack -p --bail --progress",
"test": "jest", "test": "true",
"coverage": "jest --coverage", "coverage": "jest --coverage",
"lint": "eslint client/src && sass-lint -v client/src" "lint": "eslint client/src && sass-lint -v client/src"
}, },