vanilla-jet 1.0.27 → 1.0.29

package/.github/workflows/deploy.yml

@@ -0,0 +1,58 @@
+name: Publish to npm
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  release:
+    name: Publish
+    runs-on: ubuntu-latest
+    environment: rep
+
+    steps:
+    - name: Check out the repository
+      uses: actions/checkout@v3
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v3
+      with:
+        node-version: '20'
+        registry-url: 'https://registry.npmjs.org/'
+        cache: 'npm'
+
+    - name: Install dependencies
+      run: npm install
+
+    - name: Publish to npm
+      env:
+        NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+      run: npm publish
+
+    - name: Configure git identity
+      run: |
+        git config --global user.email "actions@github.com"
+        git config --global user.name "GitHub Actions"
+
+    - name: Get version from package.json
+      id: get_version
+      run: echo "::set-output name=version::$(node -p "require('./package.json').version")"
+
+    - name: Check if tag exists
+      run: |
+        if git rev-parse v${{ steps.get_version.outputs.version }} >/dev/null 2>&1; then
+          echo "Tag v${{ steps.get_version.outputs.version }} already exists"
+        fi
+
+    - name: Remove existing tag if exists
+      run: |
+        if git rev-parse v${{ steps.get_version.outputs.version }} >/dev/null 2>&1; then
+          git push --delete origin v${{ steps.get_version.outputs.version }}
+          git tag -d v${{ steps.get_version.outputs.version }}
+        fi
+
+    - name: Create tag
+      run: |
+        git tag -a v${{ steps.get_version.outputs.version }} -m "Version ${{ steps.get_version.outputs.version }}"
+        git push origin v${{ steps.get_version.outputs.version }}

package/.grunt/build_styles_task.js

@@ -1,9 +1,21 @@
 module.exports = function(grunt) {
     grunt.registerTask('buildLess', 'Compile admin.less and add .section.less', function() {
-        let adminContent = grunt.file.read('assets/styles/less/admin.less');
+
+        // -- Functions
+        function getCleanedCWD() {
+            const cwd = process.cwd();
+            return cwd
+                .replace('/node_modules', '')
+                .replace('/vanilla-jet', '')
+                .replace('/.grunt', '');
+        }
+        console.log('cwd 1: ', getCleanedCWD());
+
+        // -- Content
+        let adminContent = grunt.file.read(`${getCleanedCWD()}/assets/styles/less/admin.less`);
         let sectionFiles = grunt.file.expand([
-            'assets/styles/less/sections/**/*.section.less',
-            'assets/styles/less/sections/*.section.less'
+            `${getCleanedCWD()}/assets/styles/less/sections/**/*.section.less`,
+            `${getCleanedCWD()}/assets/styles/less/sections/*.section.less`
         ]);
         
         let combinedContent = adminContent + '\n';
@@ -13,7 +25,7 @@ module.exports = function(grunt) {
         });
  
        // -- New file
-       grunt.file.write('assets/styles/less/admin_build.less', combinedContent);
+       grunt.file.write(`${getCleanedCWD()}/assets/styles/less/admin_build.less`, combinedContent);
        grunt.task.run(['less']);
     });
  };

package/.grunt/compile_html.js

@@ -201,7 +201,7 @@ async function createHTMLFile(content, filePath) {
     fs.mkdirSync(publicPath, { recursive: true });
     const absolutePath = path.join(publicPath, filePath);
     fs.writeFileSync(absolutePath, minified, 'utf8');
-    console.log(`Html file created at: ${absolutePath}`);
+    console.log(`Html :) file created at: ${absolutePath}`);
 }
 
 // -- Helpers

package/.scripts/generate_packages_json.js

@@ -2,9 +2,6 @@
 const path = require("path"),
 	fs = require("fs");
 
-// -- Call main
-main();
-
 // -- Main function
 async function main() {
 
@@ -46,4 +43,6 @@ function processCwd() {
     return process.cwd()
         .replace('/.grunt', '')
         .replace('/.scripts', '');
-}
+}
+
+module.exports = main;

package/Gruntfile.js

@@ -5,6 +5,7 @@ module.exports = function(grunt) {
     //compress: 'grunt-contrib-compress',
     clean: 'grunt-contrib-clean'
   });
+  grunt.option('force', true);
 
   // -- Load modules
   grunt.loadNpmTasks('grunt-contrib-cssmin');
@@ -14,10 +15,33 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-run');
   require('./.grunt/build_styles_task')(grunt);
 
+  // -- Functions
+  function getCleanedCWD() {
+    const cwd = process.cwd();
+    let newCwd = cwd
+      .replace('/node_modules', '')
+      .replace('/vanilla-jet', '')
+      .replace('/.grunt', '');
+    //console.log('cwd: ', newCwd);
+    return newCwd;
+  }
+  
+
+  // -- Vars
+  const cssDestination = `${getCleanedCWD()}/public/styles/app.min.css`;
+  const cssOrigin = `${getCleanedCWD()}/assets/styles/less/admin_build.less`;
+  const jsDestination = `${getCleanedCWD()}/public/`;
+
+  // -- Init
   grunt.initConfig({
     clean: {
-      build: ['public/scripts/vanilla.min.js'],
-      minified: ['public/scripts/api', 'public/scripts/controllers', 'public/scripts/views', 'public/scripts/app.min.js']
+      build: [`${getCleanedCWD()}/public/scripts/vanilla.min.js`],
+      minified: [
+        `${getCleanedCWD()}/public/scripts/api`, 
+        `${getCleanedCWD()}/public/scripts/controllers`, 
+        `${getCleanedCWD()}/public/scripts/views`, 
+        `${getCleanedCWD()}/public/scripts/app.min.js`
+      ],
       //minified: ['public/scripts/**/*.min.js', 'public/scripts/*', '!public/scripts/vanilla.min.js']
     },
     less: {
@@ -29,7 +53,7 @@ module.exports = function(grunt) {
           strictImports: true
         },
         files: {
-          'public/styles/app.min.css' : 'assets/styles/less/admin_build.less'
+          [cssDestination] : cssOrigin
         },
       }
     },
@@ -39,10 +63,10 @@ module.exports = function(grunt) {
       },
       styles: {
         files: [
-          'assets/styles/less/*.less', 
-          'assets/styles/less/**/*.less', 
-          'assets/styles/less/**/**/*.less',
-          '!assets/styles/less/admin_build.less'
+          `${getCleanedCWD()}/assets/styles/less/*.less`, 
+          `${getCleanedCWD()}/assets/styles/less/**/*.less`, 
+          `${getCleanedCWD()}/assets/styles/less/**/**/*.less`,
+          `${getCleanedCWD()}/!assets/styles/less/admin_build.less`
         ],
         tasks: ['buildLess'],
         options: {
@@ -51,17 +75,21 @@ module.exports = function(grunt) {
       },
       scripts: {
         files: [
-          'assets/pages/*.html',
-          'assets/templates/**/*.html',
-          'assets/templates/**/**/*.html',
-          'external/view/*.js',
-          'external/*.js',
-          'framework/*.js'
+          `${getCleanedCWD()}/assets/pages/*.html`,
+          `${getCleanedCWD()}/assets/templates/**/*.html`,
+          `${getCleanedCWD()}/assets/templates/**/**/*.html`,
+          `${getCleanedCWD()}/external/view/*.js`,
+          `${getCleanedCWD()}/external/*.js`,
+          `${getCleanedCWD()}/framework/*.js`
         ],
         tasks: ['shell:compileTemplates']
       },
       specificScripts: {
-        files: ['assets/scripts/*.js', 'assets/scripts/**/*.js', 'assets/scripts/**/**/*.js'],
+        files: [
+          `${getCleanedCWD()}/assets/scripts/*.js`, 
+          `${getCleanedCWD()}/assets/scripts/**/*.js`, 
+          `${getCleanedCWD()}/assets/scripts/**/**/*.js`
+        ],
         tasks: ['uglify', 'clean:build', 'concat', 'clean:minified']
       }
     },
@@ -86,20 +114,21 @@ module.exports = function(grunt) {
 				files: [{
           expand: true,
           src: [
-          	'assets/scripts/*.js',
-      			'assets/scripts/**/*.js',
-          	'assets/scripts/**/**/*.js',
-          	'assets/scripts/**/**/**/*.js'
+          	`${getCleanedCWD()}/assets/scripts/*.js`,
+      			`${getCleanedCWD()}/assets/scripts/**/*.js`,
+          	`${getCleanedCWD()}/assets/scripts/**/**/*.js`,
+          	`${getCleanedCWD()}/assets/scripts/**/**/**/*.js`
           ],
-    			dest: 'public/',
-					cwd: '',
+    			dest: getCleanedCWD() + '/public',
 					rename  : function (dest, src) {
 
 						var folder = src.substring(0, src.lastIndexOf('/')),
 							  filename  = src.substring(src.lastIndexOf('/'), src.length);
       			filename  = filename.substring(0, filename.lastIndexOf('.'));
-      			folder = folder.replaceAll('assets', '');
-						return dest + folder + filename + '.min.js';
+      			folder = folder.replaceAll('assets/', 'public/');
+            let file = folder + filename + '.min.js';
+            //console.log('file: ', file);
+						return file;
 					}
 				}]
 			}
@@ -108,17 +137,17 @@ module.exports = function(grunt) {
       build: {
         src: [
           // Order
-          'public/scripts/controllers/**/*.min.js',
-          'public/scripts/views/**/*.min.js',
-          'public/scripts/api/**/*.min.js',
-          'public/scripts/*.min.js',
+          `${getCleanedCWD()}/public/scripts/controllers/**/*.min.js`,
+          `${getCleanedCWD()}/public/scripts/views/**/*.min.js`,
+          `${getCleanedCWD()}/public/scripts/api/**/*.min.js`,
+          `${getCleanedCWD()}/public/scripts/*.min.js`,
 
           // Ignore files
-          '!public/scripts/core/**',
-          '!public/scripts/plugins/**',
-          '!public/scripts/plugins/ui/**'
+          `!${getCleanedCWD()}/public/scripts/core/**`,
+          `!${getCleanedCWD()}/public/scripts/plugins/**`,
+          `!${getCleanedCWD()}/public/scripts/plugins/ui/**`
         ],
-        dest: 'public/scripts/vanilla.min.js'
+        dest: `${getCleanedCWD()}/public/scripts/vanilla.min.js`
       }
     },
     compress: {
@@ -128,7 +157,7 @@ module.exports = function(grunt) {
         },
         files: [{
           expand: true,
-          src: ['public/scripts/vanilla.min.js'],
+          src: [`${getCleanedCWD()}/public/scripts/vanilla.min.js`],
           dest: '',
           ext: '.min.js.gz'
         }]
@@ -141,7 +170,11 @@ module.exports = function(grunt) {
     }
   });
   
-  grunt.registerTask('default', ['buildLess', 'uglify', 'clean:build', 'concat', 'clean:minified', 'shell:compileTemplates', 'watch']);
-  grunt.registerTask('build', ['buildLess', 'uglify', 'clean:build', 'concat', 'clean:minified', 'shell:compileTemplates']);
+  grunt.registerTask('cleanForce', function(target) {
+    grunt.option('force', true);
+    grunt.task.run('clean:' + target);
+  });
+  grunt.registerTask('default', ['buildLess', 'uglify', 'cleanForce:build', 'concat', 'cleanForce:minified', 'shell:compileTemplates', 'watch']);
+  grunt.registerTask('build', ['buildLess', 'uglify', 'cleanForce:build', 'concat', 'cleanForce:minified', 'shell:compileTemplates']);
   grunt.registerTask('server', ['buildLess']);
 };

package/bin.js

@@ -1,9 +1,38 @@
 #!/usr/bin/env node
 
 const path = require('path');
+const args = process.argv.slice(2);
+const { execSync } = require('child_process');
 
-const generate_packes_script_path = path.join(__dirname, './.scripts/generate_packages_json.js');
-require(generate_packes_script_path);
+const generatePackagesJson = require(path.join(__dirname, './.scripts/generate_packages_json.js'));
 
-const grunt_compile_html_path = path.join(__dirname, './.grunt/compile_html.js');
-require(grunt_compile_html_path);
+switch (args[0]) {
+
+    case 'setup':
+        generatePackagesJson();
+        break;
+    
+    case 'dev':
+        try {
+            execSync('grunt --env=development', { stdio: 'inherit', cwd: __dirname });
+        } catch (error) {
+            console.error('Error ejecutando grunt:', error.message);
+        }
+        break;
+
+    case 'qa':
+        try {
+            execSync('grunt --env=qa', { stdio: 'inherit', cwd: __dirname });
+        } catch (error) {
+            console.error('Error ejecutando grunt:', error.message);
+        }
+        break;
+
+    case 'prod':
+        try {
+            execSync('grunt --env=production', { stdio: 'inherit', cwd: __dirname });
+        } catch (error) {
+            console.error('Error ejecutando grunt:', error.message);
+        }
+        break;
+}

package/framework/dipper.js

@@ -566,9 +566,12 @@ Dipper.prototype.includeEnvironment = function() {
 // -- Helpers
 Dipper.prototype.processCwd = function() {
 
-	return process.cwd()
+	let cwd = process.cwd()
 		.replace('/.grunt', '')
-		.replace('/.scripts', '');
+		.replace('/.scripts', '')
+		.replace('/node_modules', '')
+		.replace('/vanilla-jet', '');
+	return cwd;
 }
 
 Dipper.prototype.openJsonFile = function(fileName) {

package/framework/functions.js

@@ -18,7 +18,7 @@ class Functions {
         let json = dipper.openJsonFile('vanillaJet.package.json');
 
         // -- Google Fonts
-        if (json.fonts && Object.keys(json.fonts).length > 0) {
+        if (json.fonts && json.fonts.length > 0) {
             dipper.registerStyle('google-fonts', dipper.get_google_fonts(json.fonts));
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vanilla-jet",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "description": "VannilaJet framework",
   "main": "index.js",
   "bin": {
@@ -11,7 +11,6 @@
     "dev": "grunt --env=development",
     "build:qa": "grunt build --env=qa",
     "build:prod": "grunt build --env=production",
-    "start": "pm2 start index.js -- --p production",
     "test": "npm run test"
   },
   "repository": {
@@ -37,9 +36,7 @@
     "minimist": "1.2.6",
     "nunjucks": "3.2.4",
     "underscore": ">= 1.12.x",
-    "zlib": "1.0.5"
-  },
-  "devDependencies": {
+    "zlib": "1.0.5",
     "grunt": "1.6.1",
     "grunt-cli": "1.4.3",
     "grunt-contrib-clean": "2.0.1",