Skip to content

Use npm for js depdencies, bundle with webpack #13156

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

Merged
rullzer merged 14 commits into from
Jan 9, 2019
Merged

Use npm for js depdencies, bundle with webpack #13156

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2087881
Npmize (vendor) scripts
ChristophWurst Dec 11, 2018
6da13f8
Remove Bower
ChristophWurst Dec 20, 2018
5bf06a1
Move vendored css ponyfill to npm
ChristophWurst Dec 20, 2018
1e80259
Remove core.js
ChristophWurst Dec 20, 2018
b3b4141
Move dev deps to devDependencies
ChristophWurst Dec 20, 2018
01a6181
Don't load old vendor files during jsunit tests
ChristophWurst Dec 21, 2018
69410a4
Adjust release file list
ChristophWurst Dec 21, 2018
15400fc
Use `jquery-ui-dist` instead of `jquery-ui` to resolve an issue with …
ChristophWurst Dec 21, 2018
a340273
Mergejs is gone
rullzer Dec 22, 2018
83068c3
Update select2, include css
ChristophWurst Dec 23, 2018
dbee410
Override select2 lib styling
skjnldsv Jan 7, 2019
e4e5cf8
Use upstream strengthify lib
ChristophWurst Jan 8, 2019
96102c1
Fix select2 style preference
juliusknorr Jan 9, 2019
1728075
Bump select2 from 3.4.5 to 3.4.8
ChristophWurst Jan 9, 2019
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
Prev Previous commit
Next Next commit
Update select2, include css 
Signed-off-by: Christoph Wurst <[email protected]>
  • Loading branch information
@ChristophWurst @juliusknorr
ChristophWurst authored and juliusknorr committed Jan 9, 2019
commit 83068c39e532f02381d18df35cef025366b0ab97
58 changes: 29 additions & 29 deletions core/js/dist/main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions core/src/globals.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import marked from 'marked'
import md5 from 'blueimp-md5'
import moment from 'moment'
import Select2 from 'select2'
import 'select2/select2.css'
import 'snap.js/dist/snap'
import 'strengthify'
import 'strengthify/strengthify.css'
Expand Down
1 change: 0 additions & 1 deletion lib/private/legacy/template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ public static function initTemplateEngine($renderAs) {
OC_Util::addStyle('css-variables', null, true);
OC_Util::addStyle('server', null, true);
OC_Util::addStyle('jquery-ui-fixes',null,true);
OC_Util::addVendorStyle('select2/select2', null, true);
OC_Util::addStyle('jquery.ocdialog');
OC_Util::addTranslations("core", null, true);
OC_Util::addStyle('search', 'results');
Expand Down
4 changes: 4 additions & 0 deletions package-lock.json
View file
Open in desktop

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

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"license": "AGPL-3.0-or-later",
"dependencies": {
"Base64": "^0.3.0",
"Select2": "git+https://github.com/select2/select2.git#3.4.8",
"autosize": "^4.0.2",
"backbone": "^1.2.3",
"blueimp-md5": "^2.7.0",
Expand Down