From b2154039f6fe8b027bc9a8a4a7e5fd5a16904188 Mon Sep 17 00:00:00 2001
From: Marcelo Portugal <marcelo.portugal@ukg.com>
Date: Thu, 19 Jan 2023 08:50:00 -0500
Subject: [PATCH] fix(core): ensure ui-grid loads on site

I made a couple mistakes when re-doing the build tasks for ui-grid and caused this to break

closes #7277
---
 grunt/copy.js                                        | 8 ++++----
 grunt/shell.js                                       | 2 +-
 lib/less/main.less                                   | 2 +-
 lib/webpack/webpack.common.js                        | 4 ++--
 packages/cellnav/less/{cellNav.less => cellnav.less} | 0
 packages/cellnav/webpack.config.js                   | 3 +--
 packages/saveState/webpack.config.js                 | 3 +--
 7 files changed, 10 insertions(+), 12 deletions(-)
 rename packages/cellnav/less/{cellNav.less => cellnav.less} (100%)

diff --git a/grunt/copy.js b/grunt/copy.js
index c58fc955a8..84600f295c 100644
--- a/grunt/copy.js
+++ b/grunt/copy.js
@@ -79,25 +79,25 @@ module.exports = function ( grunt ) {
       files: [
         {
           expand: true,
-          cwd: 'packages/core/font',
+          cwd: 'packages/core/fonts',
           src: '**/*.eot',
           dest: '<%= dist %>/release/fonts'
         },
         {
           expand: true,
-          cwd: 'packages/core/font',
+          cwd: 'packages/core/fonts',
           src: '**/*.svg',
           dest: '<%= dist %>/release/fonts'
         },
         {
           expand: true,
-          cwd: 'packages/core/font',
+          cwd: 'packages/core/fonts',
           src: '**/*.ttf',
           dest: '<%= dist %>/release/fonts'
         },
         {
           expand: true,
-          cwd: 'packages/core/font',
+          cwd: 'packages/core/fonts',
           src: '**/*.woff',
           dest: '<%= dist %>/release/fonts'
         }
diff --git a/grunt/shell.js b/grunt/shell.js
index 4e40ddbe36..a478a3fcde 100644
--- a/grunt/shell.js
+++ b/grunt/shell.js
@@ -16,7 +16,7 @@ module.exports = function() {
       }
     },
     build: {
-      command: 'npm run build-dx'
+      command: 'npm run build'
     },
     lint: {
       command: 'npm run lint'
diff --git a/lib/less/main.less b/lib/less/main.less
index 4449c80043..c493859b9b 100644
--- a/lib/less/main.less
+++ b/lib/less/main.less
@@ -1,5 +1,5 @@
 @import '../../packages/core/less/main.less';
-@import '../../packages/cellnav/less/cellNav.less';
+@import '../../packages/cellnav/less/cellnav.less';
 @import '../../packages/edit/less/edit.less';
 @import '../../packages/empty-base-layer/less/emptyBaseLayer.less';
 @import '../../packages/expandable/less/expandable.less';
diff --git a/lib/webpack/webpack.common.js b/lib/webpack/webpack.common.js
index cae3a3943d..177f6d00a8 100644
--- a/lib/webpack/webpack.common.js
+++ b/lib/webpack/webpack.common.js
@@ -7,9 +7,9 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const {bannerLoader, terser} = require('./webpack.utils');
 
 module.exports = (dir, name, hasCss = false) => {
-  const packageName = _.camelCase(name.replace('@ui-grid/', ''))
+  const packageName = name.replace('@ui-grid/', '')
   const mainJs = './src/index.js';
-  const entry = hasCss ? [mainJs, `./less/${packageName}.less`] : [mainJs];
+  const entry = hasCss ? [mainJs, `./less/${_.camelCase(packageName)}.less`] : [mainJs];
   const htmlLoader = {
     test: /\.html$/i,
     include: path.resolve(dir, 'src'),
diff --git a/packages/cellnav/less/cellNav.less b/packages/cellnav/less/cellnav.less
similarity index 100%
rename from packages/cellnav/less/cellNav.less
rename to packages/cellnav/less/cellnav.less
diff --git a/packages/cellnav/webpack.config.js b/packages/cellnav/webpack.config.js
index 9a63eaa52d..47f10dbe9b 100644
--- a/packages/cellnav/webpack.config.js
+++ b/packages/cellnav/webpack.config.js
@@ -1,4 +1,3 @@
 const common = require('../../lib/webpack/webpack.common.js');
-const package = require('./package.json');
 
-module.exports = common(__dirname, package.name, true);
+module.exports = common(__dirname, 'cellnav', true);
diff --git a/packages/saveState/webpack.config.js b/packages/saveState/webpack.config.js
index d7ffc5fa5d..9fe57f3ddd 100644
--- a/packages/saveState/webpack.config.js
+++ b/packages/saveState/webpack.config.js
@@ -1,4 +1,3 @@
 const common = require('../../lib/webpack/webpack.common.js');
-const package = require('./package.json');
 
-module.exports = common(__dirname, package.name);
+module.exports = common(__dirname, 'saveState');