Skip to content

Commit b215403

Browse files
marcelo-portugalmportuga
authored andcommitted
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
1 parent 7ddbdce commit b215403

File tree

7 files changed

+10
-12
lines changed

7 files changed

+10
-12
lines changed

Diff for: grunt/copy.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,25 +79,25 @@ module.exports = function ( grunt ) {
7979
files: [
8080
{
8181
expand: true,
82-
cwd: 'packages/core/font',
82+
cwd: 'packages/core/fonts',
8383
src: '**/*.eot',
8484
dest: '<%= dist %>/release/fonts'
8585
},
8686
{
8787
expand: true,
88-
cwd: 'packages/core/font',
88+
cwd: 'packages/core/fonts',
8989
src: '**/*.svg',
9090
dest: '<%= dist %>/release/fonts'
9191
},
9292
{
9393
expand: true,
94-
cwd: 'packages/core/font',
94+
cwd: 'packages/core/fonts',
9595
src: '**/*.ttf',
9696
dest: '<%= dist %>/release/fonts'
9797
},
9898
{
9999
expand: true,
100-
cwd: 'packages/core/font',
100+
cwd: 'packages/core/fonts',
101101
src: '**/*.woff',
102102
dest: '<%= dist %>/release/fonts'
103103
}

Diff for: grunt/shell.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module.exports = function() {
1616
}
1717
},
1818
build: {
19-
command: 'npm run build-dx'
19+
command: 'npm run build'
2020
},
2121
lint: {
2222
command: 'npm run lint'

Diff for: lib/less/main.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@import '../../packages/core/less/main.less';
2-
@import '../../packages/cellnav/less/cellNav.less';
2+
@import '../../packages/cellnav/less/cellnav.less';
33
@import '../../packages/edit/less/edit.less';
44
@import '../../packages/empty-base-layer/less/emptyBaseLayer.less';
55
@import '../../packages/expandable/less/expandable.less';

Diff for: lib/webpack/webpack.common.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
77
const {bannerLoader, terser} = require('./webpack.utils');
88

99
module.exports = (dir, name, hasCss = false) => {
10-
const packageName = _.camelCase(name.replace('@ui-grid/', ''))
10+
const packageName = name.replace('@ui-grid/', '')
1111
const mainJs = './src/index.js';
12-
const entry = hasCss ? [mainJs, `./less/${packageName}.less`] : [mainJs];
12+
const entry = hasCss ? [mainJs, `./less/${_.camelCase(packageName)}.less`] : [mainJs];
1313
const htmlLoader = {
1414
test: /\.html$/i,
1515
include: path.resolve(dir, 'src'),
File renamed without changes.

Diff for: packages/cellnav/webpack.config.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
const common = require('../../lib/webpack/webpack.common.js');
2-
const package = require('./package.json');
32

4-
module.exports = common(__dirname, package.name, true);
3+
module.exports = common(__dirname, 'cellnav', true);

Diff for: packages/saveState/webpack.config.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
const common = require('../../lib/webpack/webpack.common.js');
2-
const package = require('./package.json');
32

4-
module.exports = common(__dirname, package.name);
3+
module.exports = common(__dirname, 'saveState');

0 commit comments

Comments
 (0)