Skip to content

Commit 597edac

Browse files
author
Illia Obukhau
authored
Merge pull request #60 from mendix/fix-widget-version
fix: bump and align widget version
2 parents 8313091 + 4394db7 commit 597edac

File tree

9 files changed

+9182
-7039
lines changed

9 files changed

+9182
-7039
lines changed

.gitattributes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
* text=auto
2+
**/javasource/**/*.java text eol=crlf
3+
**/javascriptsource/**/*.js text eol=crlf
4+
*.mpr binary
5+
*.mpk binary

Cropper/conf/webpack.config.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const ArchivePlugin = require('webpack-archive-plugin');
55
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
66
const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
77
const fs = require('fs-extra');
8+
const pkg = require("../package.json");
89

910
const MODES = {
1011
DEV: 'development',
@@ -21,7 +22,8 @@ const widgetXMLFiles = [
2122
template: paths.widgetPackageXML,
2223
filename: `package.xml`,
2324
data: {
24-
NAME: widgetConf.name
25+
NAME: widgetConf.name,
26+
VERSION: pkg.version
2527
}
2628
},
2729
{

Cropper/package-lock.json

Lines changed: 9118 additions & 6969 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cropper/package.json

Lines changed: 55 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,57 @@
11
{
2-
"name": "cropper",
3-
"version": "4.0.2",
4-
"description": "Image Cropping Widget",
5-
"main": "index.js",
6-
"scripts": {
7-
"dev": "cross-env MODE=development webpack --config conf/webpack.config.js",
8-
"build": "cross-env MODE=production webpack --config conf/webpack.config.js"
9-
},
10-
"keywords": [
11-
"Mendix",
12-
"widget",
13-
"Dojo",
14-
"Javascript",
15-
"ES6",
16-
"JQUERY"
17-
],
18-
"author": {
19-
"name": "Osama Najjar",
20-
"email": "[email protected]"
21-
},
22-
"license": "MIT",
23-
"devDependencies": {
24-
"@babel/core": "^7.2.2",
25-
"@babel/preset-env": "^7.2.3",
26-
"autoprefixer": "^9.4.3",
27-
"babel": "^6.23.0",
28-
"babel-loader": "^8.0.4",
29-
"babel-plugin-add-module-exports": "^1.0.0",
30-
"concurrently": "^4.1.0",
31-
"cross-env": "^5.2.0",
32-
"css-loader": "^2.1.0",
33-
"cssnano": "^4.1.8",
34-
"file-loader": "^3.0.1",
35-
"fs-extra": "^7.0.1",
36-
"imports-loader": "^0.8.0",
37-
"mini-css-extract-plugin": "^0.5.0",
38-
"node-sass": "^4.13.0",
39-
"postcss-clean": "^1.1.0",
40-
"postcss-loader": "^3.0.0",
41-
"sass-loader": "^7.2.0",
42-
"style-loader": "^0.23.1",
43-
"uglifyjs-webpack-plugin": "^2.1.1",
44-
"webpack": "^4.28.2",
45-
"webpack-archive-plugin": "^3.0.0",
46-
"webpack-cli": "^3.1.2",
47-
"xml-webpack-plugin": "0.0.2"
48-
},
49-
"dependencies": {
50-
"jquery": "^3.5.0",
51-
"jquery-jcrop": "^0.9.13"
52-
}
2+
"name": "cropper",
3+
"version": "4.0.6",
4+
"description": "Image Cropping Widget",
5+
"main": "index.js",
6+
"repository": {
7+
"type": "git",
8+
"url": "https://github.com/mendix/ImageCropModule.git"
9+
},
10+
"scripts": {
11+
"dev": "cross-env MODE=development webpack --config conf/webpack.config.js",
12+
"build": "cross-env MODE=production webpack --config conf/webpack.config.js"
13+
},
14+
"keywords": [
15+
"Mendix",
16+
"widget",
17+
"Dojo",
18+
"Javascript",
19+
"ES6",
20+
"JQUERY"
21+
],
22+
"author": {
23+
"name": "Osama Najjar",
24+
"email": "[email protected]"
25+
},
26+
"license": "MIT",
27+
"devDependencies": {
28+
"@babel/core": "^7.2.2",
29+
"@babel/preset-env": "^7.2.3",
30+
"autoprefixer": "^9.4.3",
31+
"babel": "^6.23.0",
32+
"babel-loader": "^8.0.4",
33+
"babel-plugin-add-module-exports": "^1.0.0",
34+
"concurrently": "^4.1.0",
35+
"cross-env": "^5.2.0",
36+
"css-loader": "^2.1.0",
37+
"cssnano": "^4.1.8",
38+
"file-loader": "^3.0.1",
39+
"fs-extra": "^7.0.1",
40+
"imports-loader": "^0.8.0",
41+
"mini-css-extract-plugin": "^0.5.0",
42+
"sass": "^1.58.3",
43+
"postcss-clean": "^1.1.0",
44+
"postcss-loader": "^3.0.0",
45+
"sass-loader": "^7.2.0",
46+
"style-loader": "^0.23.1",
47+
"uglifyjs-webpack-plugin": "^2.1.1",
48+
"webpack": "^4.28.2",
49+
"webpack-archive-plugin": "^3.0.0",
50+
"webpack-cli": "^3.1.2",
51+
"xml-webpack-plugin": "0.0.2"
52+
},
53+
"dependencies": {
54+
"jquery": "^3.5.0",
55+
"jquery-jcrop": "^0.9.13"
56+
}
5357
}

Cropper/src/package.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<package xmlns="http://www.mendix.com/package/1.0/">
3-
<clientModule name="Image Cropper" version="4.0.2" xmlns="http://www.mendix.com/clientModule/1.0/">
3+
<clientModule name="Image Cropper" version="<%= VERSION %>" xmlns="http://www.mendix.com/clientModule/1.0/">
44
<widgetFiles>
55
<widgetFile path="<%= NAME %>/<%= NAME %>.xml" />
66
</widgetFiles>

Cropper/test/widgets/Cropper.mpk

-1.31 KB
Binary file not shown.

testProject-8.18/ImageCrop.mpr

-9.76 MB
Binary file not shown.

testProject-8.18/javasource/imagecrop/proxies/constants/Constants.java

Lines changed: 0 additions & 17 deletions
This file was deleted.
-1.31 KB
Binary file not shown.

0 commit comments

Comments
 (0)