Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
coopwire-hypothesis
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
孙灵跃 Leon Sun
coopwire-hypothesis
Commits
8f7925a4
Commit
8f7925a4
authored
Oct 20, 2016
by
Sean Roberts
Committed by
GitHub
Oct 20, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #151 from hypothesis/remove-app-suffix-from-gulp-tasks
Remove the "-app" suffix from Gulp tasks
parents
b6860bcb
096a1177
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
16 deletions
+9
-16
gulpfile.js
gulpfile.js
+7
-14
package.json
package.json
+2
-2
No files found.
gulpfile.js
View file @
8f7925a4
...
...
@@ -110,13 +110,13 @@ var appBundleConfigs = appBundles.map(function (config) {
return
Object
.
assign
({},
appBundleBaseConfig
,
config
);
});
gulp
.
task
(
'build-
app-
js'
,
[
'build-vendor-js'
],
function
()
{
gulp
.
task
(
'build-js'
,
[
'build-vendor-js'
],
function
()
{
return
Promise
.
all
(
appBundleConfigs
.
map
(
function
(
config
)
{
return
createBundle
(
config
);
}));
});
gulp
.
task
(
'watch-
app-
js'
,
[
'build-vendor-js'
],
function
()
{
gulp
.
task
(
'watch-js'
,
[
'build-vendor-js'
],
function
()
{
appBundleConfigs
.
forEach
(
function
(
config
)
{
createBundle
(
config
,
{
watch
:
true
});
});
...
...
@@ -264,15 +264,8 @@ gulp.task('start-live-reload-server', function () {
liveReloadServer
=
new
LiveReloadServer
(
3000
,
'http://localhost:5000'
);
});
gulp
.
task
(
'build-app'
,
[
'build-app-js'
,
'build-css'
,
'build-fonts'
,
'build-images'
],
generateManifest
);
gulp
.
task
(
'build'
,
[
'build-
app-
js'
,
[
'build-js'
,
'build-css'
,
'build-fonts'
,
'build-images'
],
...
...
@@ -280,7 +273,7 @@ gulp.task('build',
gulp
.
task
(
'watch'
,
[
'start-live-reload-server'
,
'watch-
app-
js'
,
'watch-js'
,
'watch-css'
,
'watch-fonts'
,
'watch-images'
,
...
...
@@ -311,15 +304,15 @@ function runKarma(baseConfig, opts, done) {
},
cliOpts
,
opts
),
done
).
start
();
}
gulp
.
task
(
'test
-app
'
,
function
(
callback
)
{
gulp
.
task
(
'test'
,
function
(
callback
)
{
runKarma
(
'./h/static/scripts/karma.config.js'
,
{
singleRun
:
true
},
callback
);
});
gulp
.
task
(
'test-watch
-app
'
,
function
(
callback
)
{
gulp
.
task
(
'test-watch'
,
function
(
callback
)
{
runKarma
(
'./h/static/scripts/karma.config.js'
,
{},
callback
);
});
gulp
.
task
(
'upload-sourcemaps'
,
[
'build-
app-
js'
],
function
()
{
gulp
.
task
(
'upload-sourcemaps'
,
[
'build-js'
],
function
()
{
var
uploadToSentry
=
require
(
'./scripts/gulp/upload-to-sentry'
);
var
opts
=
{
...
...
package.json
View file @
8f7925a4
...
...
@@ -132,10 +132,10 @@
"jquery"
:
"$"
},
"scripts"
:
{
"build"
:
"gulp build
-app
"
,
"build"
:
"gulp build"
,
"deps"
:
"check-dependencies"
,
"lint"
:
"eslint ."
,
"test"
:
"gulp test
-app
"
,
"test"
:
"gulp test"
,
"preversion"
:
"npm run test"
,
"version"
:
"make clean all && ./scripts/update-changelog.js && git add CHANGELOG.md"
,
"postversion"
:
"./scripts/postversion.sh"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment