Commit 6342614a authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Migra desde yarn v1 hacia npm, ajusta CI

parent e12d3af7

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ node_modules 
dist

.gitmodules.old

style.css

*.tgz

.gitlab-ci.yml

+4 −3
Original line number Diff line number Diff line
@@ -15,16 +15,17 @@ build-package: 
    WEB_BUILD_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/web-build

    WEB_BUILD_IMAGE_TAG: latest

  before_script:

    - type yarn grunt

    - yarn install

    - type grunt

    - npm install

  script:

    - grunt

    - grunt build

  dependencies: []

  artifacts:

    name: ${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}

    expire_in: 1 week

    paths:

      - dist/

      - redmic-project-style-*.tgz

  cache:

    paths:

      - node_modules/

grunt/config/buildModules.js

+2 −4
Original line number Diff line number Diff line 
module.exports = function(grunt) {



	var preBuildCmds = ['yarn install'];



	grunt.config('redmicConfig.buildModules', {

		'dep/pruneCluster': preBuildCmds.concat([

		'dep/pruneCluster': [

			'grunt uglify'

		])

		]

	});

};

package-lock.json

0 → 100644
+3444 −0

File added.

Preview size limit exceeded, changes collapsed.

yarn.lock

deleted100644 → 0
+0 −1865

File deleted.

Preview size limit exceeded, changes collapsed.