Commit 51a39688 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Corrige compilado tras rotura de dependencia pdfjs 

La fuente de la que se obtenía esta dependencia no permitía fijar una
versión concreta, ya que se reseteaba a cada nueva versión. Ahora, se ha
introducido la fuente original, fijada a una versión y se ha configurado
un proceso de compilado de la misma.
Se adapta la tarea de copia de pdfjs, para usar la salida compilada.
Elimina script de preinstalación, ya obsoleto porque pdfjs es ahora una
dependencia fijada en una versión (tag del repositorio), y deja de dar
conflictos debido a la sobreescritura que se hacía sobre la anterior
fuente.
Añade dependencias de desarrollo que permiten compilar pdfjs.
parent 1f0f7596

grunt/config/buildModules.js

+4 −0
Original line number Diff line number Diff line
@@ -3,6 +3,10 @@ module.exports = function(grunt) { 
	var preBuildCmds = ['yarn install'];



	grunt.config('redmicConfig.buildModules', {

		'public/javascript/pdfjs': [

			'npm install',

			'gulp generic'

		],

		'public/javascript/pruneCluster': [

			'npm install',

			'grunt build:dist --force'

grunt/config/copy.js

+2 −1
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ module.exports = function(grunt) { 
		distStylesSubPath = distPath + '/stylesheets',



		pdfjsPath = '/javascript/pdfjs/',

		srcPdfjsPath = publicPath + pdfjsPath,

		pdfjsBuildPath = 'build/generic/',

		srcPdfjsPath = publicPath + pdfjsPath + pdfjsBuildPath,

		distPdfjsPath = distPath + pdfjsPath,

		pdfjsWebName = 'web',

		pdfjsBuildName = 'build';

package.json

+3 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
  },

  "private": true,

  "scripts": {

    "preinstall": "depsToUnlock='pdfjs'; lockBefore=$(md5sum yarn.lock); for dep in $depsToUnlock; do echo \"Unlocking ${dep}\"; sed -i \"/${dep}@/,/^$/ d\" yarn.lock; done; lockAfter=$(md5sum yarn.lock); if [ \"${lockBefore}\" != \"${lockAfter}\" ]; then echo \"Some dependencies were unlocked, retry install in case of failure\"; fi",

    "start": "node app"

  },

  "dependencies": {
@@ -64,6 +63,8 @@ 
    "grunt-force-task": "^2.0.0",

    "grunt-git": "^1.0.9",

    "grunt-shell": "^2.1.0",

    "gulp": "^2.7.0",

    "gulp-cli": "^2.2.0",

    "handlebars": "^4.0.11",

    "intern": "^4.2.0",

    "jshint": "^2.9.5",
@@ -83,7 +84,7 @@ 
    "nib": "^1.1.2",

    "node-uuid": "https://github.com/kelektiv/node-uuid.git#v1.4.7",

    "packery": "^2.1.1",

    "pdfjs": "https://github.com/mozilla/pdf.js.git#gh-pages",

    "pdfjs": "https://github.com/mozilla/pdf.js.git#v2.3.200",

    "prunecluster": "https://github.com/pedroetb/PruneCluster.git",

    "put-selector": "^0.3.6",

    "sockjs-client": "^1.1.4",

yarn.lock

+1566 −10

File changed.

Preview size limit exceeded, changes collapsed.