build(ui-grid): fix build task after file moves

Ensure the repository can still publish and work after re-organization of files.

Author: Portugal, Marcelo

grunt/concat.js

@@ -6,23 +6,23 @@ const getLanguages = p => fs.readdirSync(p).filter(f => fs.statSync(path.join(p,
 
 function getFiles() {
 	const files = {
-		'<%= dist %>/release/<%= pkg.name %>.js': ['src/js/core/bootstrap.js', 'src/js/**/*.js', 'src/features/*/js/**/*.js', '.tmp/template.js'],
-		'<%= dist %>/release/<%= pkg.name %>.core.js': ['src/js/core/bootstrap.js', 'src/js/core/**/*.js', 'src/js/i18n/ui-i18n.js',
-			'src/js/i18n/en.js', '.tmp/template.js']
+		'<%= dist %>/release/<%= pkg.name %>.js': ['packages/core/src/js/bootstrap.js', 'packages/**/src/js/**/*.js', '.tmp/template.js'],
+		'<%= dist %>/release/<%= pkg.name %>.core.js': ['src/js/core/bootstrap.js', 'packages/core/src/js/**/*.js', '.tmp/template.js']
 	};
-	const features = getDirectories('src/features/');
+	const packages = getDirectories('packages/');
 
-	features.forEach((feat) => {
-		files[`<%= dist %>/release/<%= pkg.name %>.${feat}.js`] = [`src/features/${feat}/js/**/*.js`];
-	});
-
-	const languages = getLanguages('src/js/i18n/')
-		.filter((lang) => lang !== 'en.js' && lang !== 'ui-i18n.js');
+	packages.forEach((feat) => {
+		if (feat === 'i18n') {
+			const languages = getLanguages('packages/i18n/src/js/');
 
-	files['<%= dist %>/release/i18n/<%= pkg.name %>.language.all.js'] = languages.map((lang) => `src/js/i18n/${lang}`);
+			files['<%= dist %>/release/i18n/<%= pkg.name %>.language.all.js'] = languages.map((lang) => `packages/i18n/src/js/${lang}`);
 
-	languages.forEach((lang) => {
-		files[`<%= dist %>/release/i18n/<%= pkg.name %>.language.${lang}`] = [`src/js/i18n/${lang}`];
+			languages.forEach((lang) => {
+				files[`<%= dist %>/release/i18n/<%= pkg.name %>.language.${lang}`] = [`packages/i18n/src/js/${lang}`];
+			});
+		} else if (feat !== 'core') {
+			files[`<%= dist %>/release/<%= pkg.name %>.${feat}.js`] = [`packages/${feat}/src/js/**/*.js`];
+		}
 	});
 
 	return files;

grunt/copy.js

@@ -22,25 +22,25 @@ module.exports = function ( grunt ) {
       files: [
         {
           expand: true,
-          cwd: 'src/font',
+          cwd: 'packages/core/src/font',
           src: '**/*.eot',
           dest: '<%= dist %>/release/fonts'
         },
         {
           expand: true,
-          cwd: 'src/font',
+          cwd: 'packages/core/src/font',
           src: '**/*.svg',
           dest: '<%= dist %>/release/fonts'
         },
         {
           expand: true,
-          cwd: 'src/font',
+          cwd: 'packages/core/src/font',
           src: '**/*.ttf',
           dest: '<%= dist %>/release/fonts'
         },
         {
           expand: true,
-          cwd: 'src/font',
+          cwd: 'packages/core/src/font',
           src: '**/*.woff',
           dest: '<%= dist %>/release/fonts'
         }
@@ -70,15 +70,19 @@ module.exports = function ( grunt ) {
       files: [
         {
           expand: true,
-          cwd: 'src/less',
+          cwd: 'packages/core/src/less',
           src: '**/*.less',
           dest: '<%= dist %>/less'
         },
         {
           expand: true,
-          cwd: 'src/features',
+          flatten: true,
+          cwd: 'packages',
           src: '**/*.less',
-          dest: '<%= dist %>/less'
+          dest: '<%= dist %>/less',
+          filter: function(filepath) {
+            return !filepath.includes('packages/core/src/less');
+          }
         },
         {
           expand: true,
@@ -92,15 +96,19 @@ module.exports = function ( grunt ) {
       files: [
         {
           expand: true,
-          cwd: 'src/less',
+          cwd: 'packages/core/src/less',
           src: '**/*.less',
           dest: '<%= dist %>/release/less'
         },
         {
           expand: true,
-          cwd: 'src/features',
+          flatten: true,
+          cwd: 'packages',
           src: '**/*.less',
-          dest: '<%= dist %>/release/less'
+          dest: '<%= dist %>/release/less',
+          filter: function(filepath) {
+            return !filepath.includes('packages/core/src/less');
+          }
         }
       ]
     },

grunt/jscs.js

@@ -1,6 +1,6 @@
 module.exports = {
   files: {
-    src: ['src/**/*.js', 'src/features/*/js/**/*.js', 'src/features/*/test/**/*.spec.js', 'test/**/*.spec.js'],
+    src: ['packages/*/src/**/*.js', 'packages/*/test/**/*.spec.js', 'test/**/*.spec.js'],
   },
   options: {
     config: '.jscs.json'

grunt/jshint.js

@@ -67,6 +67,6 @@ module.exports = {
     src: 'Gruntfile.js'
   },
   src_test: {
-    src: ['src/**/*.js', 'src/features/*/js/**/*.js', 'src/features/*/test/**/*.spec.js', 'test/**/*.spec.js']
+    src: ['packages/*/src/**/*.js', 'packages/*/test/**/*.spec.js', 'test/**/*.spec.js']
   }
 };

grunt/karma.js

@@ -16,7 +16,7 @@ module.exports = function( grunt ){
       reporters: ['progress'],
       reportSlowerThan: 200,
       preprocessors: {
-        'src/**/*.js': ['coverage'],
+        'packages/**/*.js': ['coverage'],
         '**/*.html': ['ng-html2js']
       },
       ngHtml2JsPreprocessor: {

grunt/less.js

@@ -4,17 +4,29 @@ module.exports = {
     options: {
       banner: '<%= banner %>'
     },
-    files: {
-      'dist/release/<%= pkg.name %>.css': ['src/less/main.less', 'src/features/*/less/**/*.less', '.tmp/font/ui-grid-codes.css']
-    }
+    files: [
+      {
+        src: ['packages/core/src/less/main.less', 'packages/*/src/less/**/*.less', '.tmp/font/ui-grid-codes.css'],
+        dest: 'dist/release/<%= pkg.name %>.css',
+        filter: function(filepath) {
+          return filepath === 'packages/core/src/less/main.less' || !filepath.includes('packages/core/src/less/');
+        }
+      }
+    ]
   },
   min: {
     options: {
       banner: '<%= banner %>',
       compress: true
     },
-    files: {
-      'dist/release/<%= pkg.name %>.min.css': ['src/less/main.less', 'src/features/*/less/**/*.less', '.tmp/font/ui-grid-codes.css']
-    }
+    files: [
+      {
+        src: ['packages/core/src/less/main.less', 'packages/*/src/less/**/*.less', '.tmp/font/ui-grid-codes.css'],
+        dest: 'dist/release/<%= pkg.name %>.min.css',
+        filter: function(filepath) {
+          return filepath === 'packages/core/src/less/main.less' || !filepath.includes('packages/core/src/less/');
+        }
+      }
+    ]
   }
 };

grunt/ngtemplates.js

@@ -1,18 +1,18 @@
 module.exports = {
   'uigrid': {
     // Look for templates in src and in feature template directories
-    src: ['src/templates/**/*.html', 'src/features/*/templates/**/*.html'],
+    src: ['packages/*/src/templates/**/*.html'],
     dest: '.tmp/template.js',
     options: {
       module: 'ui.grid',
       htmlmin:  { collapseWhitespace: true, collapseBooleanAttributes: true },
       // Strip .html extension
       url: function(url) {
-        // Remove the src/templates/ prefix
-        url = url.replace(/^src\/templates\//, '');
+        // Remove the packages/feature/src/templates/ prefix
+        url = url.replace(/^packages\/[^\/]+?\/src\/templates\/ui-grid/, 'ui-grid');
 
         // Replace feature prefix with just 'ui-grid'
-        url = url.replace(/^src\/features\/[^\/]+?\/templates/, 'ui-grid');
+        url = url.replace(/^packages\/[^\/]+?\/src\/templates/, 'ui-grid');
 
         // Remove the .html extension
         return url.replace('.html', '');

grunt/watch.js

@@ -10,7 +10,7 @@ module.exports = function( grunt, options ){
     },
 
     ngtemplates: {
-      // files: ['src/templates/**/*.html', 'src/features/*/templates/**/*.html'],
+      // files: ['packages/*/src/templates/**/*.html'],
       files: '<%= ngtemplates.uigrid.src %>',
       tasks: ['ngtemplates']
     },

lib/grunt/utils.js

@@ -14,14 +14,14 @@ var util = module.exports = {
   },
 
   testFiles: {
-    unit: ['src/js/core/bootstrap.js', 'src/js/**/*.js', 'test/unit/**/*.spec.js', 'src/features/*/js/**/*.js', 'src/features/*/test/**/*.spec.js', '.tmp/template.js'],
-    core_unit: ['src/js/core/bootstrap.js', 'src/js/**/*.js', 'test/unit/**/*.spec.js', 'src/features/*/js/**/*.js', '.tmp/template.js'],
+    unit: ['packages/core/src/js/bootstrap.js', 'packages/core/src/js/**/*.js', 'packages/core/test/**/*.spec.js', 'packages/*/src/js/**/*.js', 'packages/*/test/**/*.spec.js', '.tmp/template.js'],
+    core_unit: ['packages/core/src/js/bootstrap.js', 'packages/core/src/js/**/*.js', 'packages/core/test/**/*.spec.js', 'packages/*/src/js/**/*.js', '.tmp/template.js'],
   },
   testFilesFeature: function(featureName){
-    var featurePattern = 'src/features/' + featureName +'/test/**/*.spec.js';
+    var featurePattern = 'packages/' + featureName + '/test/**/*.spec.js';
 
     return {
-      unit: ['src/js/core/bootstrap.js', 'src/js/**/*.js', 'test/unit/**/*.spec.js', 'src/features/*/js/**/*.js', featurePattern, '.tmp/template.js'],
+      unit: ['packages/core/src/js/bootstrap.js', 'packages/core/src/js/**/*.js', 'packages/core/test/**/*.spec.js', 'packages/*/src/js/**/*.js', featurePattern, '.tmp/template.js'],
       core_unit: util.testDependencies.unit.core_unit
     };
   },

packages/cellnav/src/less/cellNav.less

@@ -1,4 +1,4 @@
-@import '../../../less/variables';
+@import '../../../core/src/less/variables';
 
 .ui-grid-cell-focus {
   outline: 0;