Skip to content

Commit 76f5b9c

Browse files
marcelo-portugalmportuga
authored andcommitted
chore: fix build tasks
1 parent 6d3f006 commit 76f5b9c

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

grunt/aliases.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ module.exports = function (grunt, options) {
5353
var currentTag = semver.clean( util.getCurrentTag() );
5454

5555
if (currentTag) {
56-
baseTasks['release'] = ['clean', 'build', 'cut-release', 'gh-pages:ui-grid-site', 'update-bower-json', 'gh-pages:bower', 'npm-publish'];
56+
baseTasks['release'] = ['cut-release', 'gh-pages:ui-grid-site', 'update-bower-json', 'gh-pages:bower', 'npm-publish'];
5757
}
5858
else {
59-
baseTasks['release'] = ['clean', 'build', 'cut-release'];
59+
baseTasks['release'] = ['cut-release'];
6060
}
6161

6262
return baseTasks;

grunt/copy.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = function ( grunt ) {
1717

1818
packages.forEach(function(feat) {
1919
let featModuleName = '.' + _.camelCase(feat);
20-
let featMainPath = `./js/${package.name}.${feat}`;
20+
let featMainPath = `./dist/${package.name}.${feat}`;
2121

2222
switch(feat) {
2323
case 'cellnav':
@@ -185,7 +185,7 @@ module.exports = function ( grunt ) {
185185
expand: true,
186186
flatten: true,
187187
cwd: 'packages',
188-
src: '*/js/*.js',
188+
src: '*/dist/*.js',
189189
dest: '<%= dist %>/release',
190190
filter: function(filepath) {
191191
return !filepath.includes('packages/i18n')
@@ -195,15 +195,15 @@ module.exports = function ( grunt ) {
195195
expand: true,
196196
flatten: true,
197197
cwd: 'packages',
198-
src: '*/js/*.js',
198+
src: '*/i18n/dist/*.js',
199199
dest: '<%= dist %>/release/i18n',
200200
filter: 'isFile'
201201
},
202202
{
203203
expand: true,
204204
flatten: true,
205205
cwd: 'packages',
206-
src: '*/css/*.css',
206+
src: '*/dist/*.css',
207207
dest: '<%= dist %>/release/css',
208208
filter: 'isFile'
209209
}

lib/webpack/webpack.common.js

Lines changed: 2 additions & 2 deletions
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 = name.replace('@ui-grid/', '')
10+
const packageName = _.camelCase(name.replace('@ui-grid/', ''))
1111
const mainJs = './src/index.js';
12-
const entry = hasCss ? [mainJs, `./less/${_.camelCase(packageName)}.less`] : [mainJs];
12+
const entry = hasCss ? [mainJs, `./less/${packageName}.less`] : [mainJs];
1313
const htmlLoader = {
1414
test: /\.html$/i,
1515
include: path.resolve(dir, 'src'),

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"main": "./index.js",
99
"scripts": {
1010
"bootstrap": "lerna bootstrap",
11-
"build": "grunt build",
1211
"pre-build": "grunt clean",
13-
"build-dx": "npm run pre-build && webpack && npm run less && lerna run build",
12+
"build": "npm run pre-build && webpack && npm run less && lerna run build && npm run post-build",
13+
"post-build": "grunt uidocs-generator copy:site copy:font_dist copy:less_customizer copy:less_dist copy:packages_dist copy:packages_publish",
1414
"less": "npm run less-main && npm run less-min",
1515
"less-main": "lessc -rp=\"../\" ./lib/less/main.less dist/release/css/ui-grid.css",
1616
"less-min": "lessc -rp=\"../\" --compress -x ./lib/less/main.less dist/release/css/ui-grid.min.css",
@@ -23,6 +23,7 @@
2323
"lerna": "lerna",
2424
"lint": "eslint packages/*/src/**/*.js packages/*/test/**/*.spec.js test/**/*.spec.js",
2525
"postinstall": "bower install",
26+
"pre-release": "grunt release",
2627
"release": "lerna publish from-package",
2728
"start": "grunt dev --fast",
2829
"test": "grunt test",

0 commit comments

Comments
 (0)