Commit cc717fe9 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Optimiza compilado, mueve salida de log a raíz 

Limita el número de procesos de compilado a 1, para evitar que mueran de
inanición.

Marca como AMD algunas dependencias.

Mueve salida de log del proceso de compilado a raíz y la añade a los
artifacts del job CI.
parent 47ba02d7

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -2,5 +2,6 @@ node_modules 
dist

test_reports

.gitmodules.old

build-report.txt

*.tar.gz

*.log

.gitlab-ci.build.yml

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ prepare-built-version: 
    expire_in: 1 month

    paths:

      - dist*.tar.gz

      - build-report.txt

  rules:

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_PIPELINE_SOURCE == "schedule"

grunt/config/cleanBuiltApp.js

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ module.exports = function(grunt) { 
		strippedFiles = '*.' + strippedSuffix,

		uncompressedFiles = '*.' + uncompressedSuffix,



		filesToDelete = [strippedFiles, uncompressedFiles, 'build-report.txt'],

		filesToDelete = [strippedFiles, uncompressedFiles],

		filesToKeep = ['dojo/dojo.js', 'dojo/resources/blank.gif', 'dojox/widget/ColorPicker/images/*.png'];



	grunt.config('redmicConfig.resourcesToCleanInBuiltApp', {

redmic.profile.js

+7 −5
Original line number Diff line number Diff line
@@ -29,12 +29,12 @@ var profileObj = { 
	releaseDir: '../../dist',

	releaseName: 'javascript',

	action: 'release',

	layerOptimize: 'closure.keeplines',

	optimize: 'closure.keeplines',

	layerOptimize: 'closure',

	optimize: 'closure',

	optimizeOptions: {

		languageIn: 'ECMASCRIPT_2017',

		languageOut: 'ECMASCRIPT_2015',

		compilationLevel: 'SIMPLE'

		compilationLevel: 'SIMPLE_OPTIMIZATIONS'

	},

	cssOptimize: 'comments',

	mini: true,
@@ -43,6 +43,8 @@ var profileObj = { 
	locale: includeLocales[0],

	localeList: includeLocales.join(','),

	useSourceMaps: false,

	buildReportDir: '../..',

	maxOptimizationProcesses: 1,



	resourceTags: {

		amd: amdTagger,
@@ -218,7 +220,7 @@ var profileObj = { 
		name: 'leaflet-measure',

		location: 'leaflet-measure/dist',

		resourceTags: {

			copyOnly: copyOnlyTagger,

			amd: amdTagger,

			ignore: ignoreTagger.bind(null, [

				'leaflet-measure/leaflet-measure.es',

				'leaflet-measure/leaflet-measure.en'
@@ -261,7 +263,7 @@ var profileObj = { 
		name: 'd3',

		location: 'd3/dist',

		resourceTags: {

			copyOnly: copyOnlyTagger,

			amd: amdTagger,

			ignore: ignoreTagger.bind(null, 'd3/d3.min')

		}

	},{