Commit 448ad135 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Retoca compilado y mueve index de server-app 

Revisa proceso de copia de recursos de compilado, para recoger los
ficheros de server-app en su nueva ubicación.

Coloca a primer nivel, dentro de server-app, al fichero principal de la
aplicación Node. De esta manera, se puede referenciar directamente sólo
con el nombre del directorio.
parent e43305ae

grunt/task/packageApp.js

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ module.exports = function(grunt) { 
			},

			command: [

				'version=$(node -p "require(\'./package.json\').version")',

				'tar -acf dist-v$version.tar.gz dist/ views/ app/ package.json yarn.lock README.md LICENSE'

				'tar -acf dist-v$version.tar.gz dist/ server-app/ package.json yarn.lock README.md LICENSE'

			].join('; ')

		});

package.json

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
  },

  "private": true,

  "scripts": {

    "start": "node server-app/src"

    "start": "node server-app"

  },

  "dependencies": {

    "commander": "11.1.0",
@@ -85,7 +85,7 @@ 
    "node": ">=16.0",

    "npm": ">=8.19"

  },

  "main": "server-app/src",

  "main": "server-app",

  "license": "AGPL-3.0-or-later",

  "dojoBuild": "redmic.profile.js"

}

server-app/src/index.js→server-app/index.js

+6 −6
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ try { 
		encoding: 'utf8'

	}).trim();

} catch (e) {

	const packageJson = require('../../package.json');

	const packageJson = require('../package.json');



	version = packageJson.version;

}



const params = require('./params')(version),

	logging = require('./logging'),

const params = require('./src/params')(version),

	logging = require('./src/logging'),

	logger = logging.logger;



let cluster;
@@ -37,9 +37,9 @@ if (cluster && cluster.isMaster) { 
	const express = require('express'),

		http = require('http'),



		metrics = require('./metrics')(logger, '/metrics'),

		prerender = require('./prerender')(logger),

		exposure = require('./exposure')(logger, params, version),

		metrics = require('./src/metrics')(logger, '/metrics'),

		prerender = require('./src/prerender')(logger),

		exposure = require('./src/exposure')(logger, params, version),



		port = params.port,

		debug = params.debug,