Skip to content

Commit

Permalink
Remove gulp; shift compilation to package.json
Browse files Browse the repository at this point in the history
  • Loading branch information
philipbelesky committed Aug 15, 2018
1 parent a5ec434 commit 1d2ba43
Show file tree
Hide file tree
Showing 16 changed files with 6,047 additions and 5,852 deletions.
42 changes: 23 additions & 19 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
{
"root": true,
"env": {
"node": true,
"browser": true, // Browser window global variables
"jquery": true // jQuery global variable
},
"extends": [
"plugin:vue/essential",
"@vue/airbnb"
],
"rules": {
"root": true,
"env": {
"node": true,
"browser": true, // Browser window global variables
"jquery": true // jQuery global variable
},
"extends": [
"plugin:vue/essential",
"@vue/airbnb"
],
"rules": {
"semi": 0, // Disallow semi colons for now
"no-var": "off",
"func-names": "off", // Conflicts with vue
"object-shorthand": "off", // Conflicts with vue
},
"parserOptions": {
"parser": "babel-eslint"
},
"plugins": [
"html"
],
}
},
"parserOptions": {
"parser": "babel-eslint"
},
"plugins": [
"html"
],
"overrides": {
"files": "your/globs/**/*.js",
},
}

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ tabbycat/staticfiles/
tabbycat/static/css/
tabbycat/static/js/
tabbycat/static/jsi18n/
tabbycat/static/vue/
tabbycat/static/fonts/

# Translations
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.9.4
8.11.3
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ The frontend's translation files are manually updated in ``tabbycat/locale/LANGU
$ dj compilemessages -l es # or whichever language(s) you want to update
$ dj compilejsi18n -l es

These are then also committed to git to save users needing to run `compilejsi18n` during setup. The resulting files are then bundled as part of a gulp task.
These are then also committed to git to save users needing to run `compilejsi18n` during setup. The resulting files are then bundled as part of the npm build task.

Release Checklist
=================
Expand Down
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ RUN pip install -r ./requirements.txt
RUN npm install

# Compile all the static files
RUN npm -g install gulp-cli # Needed for the gulp command to then work
RUN npm rebuild node-sass --force
RUN NODE_ENV='production' npm run build
RUN python ./tabbycat/manage.py collectstatic --noinput -v 0
201 changes: 0 additions & 201 deletions Gulpfile.js

This file was deleted.

4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ test_script:
- cd c:\projects\tabbycat
- copy tabbycat\local_settings.example tabbycat\local_settings.py # Need to use local build opt
# Update local connection settings
# Test gulp building
- gulp build
# Test asset building
- npm run build
- python tabbycat/manage.py collectstatic
# Test Docker Building
# This fails at apt-get; apparently something to do with
Expand Down
5 changes: 3 additions & 2 deletions bin/post_compile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ python manage.py clearcache
echo "-----> Running dynamic preferences checks"
python manage.py checkpreferences

echo "-----> Running gulp compilation"
NODE_ENV='production' gulp build
echo "-----> Running static asset compilation"
npm install -g @vue/cli-service-global
NODE_ENV='production' npm run build

echo "-----> Running static files compilation"
python manage.py collectstatic --noinput -v 0
Expand Down
Loading

0 comments on commit 1d2ba43

Please sign in to comment.