Merges master

This commit is contained in:
Mo Bitar
2020-03-14 12:05:38 -05:00
18 changed files with 1453 additions and 89822 deletions

View File

@@ -7,7 +7,7 @@
"url": "https://github.com/standardnotes/web"
},
"scripts": {
"start": "webpack --mode development -w",
"start": "webpack-dev-server --progress",
"bundle": "webpack --mode production",
"build": "bundle install && npm install && npm run bundle",
"submodules": "git submodule update --init --force --remote",
@@ -47,10 +47,11 @@
"pug-loader": "^2.4.0",
"sass-loader": "^8.0.2",
"serve-static": "^1.14.1",
"sn-stylekit": "2.0.20",
"snjs": "github:standardnotes/snjs#ea2f182ba4b53642516714396bbef264f25e373b",
"sn-stylekit": "2.0.22",
"webpack": "^4.41.5",
"webpack-cli": "^3.3.10"
"webpack-cli": "^3.3.10",
"webpack-dev-server": "^3.10.3"
},
"dependencies": {
"lodash": "^4.17.15"