Skip to content

Commit

Permalink
Install [email protected] from npm
Browse files Browse the repository at this point in the history
  • Loading branch information
glensc committed May 8, 2020
1 parent 1ffbd1b commit 09ff603
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 60 deletions.
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@
"balbuf/composer-git-merge-driver": "^1.1",
"bgrins/filereader.js": "*",
"components/jquery": "~1.8.3",
"components/jquery-blockui": "*@dev",
"components/jquery-cookie": "~1.4.1",
"components/jquery-datatables": "~1.10.4",
"components/jqueryui": "1.11.*",
Expand Down
58 changes: 1 addition & 57 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"node": "^8.10.0||^10"
},
"devDependencies": {
"block-ui": "^2.70.1",
"chosen-js": "^1.8.7",
"cross-env": "^5.1",
"drmonty-garlicjs": "^1.2.3",
Expand All @@ -22,6 +23,7 @@
"sass-loader": "^8.0.2"
},
"resolutions": {
"block-ui/jquery": "1.9.x",
"drmonty-garlicjs/jquery": "1.9.x"
}
}
2 changes: 1 addition & 1 deletion webpack.mix.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ mix.scripts([
mix.scripts([
'node_modules/jquery/jquery.js',
'node_modules/jquery/jquery-migrate.js',
'htdocs/components/jquery-blockui/jquery.blockUI.js',
'node_modules/block-ui/jquery.blockUI.js',
'htdocs/components/form/src/jquery.form.js',
'htdocs/components/jquery-cookie/jquery.cookie.js',
'htdocs/components/jquery-ui/ui/core.js',
Expand Down
9 changes: 8 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1270,6 +1270,13 @@ bindings@^1.5.0:
dependencies:
file-uri-to-path "1.0.0"

block-ui@^2.70.1:
version "2.70.1"
resolved "https://registry.yarnpkg.com/block-ui/-/block-ui-2.70.1.tgz#c862d64ee6288fb78123377c6680bc7ab262103f"
integrity sha1-yGLWTuYoj7eBIzd8ZoC8erJiED8=
dependencies:
jquery ">=1.7.x"

bluebird@^3.1.1, bluebird@^3.5.5:
version "3.7.2"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
Expand Down Expand Up @@ -3749,7 +3756,7 @@ jest-worker@^25.1.0:
merge-stream "^2.0.0"
supports-color "^7.0.0"

[email protected], jquery@>=1.8:
[email protected], jquery@>=1.7.x, jquery@>=1.8:
version "1.9.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-1.9.1.tgz#e4cd4835faaefbade535857613c0fc3ff2adaf34"
integrity sha1-5M1INfqu+63lNYV2E8D8P/KtrzQ=
Expand Down

0 comments on commit 09ff603

Please sign in to comment.