Prechádzať zdrojové kódy

Merge pull request #298 from sharelatex/as-fix-npm

Fix installation of babel
James Allen 8 rokov pred
rodič
commit
f20d36044b
2 zmenil súbory, kde vykonal 2837 pridanie a 1847 odobranie
  1. 2828 1844
      services/web/npm-shrinkwrap.json
  2. 9 3
      services/web/package.json

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 2828 - 1844
services/web/npm-shrinkwrap.json


+ 9 - 3
services/web/package.json

@@ -19,7 +19,8 @@
     "compile": "make compile",
     "start": "npm -q run compile && node app.js",
     "nodemon": "nodemon --config nodemon.json",
-    "nodemon:frontend": "nodemon --config nodemon.frontend.json"
+    "nodemon:frontend": "nodemon --config nodemon.frontend.json",
+    "webpack": "webpack-dev-server --config webpack.config.dev.js"
   },
   "dependencies": {
     "archiver": "0.9.0",
@@ -30,7 +31,6 @@
     "body-parser": "^1.13.1",
     "bufferedstream": "1.6.0",
     "connect-redis": "^3.1.0",
-    "contentful": "^3.3.14",
     "cookie": "^0.2.3",
     "cookie-parser": "1.3.5",
     "csurf": "^1.8.3",
@@ -87,6 +87,9 @@
   },
   "devDependencies": {
     "autoprefixer": "^6.6.1",
+    "babel-core": "^6.26.0",
+    "babel-loader": "^7.1.2",
+    "babel-preset-env": "^1.6.1",
     "bunyan": "0.22.1",
     "chai": "3.5.0",
     "chai-spies": "",
@@ -119,6 +122,9 @@
     "sandboxed-module": "0.2.0",
     "sinon": "^1.17.0",
     "timekeeper": "",
-    "translations-sharelatex": "git+https://github.com/sharelatex/translations-sharelatex.git#master"
+    "translations-sharelatex": "git+https://github.com/sharelatex/translations-sharelatex.git#master",
+    "webpack": "^3.10.0",
+    "webpack-dev-server": "^2.11.1",
+    "webpack-merge": "^4.1.1"
   }
 }

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov