Browse Source

jquery was forgotten in the move away from bower (#50)

pull/51/head
Cian Butler 4 years ago
committed by GitHub
parent
commit
c125a8b7a0
4 changed files with 25 additions and 32 deletions
  1. +20
    -19
      gulpfile.js
  2. +1
    -3
      layout/common/scripts.ejs
  3. +1
    -1
      package.json
  4. +3
    -9
      yarn.lock

+ 20
- 19
gulpfile.js View File

@@ -16,9 +16,9 @@ gulp.task('vendor-styles', [], () => {
'./node_modules/font-awesome/css/font-awesome.min.css',
'./source/fonts/open-sans/css/styles.css',
'./source/fonts/source-code-pro/styles.css',
'./node-modules/lightgallery/dist/css/lightgallery.min.css',
'./node-modules/justifiedGallery/dist/css/justifiedGallery.min.css',
'./node-modules/fullcalendar/dist/fullcalendar.css',
'./node_modules/lightgallery/dist/css/lightgallery.min.css',
'./node_modules/justifiedGallery/dist/css/justifiedGallery.min.css',
'./node_modules/fullcalendar/dist/fullcalendar.css',
])
.pipe(concat('vendor-styles.min.css'))
.pipe(cleanCSS({ compatibility: 'ie9', processImport: false, keepSpecialComments: 0 }))
@@ -28,20 +28,21 @@ gulp.task('vendor-styles', [], () => {
gulp.task('scripts', [], () => {
gulp
.src([
'./node-modules/classie/classie.js',
'./node-modules/moment/min/moment.min.js',
'./node-modules/lightgallery/dist/js/lightgallery.js',
'./node-modules/lg-thumbnail/dist/lg-thumbnail.js',
'./node-modules/lg-pager/dist/lg-pager.js',
'./node-modules/lg-autoplay/dist/lg-autoplay.js',
'./node-modules/lg-fullscreen/dist/lg-fullscreen.js',
'./node-modules/lg-zoom/dist/lg-zoom.js',
'./node-modules/lg-hash/dist/lg-hash.js',
'./node-modules/lg-share/dist/lg-share.js',
'./node-modules/lg-video/dist/lg-video.js',
'./node-modules/justifiedGallery/dist/js/jquery.justifiedGallery.js',
'./node-modules/fullcalendar/dist/fullcalendar.js',
'./node-modules/fullcalendar/dist/gcal.js',
'./node_modules/jquery/dist/jquery.min.js',
'./node_modules/classie/classie.js',
'./node_modules/moment/min/moment.min.js',
'./node_modules/lightgallery/dist/js/lightgallery.js',
'./node_modules/lg-thumbnail/dist/lg-thumbnail.js',
'./node_modules/lg-pager/dist/lg-pager.js',
'./node_modules/lg-autoplay/dist/lg-autoplay.js',
'./node_modules/lg-fullscreen/dist/lg-fullscreen.js',
'./node_modules/lg-zoom/dist/lg-zoom.js',
'./node_modules/lg-hash/dist/lg-hash.js',
'./node_modules/lg-share/dist/lg-share.js',
'./node_modules/lg-video/dist/lg-video.js',
'./node_modules/justifiedGallery/dist/js/jquery.justifiedGallery.js',
'./node_modules/fullcalendar/dist/fullcalendar.js',
'./node_modules/fullcalendar/dist/gcal.js',
'./source/js/main.js',
'./source/js/insight.js',
'./source/js/share.js',
@@ -56,10 +57,10 @@ gulp.task('scripts', [], () => {
});

gulp.task('vendor-fonts', [], () => {
gulp.src(['./node-modules/components-font-awesome/fonts/*', './node-modules/lightgallery/dist/fonts/*']).pipe(gulp.dest('./source/dist/fonts'));
gulp.src(['./node_modules/components-font-awesome/fonts/*', './node_modules/lightgallery/dist/fonts/*']).pipe(gulp.dest('./source/dist/fonts'));
gulp.src(['./source/fonts/open-sans/fonts/*', './source/fonts/source-code-pro/fonts/*']).pipe(gulp.dest('./source/dist/css/fonts'));
});

gulp.task('vendor-images', [], () => {
gulp.src(['./node-modules/lightgallery/dist/img/*']).pipe(gulp.dest('./source/dist/img'));
gulp.src(['./node_modules/lightgallery/dist/img/*']).pipe(gulp.dest('./source/dist/img'));
});

+ 1
- 3
layout/common/scripts.ejs View File

@@ -1,4 +1,2 @@
<!-- jquery must be seperate to rest of js files -->
<%- js('vendor/jquery/dist/jquery.min') %>
<%- partial('comment/scripts', { page: page }) %>
<%- js('dist/js/main') %>
<%- partial('comment/scripts', { page: page }) %>

+ 1
- 1
package.json View File

@@ -36,7 +36,7 @@
"font-awesome": "^4.7.0",
"fullcalendar": "^3.4.0",
"jquery": "^3.2.1",
"justifiedgallery": "^1.0.10",
"justifiedGallery": "^3.6.2",
"lg-autoplay": "^1.0.4",
"lg-fullscreen": "^1.0.1",
"lg-hash": "^1.0.2",


+ 3
- 9
yarn.lock View File

@@ -1876,11 +1876,9 @@ jsprim@^1.2.2:
json-schema "0.2.3"
verror "1.3.6"

justifiedgallery@^1.0.10:
version "1.0.10"
resolved "https://registry.yarnpkg.com/justifiedgallery/-/justifiedgallery-1.0.10.tgz#918ba073f503b8c103d335081816f85bbe332fd9"
dependencies:
lodash "3.x.x"
justifiedGallery@^3.6.2:
version "3.6.2"
resolved "https://registry.yarnpkg.com/justifiedGallery/-/justifiedGallery-3.6.2.tgz#40aaa0f6d89fc8df464d80cf15b1a4659d09ea57"

kind-of@^3.0.2:
version "3.1.0"
@@ -2078,10 +2076,6 @@ lodash.templatesettings@^3.0.0:
lodash._reinterpolate "^3.0.0"
lodash.escape "^3.0.0"

lodash@3.x.x:
version "3.10.1"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"

lodash@^4.0.0, lodash@^4.13.1, lodash@^4.2.0, lodash@^4.3.0:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"


Loading…
Cancel
Save