Skip to content

Commit

Permalink
fix(core): ensure ui-grid loads on site
Browse files Browse the repository at this point in the history
I made a couple mistakes when re-doing the build tasks for ui-grid and caused this to break

closes #7277
  • Loading branch information
marcelo-portugal authored and mportuga committed Jan 19, 2023
1 parent 7ddbdce commit b215403
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 12 deletions.
8 changes: 4 additions & 4 deletions grunt/copy.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
2 changes: 1 addition & 1 deletion grunt/shell.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module.exports = function() {
}
},
build: {
command: 'npm run build-dx'
command: 'npm run build'
},
lint: {
command: 'npm run lint'
Expand Down
2 changes: 1 addition & 1 deletion lib/less/main.less
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions lib/webpack/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
File renamed without changes.
3 changes: 1 addition & 2 deletions packages/cellnav/webpack.config.js
Original file line number Diff line number Diff line change
@@ -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);
3 changes: 1 addition & 2 deletions packages/saveState/webpack.config.js
Original file line number Diff line number Diff line change
@@ -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');

0 comments on commit b215403

Please sign in to comment.