Skip to content

Commit 2938161

Browse files
dmitry-kurmanovdmitry-kurmanov
committed
added using "pre" script;
added jQuery as externals; changed structure of the dist (al.js -> surveyjs-widgets.js)
1 parent f388b3c commit 2938161

File tree

10 files changed

+38
-14
lines changed

10 files changed

+38
-14
lines changed

‎examples/angular/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<script src="http://127.0.0.1:8080/packages/survey-angular/survey.angular.js"></script>
2727

2828

29-
<script src="../../package/surveyjs-widgets/select2.js"></script>
29+
<script src="../../package/surveyjs-widgets.js"></script>
3030
</head>
3131

3232
<body>

‎examples/jquery/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<script src="http://127.0.0.1:8080/packages/survey-jquery/survey.jquery.js"></script>
1717

1818

19-
<script src="../../package/surveyjs-widgets/select2.js"></script>
19+
<script src="../../package/surveyjs-widgets.js"></script>
2020
</head>
2121

2222
<body>

‎examples/knockout/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<script src="http://127.0.0.1:8080/packages/survey-knockout/survey.ko.js"></script>
1919

2020

21-
<script src="../../package/surveyjs-widgets/select2.js"></script>
21+
<script src="../../package/surveyjs-widgets.js"></script>
2222
</head>
2323

2424
<body>

‎examples/react/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<title>Welcome to Knockout</title>
4+
<title>Welcome to React</title>
55
<script src="https://unpkg.com/react@15/dist/react.js"></script>
66
<script src="https://unpkg.com/react-dom@15/dist/react-dom.js"></script>
77
<script src="https://cdnjs.cloudflare.com/ajax/libs/babel-core/5.8.23/browser.js"></script>
@@ -20,7 +20,7 @@
2020
<script src="http://127.0.0.1:8080/packages/survey-react/survey.react.js"></script>
2121

2222

23-
<script src="../../package/surveyjs-widgets/select2.js"></script>
23+
<script src="../../package/surveyjs-widgets.js"></script>
2424
</head>
2525

2626
<body>

‎examples/vue/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<script src="http://127.0.0.1:8080/packages/survey-vue/survey.vue.js"></script>
1919

2020

21-
<script src="../../package/surveyjs-widgets/select2.js"></script>
21+
<script src="../../package/surveyjs-widgets.js"></script>
2222
</head>
2323

2424
<body>

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"name": "surveyjs-widgets",
3-
"version": "0.12.32",
3+
"version": "0.12.40",
44
"scripts": {
55
"start": "npm run build && live-server",
6-
"build": "webpack --env.buildType dev && webpack --env.buildType prod"
6+
"prebuild": "webpack --env.buildType dev",
7+
"build": "webpack --env.buildType prod"
78
},
89
"private": true,
910
"devDependencies": {

‎src/image-picker.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import $ from 'jquery';
2+
13
function init(Survey) {
24
var widget = {
35
name: "imagepicker",

‎src/select2.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import $ from 'jquery';
2+
13
function init(Survey) {
24
var widget = {
35
activatedBy: "property",

‎src/all.js‎ renamed to ‎src/surveyjs-widgets.js‎

File renamed without changes.

‎webpack.config.js‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ var copyright = [
1717

1818
var outputFolder = "package";
1919

20+
var main = "surveyjs-widgets";
21+
2022
var widgets = [
21-
"all",
23+
main,
2224
"select2",
2325
"select2-tagbox",
2426
"image-picker",
@@ -42,10 +44,11 @@ var dependencies = {
4244
"inputmask": "^3.3.10",
4345
"jquery-bar-rating": "^1.2.2"
4446
};
47+
4548
var entry = {};
4649

4750
module.exports = function(options) {
48-
var packagePath = `./${outputFolder}/surveyjs-widgets`;
51+
var packagePath = `./${outputFolder}`;
4952

5053
var targetPackageJson = {
5154
'name': `surveyjs-widgets`,
@@ -62,6 +65,7 @@ module.exports = function(options) {
6265
'homepage': 'https://surveyjs.io/',
6366
'license': 'MIT',
6467
'files': [],
68+
'main': main + '.js',
6569
'repository': {
6670
'type': 'git',
6771
'url': 'https://github.com/surveyjs/widgets.git'
@@ -73,10 +77,17 @@ module.exports = function(options) {
7377
};
7478

7579
widgets.forEach(function(widget) {
76-
targetPackageJson.files.push(`${widget}.js`);
77-
targetPackageJson.files.push(`${widget}.min.js`);
78-
targetPackageJson.files.push(`${widget}.min.js.map`);
79-
entry[widget] = path.join(__dirname, `./src/${widget}.js`);
80+
if (widget !== main) {
81+
targetPackageJson.files.push(`widgets/${widget}.js`);
82+
targetPackageJson.files.push(`widgets/${widget}.min.js`);
83+
targetPackageJson.files.push(`widgets/${widget}.min.js.map`);
84+
entry["widgets/" + widget] = path.join(__dirname, `./src/${widget}.js`);
85+
} else {
86+
targetPackageJson.files.push(`${widget}.js`);
87+
targetPackageJson.files.push(`${widget}.min.js`);
88+
targetPackageJson.files.push(`${widget}.min.js.map`);
89+
entry[widget] = path.join(__dirname, `./src/${widget}.js`);
90+
}
8091
});
8192

8293
targetPackageJson.dependencies = Object.assign(targetPackageJson.dependencies, dependencies);
@@ -90,6 +101,14 @@ module.exports = function(options) {
90101
libraryTarget: "umd",
91102
umdNamedDefine: true
92103
},
104+
externals: {
105+
'jquery': {
106+
root: 'jQuery',
107+
commonjs2: 'jquery',
108+
commonjs: 'jquery',
109+
amd: 'jquery'
110+
}
111+
},
93112
plugins: [
94113
new webpack.NoEmitOnErrorsPlugin(),
95114
new FriendlyErrorsWebpackPlugin()

0 commit comments

Comments
 (0)