Skip to content

fixes issue with compiled JavaScript not being copied to statix/dist … #10

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
ashleynolan merged 2 commits into from
May 11, 2017
Merged

fixes issue with compiled JavaScript not being copied to statix/dist … #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23077e1
fixes issue with compiled JavaScript not being copied to statix/dist …
rentorm May 10, 2017
b7f50c2
small fix for ‘watch’ task where ‘assemble’ task was triggered on glo…
rentorm May 10, 2017
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 .kickoff/tasks/javascript.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const webpack = require('webpack');
const webpackConfig = require('./webpack.config');
const config = require('../config');

gulp.task('javascript', () => {
gulp.task('javascript', (done) => {
const wpConfig = Object.create(webpackConfig);

// wpConfig.output.publicPath = './';
Expand All @@ -19,5 +19,6 @@ gulp.task('javascript', () => {
if (err) {
throw new gutil.PluginError('compile', err);
}
done();
});
});
15 changes: 11 additions & 4 deletions .kickoff/tasks/watch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,28 @@
*/
const config = require('../config');
const gulp = require('gulp');
const runSequence = require('run-sequence');

gulp.task('watch', ['compile'], () => {
gulp.watch(['**/*.scss'], { cwd: config.css.scssDir }, ['css'])
Copy link
Contributor

@ashleynolan ashleynolan May 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this also include the copy task for the CSS? Or is it that the CSS is already being copied as part of the CSS task?

Copy link
Author

@rentorm rentorm May 11, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this here takes care of CSS copy part - https://github.com/TryKickoff/statix/blob/next/.kickoff/tasks/css.js#L71
so, yes CSS copy is already done in css task

Copy link
Contributor

@ashleynolan ashleynolan May 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok – just wanted to check

.on('change', config.gulp.onChange);

gulp.watch(['**/*'], { cwd: config.svg.srcDir }, ['svg'])
gulp.watch(['**/*'], { cwd: config.svg.srcDir }, function (event) {
runSequence('svg', 'copy:statixSvg');
})
.on('change', config.gulp.onChange);

gulp.watch(['**/*'], { cwd: config.img.srcDir }, ['images'])
gulp.watch(['**/*'], { cwd: config.img.srcDir }, function (event) {
runSequence('images', 'copy:statixImg');
})
.on('change', config.gulp.onChange);

gulp.watch('**/*.js', { cwd: config.js.srcDir }, ['javascript'])
gulp.watch('**/*.js', { cwd: config.js.srcDir }, function (event) {
runSequence('javascript', 'copy:statixJs');
})
.on('change', config.gulp.onChange);

gulp.watch('**/*.{md,hbs}', { cwd: config.statix.dir }, ['assemble'])
gulp.watch('**/*.{md,hbs}', { cwd: `${config.statix.dir}${config.statix.srcDir}` }, ['assemble'])
.on('change', config.gulp.onChange);
});

Expand Down
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 @@ -64,6 +64,7 @@
"kickoff-welcome.js": "1.4.0",
"lite-ready": "1.0.4",
"normalize-scss": "6.0.0",
"run-sequence": "^1.2.2",
"svg4everybody": "2.1.8"
},
"devDependencies": {
Expand Down
11 changes: 9 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1896,7 +1896,7 @@ center-align@^0.1.1:
align-text "^0.1.3"
lazy-cache "^1.0.3"

chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
chalk@*, chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
dependencies:
Expand Down Expand Up @@ -4456,7 +4456,7 @@ gulp-tap@1.0.1:
dependencies:
through2 "^2.0.3"

gulp-util@3.0.8, gulp-util@^3, gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.1, gulp-util@^3.0.4, gulp-util@^3.0.8, gulp-util@~3.0.7:
gulp-util@*, gulp-util@3.0.8, gulp-util@^3, gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.1, gulp-util@^3.0.4, gulp-util@^3.0.8, gulp-util@~3.0.7:
version "3.0.8"
resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
dependencies:
Expand Down Expand Up @@ -8223,6 +8223,13 @@ run-async@^2.2.0:
dependencies:
is-promise "^2.1.0"

run-sequence@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/run-sequence/-/run-sequence-1.2.2.tgz#5095a0bebe98733b0140bd08dd80ec030ddacdeb"
dependencies:
chalk "*"
gulp-util "*"

rx-lite@^3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
Expand Down