Skip to content

Commit f70b283

Browse files
committed
fix(webpack): duplicated jquery instance
1 parent ad766a5 commit f70b283

File tree

4 files changed

+20
-5
lines changed

4 files changed

+20
-5
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
},
2626
"dependencies": {
2727
"jquery-datetimepicker": "^2.5.21",
28+
"script-loader": "^0.7.2",
2829
"select2": "^4.0.13"
2930
}
3031
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Load Active Admin's styles into Webpacker,
22
// see `active_admin.scss` for customization.
3-
import "../stylesheets/active_admin";
43

4+
import 'script-loader!jquery/dist/jquery.min'
5+
import "../stylesheets/active_admin";
56
import "@activeadmin/activeadmin";
67
import "../../../../../app/javascript/activeadmin_addons/all";
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const { environment } = require('@rails/webpacker')
2-
const jquery = require('./plugins/jquery')
3-
4-
environment.plugins.prepend('jquery', jquery)
5-
module.exports = environment
2+
environment.config.set('externals', {
3+
$: 'jquery',
4+
jquery: 'jQuery',
5+
});
6+
module.exports = environment;

yarn.lock

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,6 +1133,11 @@ php-date-formatter@^1.3.4:
11331133
resolved "https://registry.yarnpkg.com/php-date-formatter/-/php-date-formatter-1.3.6.tgz#6d67359da890c742005fa89d20be3ded31cc1d2a"
11341134
integrity sha512-/CKsZYmAwXeNh8KpD/CF9hcJDZNhdb2ICN8+qgqOt5sUu9liZIxZ1R284TNj5MtPt8RjG5X0xn6WSqL0kcKMBg==
11351135

1136+
raw-loader@~0.5.1:
1137+
version "0.5.1"
1138+
resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
1139+
integrity sha1-DD0L6u2KAclm2Xh793goElKpeao=
1140+
11361141
regenerate-unicode-properties@^8.2.0:
11371142
version "8.2.0"
11381143
resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
@@ -1247,6 +1252,13 @@ safe-buffer@~5.1.1:
12471252
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
12481253
integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
12491254

1255+
script-loader@^0.7.2:
1256+
version "0.7.2"
1257+
resolved "https://registry.yarnpkg.com/script-loader/-/script-loader-0.7.2.tgz#2016db6f86f25f5cf56da38915d83378bb166ba7"
1258+
integrity sha512-UMNLEvgOAQuzK8ji8qIscM3GIrRCWN6MmMXGD4SD5l6cSycgGsCo0tX5xRnfQcoghqct0tjHjcykgI1PyBE2aA==
1259+
dependencies:
1260+
raw-loader "~0.5.1"
1261+
12501262
select2@^4.0.13:
12511263
version "4.0.13"
12521264
resolved "https://registry.yarnpkg.com/select2/-/select2-4.0.13.tgz#0dbe377df3f96167c4c1626033e924372d8ef44d"

0 commit comments

Comments
 (0)