فهرست منبع

Revert "Use custom shrinkwrap to ignore the translations package."

This reverts commit 25a8a7cd9a59f738277ce893318c69db539384d6.
Paulo Reis 10 سال پیش
والد
کامیت
8eae4e4044
3فایلهای تغییر یافته به همراه2 افزوده شده و 8 حذف شده
  1. 0 5
      services/web/Gruntfile.coffee
  2. 0 0
      services/web/npm-shrinkwrap.json
  3. 2 3
      services/web/package.json

+ 0 - 5
services/web/Gruntfile.coffee

@@ -17,7 +17,6 @@ module.exports = (grunt) ->
 	grunt.loadNpmTasks 'grunt-contrib-watch'
 	grunt.loadNpmTasks 'grunt-parallel'
 	grunt.loadNpmTasks 'grunt-exec'
-	grunt.loadNpmTasks 'grunt-custom-shrinkwrap'
 	# grunt.loadNpmTasks 'grunt-contrib-imagemin'
 	# grunt.loadNpmTasks 'grunt-sprity'
 
@@ -209,10 +208,6 @@ module.exports = (grunt) ->
 				options:
 					prop: 'commit'
 
-		customShrinkwrap:
-			defaultTarget:
-				options:
-					excludeDependencies: [ 'translations-sharelatex' ]
 
 		file_append:
 			default_options: files: [ {

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
services/web/npm-shrinkwrap.json


+ 2 - 3
services/web/package.json

@@ -56,16 +56,15 @@
     "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0",
     "sixpack-client": "^1.0.0",
     "temp": "^0.8.3",
-    "translations-sharelatex": "git+https://github.com/sharelatex/translations-sharelatex.git#master",
     "underscore": "1.6.0",
     "v8-profiler": "^5.2.3",
     "xml2js": "0.2.0"
   },
   "devDependencies": {
     "bunyan": "0.22.1",
+    "translations-sharelatex": "git+https://github.com/sharelatex/translations-sharelatex.git#master",
     "chai": "",
     "chai-spies": "",
-    "clean-css": "^3.4.18",
     "grunt-available-tasks": "0.4.1",
     "grunt-bunyan": "0.5.0",
     "grunt-contrib-clean": "0.5.0",
@@ -73,8 +72,8 @@
     "grunt-contrib-less": "0.9.0",
     "grunt-contrib-requirejs": "0.4.1",
     "grunt-contrib-watch": "^1.0.0",
-    "grunt-custom-shrinkwrap": "^0.1.0",
     "grunt-env": "0.4.4",
+    "clean-css": "^3.4.18",
     "grunt-exec": "^0.4.7",
     "grunt-execute": "^0.2.2",
     "grunt-file-append": "0.0.6",

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است