Skip to content

Commit 632911e

Browse files
author
Lionel Bijaoui
committed
Correction of build and small corrections
1 parent 4498e6b commit 632911e

10 files changed

+227
-364
lines changed

.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module.exports = {
1212
globals: {
1313
process: true
1414
},
15-
extends: ["eslint:recommended", "plugin:vue/base"],
15+
extends: ["eslint:recommended", "plugin:vue/essential"],
1616
plugins: ["prettier"],
1717
rules: {
1818
indent: [1, "tab", { SwitchCase: 1 }],

build/utils.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ let config = require("../config");
33
let ExtractTextPlugin = require("extract-text-webpack-plugin");
44

55
exports.assetsPath = function(_path) {
6-
let assetsSubDirectory = process.env.NODE_ENV === "production" ? config.build.assetsSubDirectory : config.dev.assetsSubDirectory;
6+
let assetsSubDirectory =
7+
process.env.NODE_ENV === "production" ? config.build.assetsSubDirectory : config.dev.assetsSubDirectory;
78
return path.posix.join(assetsSubDirectory, _path);
89
};
910

build/webpack.build.config.js

+13-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
const path = require("path");
22
const webpack = require("webpack");
3-
const version = require("./package.json").version;
4-
const banner = "/**\n" + " * vue-form-generator v" + version + "\n" + " * https://github.com/icebob/vue-form-generator\n" + " * Released under the MIT License.\n" + " */\n";
3+
const utils = require("./utils");
4+
const version = require("../package.json").version;
5+
const banner =
6+
"/**\n" +
7+
" * vue-form-generator v" +
8+
version +
9+
"\n" +
10+
" * https://github.com/icebob/vue-form-generator\n" +
11+
" * Released under the MIT License.\n" +
12+
" */\n";
513
const ExtractTextPlugin = require("extract-text-webpack-plugin");
614
const StatsPlugin = require("stats-webpack-plugin");
715
const vueLoaderConfig = require("./vue-loader.conf");
@@ -40,6 +48,7 @@ let rules = [
4048
include: [path.resolve("src")]
4149
}
4250
];
51+
4352
let cssFileName;
4453
if (process.env.FULL_BUNDLE !== "false") {
4554
cssFileName = "vfg.css";
@@ -68,8 +77,8 @@ module.exports = [
6877
warnings: false
6978
}
7079
}),
71-
new webpack.optimize.DedupePlugin(),
72-
new webpack.BannerPlugin(banner, {
80+
new webpack.BannerPlugin({
81+
banner,
7382
raw: true
7483
}),
7584
new ExtractTextPlugin(cssFileName, { allChunks: true }),

dev/projects/full/schema.js

+6-9
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,6 @@ export default {
181181
model: "radio",
182182
styleClasses: "half-width"
183183
},
184-
{
185-
type: "input",
186-
inputType: "file",
187-
label: "File USELESS",
188-
model: "file"
189-
},
190184
{
191185
type: "input",
192186
inputType: "image",
@@ -375,15 +369,18 @@ export default {
375369
model: "address.geo",
376370
disabled: false,
377371
get(model) {
378-
if (model && model.address && model.address.geo) return model.address.geo.latitude + ", " + model.address.geo.longitude;
372+
if (model && model.address && model.address.geo)
373+
return model.address.geo.latitude + ", " + model.address.geo.longitude;
379374
},
380375
set(model, val) {
381376
let values = val.split(",");
382377
if (!model.address) model.address = {};
383378
if (!model.address.geo) model.address.geo = {};
384-
if (values.length > 0 && values[0].trim() !== "") model.address.geo.latitude = parseFloat(values[0].trim());
379+
if (values.length > 0 && values[0].trim() !== "")
380+
model.address.geo.latitude = parseFloat(values[0].trim());
385381
else model.address.geo.latitude = 0;
386-
if (values.length > 1 && values[1].trim() !== "") model.address.geo.longitude = parseFloat(values[1].trim());
382+
if (values.length > 1 && values[1].trim() !== "")
383+
model.address.geo.longitude = parseFloat(values[1].trim());
387384
else model.address.geo.longitude = 0;
388385
},
389386
buttons: [

dist/vfg-core.js

+1-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vfg.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vfg.js

+1-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)