Skip to content

Commit 3bece50

Browse files
author
Marcelo Portugal
committed
build(webpack): fix windows build task
1 parent 87a0a4a commit 3bece50

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+69
-123
lines changed

‎lib/webpack/webpack.common.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
const _ = require('lodash');
22
const path = require('path');
3-
const webpack = require('webpack');
43

54
const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
65
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
76

87
const {bannerLoader, terser} = require('./webpack.utils');
98

10-
module.exports = (dir, hasCss = false) => {
11-
const packageName = _.last(dir.split('/'));
9+
module.exports = (dir, name, hasCss = false) => {
10+
const packageName = name.replace('@ui-grid/', '')
1211
const mainJs = './src/index.js';
1312
const entry = hasCss ? [mainJs, `./less/${_.camelCase(packageName)}.less`] : [mainJs];
1413
const htmlLoader = {

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"scripts": {
1010
"bootstrap": "lerna bootstrap",
1111
"build": "grunt build",
12-
"pre-build": "rm -rf ./dist/release",
12+
"pre-build": "grunt clean",
1313
"build-dx": "npm run pre-build && webpack && npm run less && lerna run build",
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",

‎packages/auto-resize/package.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
"description": "This module provides auto-resizing functionality to UI-Grid",
55
"main": "index.js",
66
"scripts": {
7-
"build": "webpack && npm run post-build",
8-
"cp-js": "cp -R dist/*.js ../../dist/release/",
9-
"post-build": "npm run cp-js"
7+
"build": "webpack"
108
},
119
"dependencies": {
1210
"@ui-grid/core": "^4.11.1",

‎packages/auto-resize/webpack.config.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
const common = require('../../lib/webpack/webpack.common.js');
2+
const package = require('./package.json');
23

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

‎packages/cellnav/package.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
"description": "This module provides cell navigation functionality to UI-Grid",
55
"main": "index.js",
66
"scripts": {
7-
"build": "webpack && npm run post-build",
8-
"cp-js": "cp -R dist/*.js ../../dist/release/",
9-
"post-build": "npm run cp-js"
7+
"build": "webpack"
108
},
119
"dependencies": {
1210
"@ui-grid/core": "^4.11.1",

‎packages/cellnav/webpack.config.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
const common = require('../../lib/webpack/webpack.common.js');
2+
const package = require('./package.json');
23

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

‎packages/core/package.json‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,10 @@
44
"description": "A data grid for Angular",
55
"main": "index.js",
66
"scripts": {
7-
"build": "webpack && npm run less && npm run post-build",
8-
"cp-css": "cp -R dist/*.css ../../dist/release/css",
9-
"cp-fonts": "cp -R fonts/ ../../dist/release/fonts",
10-
"cp-less": "cp -R less/ ../../dist/release/less",
11-
"cp-js": "cp -R dist/*.js ../../dist/release/",
7+
"build": "webpack && npm run less",
128
"less": "npm run less-main && npm run less-min",
139
"less-main": "lessc -rp=\"../\" ./less/main.less dist/ui-grid.core.css",
14-
"less-min": "lessc -rp=\"../\" --compress -x ./less/main.less dist/ui-grid.core.min.css",
15-
"post-build": "npm run cp-css && npm run cp-fonts && npm run cp-less && npm run cp-js"
10+
"less-min": "lessc -rp=\"../\" --compress -x ./less/main.less dist/ui-grid.core.min.css"
1611
},
1712
"dependencies": {
1813
"angular": ">=1.4.0 1.8.x"

‎packages/core/webpack.config.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
const common = require('../../lib/webpack/webpack.common.js');
2+
const package = require('./package.json');
23

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

‎packages/edit/package.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
"description": "This module provides cell editing capability to ui.grid",
55
"main": "index.js",
66
"scripts": {
7-
"build": "webpack && npm run post-build",
8-
"cp-css": "cp -R dist/*.css ../../dist/release/css",
9-
"cp-less": "cp -R less/ ../../dist/release/less",
10-
"cp-js": "cp -R dist/*.js ../../dist/release/",
11-
"post-build": "npm run cp-css && npm run cp-less && npm run cp-js"
7+
"build": "webpack"
128
},
139
"dependencies": {
1410
"@ui-grid/core": "^4.11.1",

‎packages/edit/webpack.config.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
const common = require('../../lib/webpack/webpack.common.js');
2+
const package = require('./package.json');
23

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

0 commit comments

Comments
 (0)