management: Merge pull request #328 from udistrital/release/1.0.0

master <-- Release/1.0.0
udistrital · Jul 15, 2022 · 9b50128 · 9b50128
2 parents d26d825 + ffec6d8
commit 9b50128
Show file tree

Hide file tree

Showing 62 changed files with 12,639 additions and 2,903 deletions.
diff --git a/.bowerrc b/.bowerrc
diff --git a/.drone.yml b/.drone.yml
@@ -1,57 +1,78 @@
 kind: pipeline
 name: oas_cliente_ci
 
+trigger:
+  event:
+    exclude:
+      - tag
+
 steps:
 - name: check_readme
+  failure: ignore
   image: jjvargass/qa_develoment:latest
   commands:
   - python /app/check_readme.py
   when:
     branch:
     - develop
     - feature/*
+    - hotfix/*
     - release/*
     event:
     - push
 
 - name: check_branch
+  failure: ignore
   image: jjvargass/qa_develoment:latest
   commands:
   - python /app/check_branch.py -H ${DRONE_GIT_HTTP_URL}
   when:
     branch:
     - develop
     - feature/*
+    - hotfix/*
     - release/*
     event:
     - push
 
+# SCRIPT NO OBJETIVO:
+# No tiene en cuenta un intervalo de commits sino un intervalo de
+# fechas, y adicionalmente está contando mal los commit multilinea.
+# Step ignorado, aunque deberá ajustarse la imágen docker
 - name: check_commits
+  failure: ignore
   image: jjvargass/qa_develoment:latest
   commands:
-  - python /app/check_commits.py
+    - python /app/check_commits.py
   when:
     branch:
-    - develop
-    - feature/*
-    - release/*
+      - develop
+      - feature/*
+      - hotfix/*
+      - release/*
     event:
-    - push
+      - push
+
+- name: prueba-unitarias
+  failure: ignore
+  image: node:10
+  commands:
+    - yarn
+    - yarn run test
+  when:
+    branch:
+      - develop
+      - feature/*
+      - hotfix/*
+      - master
+      - release/*
+      - unitest
 
-# - name: prueba-unitarias
-#   image: node:12.6.0
-#   commands:
-#   - npm i
-#   - npm run test
-#   when:
-#     branch:
-#     - unitest
-#
 # - name:  pruebas-linter
 #   image: node:12.6.0
 #   commands:
-#   - npm i
-#   - npm run lint
+#   - yarn
+#   - yarn run lint
 #   when:
 #     branch:
 #     - unitest
@@ -67,37 +88,38 @@ steps:
     branch:
     - develop
     - feature/*
+    - hotfix/*
+    - master
     - release/*
     event:
     - push
 
 - name: build_release
   image: node:10.7.0
   commands:
-   - npm install -g grunt-cli bower
-   - npm install natives
-   - npm install
-   - bower install --allow-root
+   - yarn
    - cp -f app/scripts/environment/environment_test.js app/scripts/environment/environment.js
-   - grunt build
+   - yarn run build
   when:
     branch:
+    - develop
+    - dependabot/**
+    - feature/*
+    - hotfix/*
     - release/*
     event:
     - push
 
 - name: build_master
   image: node:10.7.0
   commands:
-   - npm install -g grunt-cli bower
-   - npm install natives
-   - npm install
-   - bower install --allow-root
+   - yarn
    - cp -f app/scripts/environment/environment_prod.js app/scripts/environment/environment.js
-   - grunt build
+   - yarn run build
   when:
     branch:
     - master
+    - hotfix/*
     event:
     - push
 

diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,8 @@
-/node_modules
-/dist
-/.tmp
-/.sass-cache
-/bower_components
+node_modules
+dist
+*.tmp
+*.log
+.sass-cache
 .DS_Store
-.sonar/report-task.txt
-.sonar/.sonar_lock
+.sonar
+package-lock.json
diff --git a/.yo-rc.json b/.yo-rc.json
@@ -5,7 +5,7 @@
     "browsers": "PhantomJS",
     "app-files": "app/scripts/**/*.js",
     "files-comments": "bower:js,endbower",
-    "bower-components-path": "bower_components",
+    "bower-components-path": "node_modules/@bower_components",
     "test-files": "test/mock/**/*.js,test/spec/**/*.js"
   }
 }
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -24,7 +24,7 @@ module.exports = function (grunt) {
 
   // Configurable paths for the application
   var appConfig = {
-    app: require('./bower.json').appPath || 'app',
+    app: 'app',
     dist: 'dist'
   };
 
@@ -36,10 +36,6 @@ module.exports = function (grunt) {
 
     // Watches files for changes and runs tasks based on the changed files
     watch: {
-      bower: {
-        files: ['bower.json'],
-        tasks: ['wiredep']
-      },
       core: {
         files: ['<%= yeoman.app %>/core/**/*.js'],
         tasks: ['newer:jshint:all', 'newer:jscs:all'],
@@ -92,8 +88,8 @@ module.exports = function (grunt) {
             return [
               connect.static('.tmp'),
               connect().use(
-                '/bower_components',
-                connect.static('./bower_components')
+                '/node_modules/@bower_components',
+                connect.static('./node_modules/@bower_components')
               ),
               connect().use(
                 '/app/styles',
@@ -112,8 +108,8 @@ module.exports = function (grunt) {
               connect.static('.tmp'),
               connect.static('test'),
               connect().use(
-                '/bower_components',
-                connect.static('./bower_components')
+                '/node_modules/@bower_components',
+                connect.static('./node_modules/@bower_components')
               ),
               connect.static(appConfig.app)
             ];
@@ -210,30 +206,6 @@ module.exports = function (grunt) {
       }
     },
 
-    // Automatically inject Bower components into the app
-    wiredep: {
-      app: {
-        src: ['<%= yeoman.app %>/index.html'],
-        ignorePath: /\.\.\//
-      },
-      test: {
-        devDependencies: true,
-        src: '<%= karma.unit.configFile %>',
-        ignorePath: /\.\.\//,
-        fileTypes: {
-          js: {
-            block: /(([\s\t]*)\/{2}\s*?bower:\s*?(\S*))(\n|\r|.)*?(\/{2}\s*endbower)/gi,
-            detect: {
-              js: /'(.*\.js)'/gi
-            },
-            replace: {
-              js: '\'{{filePath}}\','
-            }
-          }
-        }
-      }
-    },
-
     // Renames files for browser caching purposes
     filerev: {
       dist: {
@@ -408,7 +380,7 @@ module.exports = function (grunt) {
           dest: '<%= yeoman.dist %>/core'
         }, {
           expand: true,
-          cwd: 'bower_components/angular-ui-grid/fonts',
+          cwd: 'node_modules/@bower_components/angular-ui-grid/fonts',
           src: ['*.eot', '*.svg', '*.ttf', '*.woff'],
           dest: '<%= yeoman.dist %>/styles/fonts/'
         }, {
@@ -423,7 +395,7 @@ module.exports = function (grunt) {
           src: ['generated/*']
         }, {
           expand: true,
-          cwd: 'bower_components/bootstrap/dist',
+          cwd: 'node_modules/@bower_components/bootstrap/dist',
           src: 'fonts/*',
           dest: '<%= yeoman.dist %>'
         }]
@@ -491,7 +463,6 @@ module.exports = function (grunt) {
 
     grunt.task.run([
       'clean:server',
-      'wiredep',
       'concurrent:server',
       'postcss:server',
       'connect:livereload',
@@ -506,29 +477,6 @@ module.exports = function (grunt) {
 
   grunt.registerTask('test', [
     'clean:server',
-    'wiredep',
-    'concurrent:test',
-    'postcss',
-    'connect:test',
-    'karma'
-  ]);
-
-  grunt.registerTask('default', [
-    'newer:jshint',
-    'newer:jscs',
-    'test',
-    'build'
-  ]);
-
-
-  grunt.registerTask('server', 'DEPRECATED TASK. Use the "serve" task instead', function (target) {
-    grunt.log.warn('The `server` task has been deprecated. Use `grunt serve` to start a server.');
-    grunt.task.run(['serve:' + target]);
-  });
-
-  grunt.registerTask('test', [
-    'clean:server',
-    'wiredep',
     'concurrent:test',
     'postcss',
     'connect:test',
@@ -537,15 +485,13 @@ module.exports = function (grunt) {
 
   grunt.registerTask('build', [
     'clean:dist',
-    'wiredep',
     'useminPrepare',
     'concurrent:dist',
     'postcss',
     'ngtemplates',
     'concat',
     'ngAnnotate',
     'copy:dist',
-    'cdnify',
     'cssmin',
     'uglify',
     'filerev',
@@ -559,4 +505,4 @@ module.exports = function (grunt) {
     'test',
     'build'
   ]);
-};
+};