yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

first round of moving libraries from bower to npm

Browse Source
This commit is contained in:
Mads Rasmussen
2018-10-09 20:48:20 +02:00
parent ecb46214d8
commit 5dd6ef18aa
3 changed files with 87 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Web.UI.Client/bower.json
View File

@@ -16,16 +16,6 @@
"tests"
],
"dependencies": {
"angular": "~1.7.4",
"angular-cookies": "~1.7.4",
"angular-sanitize": "~1.7.4",
"angular-touch": "~1.7.4",
"angular-route": "~1.7.4",
"angular-animate": "~1.7.4",
"angular-i18n": "~1.7.4",
"signalr": "^2.2.1",
"typeahead.js": "~0.10.5",
"underscore": "~1.9.1",
"rgrove-lazyload": "*",
"bootstrap-social": "~4.8.0",
"jquery": "2.2.4",
@@ -44,7 +34,6 @@
"font-awesome": "~4.2",
"animejs": "^2.2.0",
"angular-ui-sortable": "0.14.4",
"angular-messages": "^1.7.2",
"jsdiff": "^3.4.0"
},
"install": {
@@ -62,10 +51,6 @@
"bower_components/moment/min/moment-with-locales.min.js",
"bower_components/moment/locale/*.js"
],
"underscore": [
"bower_components/underscore/underscore-min.js",
"bower_components/underscore/underscore-min.map"
],
"jquery": [
"bower_components/jquery/dist/jquery.min.js",
"bower_components/jquery/dist/jquery.min.map"
@@ -82,7 +67,6 @@
"bower_components/tinymce/tinymce.min.js"
],
"angular-i18n": "bower_components/angular-i18n/angular-locale_*.js",
"typeahead.js": "bower_components/typeahead.js/dist/typeahead.bundle.min.js",
"rgrove-lazyload": "bower_components/rgrove-lazyload/lazyload.js",
"ng-file-upload": "bower_components/ng-file-upload/ng-file-upload.min.js",
"jquery-ui": "bower_components/jquery-ui/jquery-ui.min.js",

84
src/Umbraco.Web.UI.Client/gulpfile.js
View File

@@ -202,14 +202,80 @@ gulp.task('dependencies', function () {
);
// npm dependencies
// flatpickr
stream.add(
gulp.src([
"./node_modules/flatpickr/dist/flatpickr.js",
"./node_modules/flatpickr/dist/flatpickr.css"],
{ base: "./node_modules/flatpickr/dist" })
.pipe(gulp.dest(root + targets.lib + "/flatpickr"))
);
const nodeModules = [
{
"name": "angular",
"src": ["./node_modules/angular/angular.js"],
"base": "./node_modules/angular"
},
{
"name": "angular-cookies",
"src": ["./node_modules/angular-cookies/angular-cookies.js"],
"base": "./node_modules/angular-cookies"
},
{
"name": "angular-sanitize",
"src": ["./node_modules/angular-sanitize/angular-sanitize.js"],
"base": "./node_modules/angular-sanitize"
},
{
"name": "angular-touch",
"src": ["./node_modules/angular-touch/angular-touch.js"],
"base": "./node_modules/angular-touch"
},
{
"name": "angular-route",
"src": ["./node_modules/angular-route/angular-route.js"],
"base": "./node_modules/angular-route"
},
{
"name": "angular-animate",
"src": ["./node_modules/angular-animate/angular-animate.js"],
"base": "./node_modules/angular-animate"
},
{
"name": "angular-i18n",
"src": ["./node_modules/angular-i18n/angular-i18n.js"],
"base": "./node_modules/angular-i18n"
},
{
"name": "angular-messages",
"src": ["./node_modules/angular-messages/angular-messages.js"],
"base": "./node_modules/angular-messages"
},
{
"name": "flatpickr",
"src": [
"./node_modules/flatpickr/dist/flatpickr.js",
"./node_modules/flatpickr/dist/flatpickr.css"
],
"base": "./node_modules/flatpickr/dist"
},
{
"name": "signalr",
"src": ["./node_modules/signalr/jquery.signalR.js"],
"base": "./node_modules/signalr"
},
{
"name": "typeahead.js",
"src": ["./node_modules/typeahead.js/dist/typeahead.bundle.min.js"],
"base": "./node_modules/typeahead.js/dist"
},
{
"name": "underscore",
"src": ["node_modules/underscore/underscore-min.js"],
"base": "./node_modules/underscore"
}
];
// add streams for node modules
nodeModules.forEach(module => {
stream.add(
gulp.src(module.src,
{ base: module.base })
.pipe(gulp.dest(root + targets.lib + "/" + module.name))
);
});
//copy over libs which are not on bower (/lib) and
//libraries that have been managed by bower-installer (/lib-bower)
@@ -256,7 +322,7 @@ gulp.task('dependencies', function () {
stream.add(
gulp.src("src/views/dashboard/default/*.jpg")
.pipe(gulp.dest(root + targets.views + "/dashboard/default"))
);
);
return stream;
});

13
src/Umbraco.Web.UI.Client/package.json
View File

@@ -5,8 +5,19 @@
"build": "gulp"
},
"dependencies": {
"angular": "1.7.5",
"angular-animate": "1.7.5",
"angular-cookies": "1.7.5",
"angular-i18n": "1.7.5",
"angular-messages": "1.7.5",
"angular-route": "1.7.5",
"angular-sanitize": "1.7.5",
"angular-touch": "1.7.5",
"flatpickr": "4.5.2",
"npm": "^6.4.1"
"npm": "^6.4.1",
"signalr": "2.2.1",
"typeahead.js": "0.10.5",
"underscore": "1.9.1"
},
"devDependencies": {
"@babel/core": "^7.1.2",