Skip to content

Add basic webpack #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Andries-Smit wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add basic webpack #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 36 additions & 6 deletions Gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,25 @@ var gulp = require("gulp"),
intercept = require("gulp-intercept"),
argv = require("yargs").argv,
widgetBuilderHelper = require("widgetbuilder-gulp-helper"),
jsValidate = require("gulp-jsvalidate");
jsValidate = require("gulp-jsvalidate"),
webpack = require("webpack"),
merge = require("webpack-merge"),
webpackConfig = require("./webpack.config.js");

var webpackConfigRelease = webpackConfig.map(function(config) {
return merge(config, {
devtool: false,
plugins: [ new webpack.optimize.UglifyJsPlugin() ]
});
});

var pkg = require("./package.json"),
paths = widgetBuilderHelper.generatePaths(pkg),
xmlversion = widgetBuilderHelper.xmlversion;

gulp.task("default", function() {
gulp.watch("./src/**/*", ["compress"]);
gulp.watch("./src/**/*.js", ["copy:js"]);
gulp.task("default", ["clean", "webpack"], function() {
gulp.watch("./src/**/*", ["webpack"]);
gulp.watch("./dist/tmp/src/**/*.js", ["copy:js"]);
});

gulp.task("clean", function () {
Expand All @@ -37,15 +47,35 @@ gulp.task("clean", function () {
], { force: true });
});

gulp.task("webpack", function(callback) {
webpack(webpackConfig, function(error, stats) {
if (error) {
throw new gutil.PluginError("webpack", err);
}
gulp.start("compress");
callback()
});
});

gulp.task("release", ["clean"], function(callback) {
webpack(webpackConfigRelease, function(error, stats) {
if (error) {
throw new gutil.PluginError("webpack", err);
}
gulp.start("compress");
callback();
});
});

gulp.task("compress", ["clean"], function () {
return gulp.src("src/**/*")
return gulp.src("dist/tmp/src/**/*")
.pipe(zip(pkg.name + ".mpk"))
.pipe(gulp.dest(paths.TEST_WIDGETS_FOLDER))
.pipe(gulp.dest("dist"));
});

gulp.task("copy:js", function () {
return gulp.src(["./src/**/*.js"])
return gulp.src(["./dist/tmp/src/**/*.js"])
.pipe(jsValidate())
.pipe(newer(paths.TEST_WIDGETS_DEPLOYMENT_FOLDER))
.pipe(gulp.dest(paths.TEST_WIDGETS_DEPLOYMENT_FOLDER));
Expand Down
9 changes: 7 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
"license": "Apache License, Version 2",
"author": "Mendix",
"private": true,
"dependencies": {},
"dependencies": {
"jquery": "^1.11.2"
},
"devDependencies": {
"copy-webpack-plugin": "^4.0.1",
"del": "^2.2.2",
"gulp": "^3.9.1",
"gulp-if": "^2.0.1",
Expand All @@ -16,6 +19,8 @@
"gulp-util": "^3.0.7",
"gulp-zip": "^3.2.0",
"gulp-jsvalidate": "^3.0.0",
"webpack": "^3.0.0",
"webpack-merge": "^4.1.0",
"widgetbuilder-gulp-helper": "https://github.com/JelteMX/widgetbuilder-gulp-helper/archive/1.0.1.tar.gz",
"yargs": "^6.0.0"
},
Expand All @@ -34,4 +39,4 @@
"folders": "node ./node_modules/gulp/bin/gulp folders",
"modeler": "node ./node_modules/gulp/bin/gulp modeler"
}
}
}
10 changes: 4 additions & 6 deletions src/CKEditorForMendix/widget/CKEditorForMendix.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ define([
"dojo/_base/lang",
"dojo/text",
"mendix/validator",
"CKEditorForMendix/widget/lib/jquery",
"CKEditorForMendix/widget/lib/ckeditor",
"jquery",
"./lib/ckeditor",
"dojo/text!CKEditorForMendix/widget/templates/CKEditorForMendix.html",
"CKEditorForMendix/widget/lib/jquery.oembed"
"./lib/jquery.oembed"
], function(declare, _WidgetBase, _TemplatedMixin, dom, domStyle, dojoClass, domConstruct, html, dojoArray, lang, text, validator, _jQuery, _CKEditor, widgetTemplate) {
"use strict";

var $ = _jQuery.noConflict(true);

return declare("CKEditorForMendix.widget.CKEditorForMendix", [_WidgetBase, _TemplatedMixin], {
return declare("CKEditorForMendix.widget.CKEditorForMendix", [ _WidgetBase, _TemplatedMixin ], {

// Set by the Modeler
imageUploadMicroflow: "",
Expand Down Expand Up @@ -694,5 +694,3 @@ define([
}
});
});

require(["CKEditorForMendix/widget/CKEditorForMendix"]);
10 changes: 4 additions & 6 deletions src/CKEditorForMendix/widget/CKEditorViewerForMendix.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ define([
"dojo/_base/array",
"dojo/_base/lang",
"dojo/text",
"CKEditorForMendix/widget/lib/jquery",
"CKEditorForMendix/widget/lib/ckeditor_viewer",
"jquery",
"./lib/ckeditor_viewer",
"dojo/text!CKEditorForMendix/widget/templates/CKEditorViewerForMendix.html",
"CKEditorForMendix/widget/lib/highlight.pack",
"./lib/highlight.pack",

"CKEditorForMendix/widget/lib/dotdot.jquery",
"./lib/dotdot.jquery",
], function (declare, _WidgetBase, _TemplatedMixin, domStyle, dojoArray, lang, text, _jQuery, _CKEditorViewer, widgetTemplate, hljs) {
"use strict";

Expand Down Expand Up @@ -157,5 +157,3 @@ define([

});
});

require(["CKEditorForMendix/widget/CKEditorViewerForMendix"]);
2 changes: 1 addition & 1 deletion src/CKEditorForMendix/widget/lib/dotdot.jquery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(function(root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['CKEditorForMendix/widget/lib/jquery'], factory);
define(['jquery'], factory);
} else if (typeof exports === 'object') {
// Node. Does not work with strict CommonJS, but
// only CommonJS-like environments that support module.exports,
Expand Down
Loading