Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion js/app/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ $('#content.app-news')
.attr('ng-controller', 'AppController as App');

/* jshint unused: false */
var app = angular.module('News', ['ngRoute', 'ngSanitize', 'ngAnimate']);
var app = angular.module('News', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngVue']);

11 changes: 11 additions & 0 deletions js/app/VueComponents.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
var someComponent = require('../vue_components/component.vue').default;
someVueComponent = Vue.component('SomeComponent', someComponent);
app.value('SomeComponent', someVueComponent);

var IconLinkCompact = require('../vue_components/IconLinkCompact.vue').default;
var iconLinkCompactComponent = Vue.component('IconLinkCompact', IconLinkCompact);
app.value('IconLinkCompact', iconLinkCompactComponent);

var ExploreItems = require('../vue_components/ExploreItems.vue').default;
var exploreItems = Vue.component('ExploreItems', ExploreItems);
app.value('ExploreItems', exploreItems);
24 changes: 17 additions & 7 deletions js/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ const gulp = require('gulp'),
jshint = require('gulp-jshint'),
KarmaServer = require('karma').Server,
concat = require('gulp-concat'),
sourcemaps = require('gulp-sourcemaps');
sourcemaps = require('gulp-sourcemaps'),
webpackStream = require('webpack-stream'),
webpackConfig = require('./webpack.config.js');

// Configuration
const buildTarget = 'app.min.js';
Expand All @@ -30,18 +32,22 @@ const sources = [
'node_modules/angular-sanitize/angular-sanitize.min.js',
'node_modules/moment/min/moment-with-locales.min.js',
'node_modules/masonry-layout/dist/masonry.pkgd.min.js',
'node_modules/vue/dist/vue.js',
'node_modules/ngVue/build/index.js',
'app/App.js', 'app/Config.js', 'app/Run.js',
'controller/**/*.js',
'filter/**/*.js',
'service/**/*.js',
'gui/**/*.js',
'plugin/**/*.js',
'utility/**/*.js',
'directive/**/*.js'
'directive/**/*.js',
];
const testSources = ['tests/**/*.js'];
const watchSources = sources.concat(testSources).concat(['*.js']);
const lintSources = watchSources;
const watchSources = sources.concat(testSources);
const lintSources = watchSources.filter((item) => {
return item !== 'webpack.config.js' && item !== 'webpacked_vue_components.js';
});

// tasks
gulp.task('lint', () => {
Expand All @@ -51,12 +57,16 @@ gulp.task('lint', () => {
.pipe(jshint.reporter('fail'));
});

gulp.task('default', gulp.series('lint', () => {
return gulp.src(sources)
gulp.task('webpack', () => {
return webpackStream(webpackConfig)
.pipe(gulp.dest('./webpacked'));
});
gulp.task('default', gulp.series('lint', 'webpack', () => {
return gulp.src(sources.concat(['webpacked/webpacked_vue_components.js']))
.pipe(ngAnnotate())
.pipe(sourcemaps.init())
.pipe(concat(buildTarget))
.pipe(terser())
//.pipe(terser())
.pipe(sourcemaps.write())
.pipe(gulp.dest(destinationFolder));
}));
Expand Down
Loading