Skip to content

Commit b7d14e2

Browse files
Fully switch to npm, webpack and babel as build tools
Signed-off-by: Christoph Wurst <[email protected]>
1 parent 1cc480a commit b7d14e2

File tree

111 files changed

+5463
-9636
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+5463
-9636
lines changed

Diff for: .jshintrc

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"camelcase": false,
3+
"eqeqeq": true,
4+
"immed": true,
5+
"latedef": false,
6+
"noarg": true,
7+
"nonbsp": true,
8+
"undef": true,
9+
"unused": true,
10+
"trailing": true,
11+
"maxparams": 5,
12+
"curly": true,
13+
"maxlen": 120,
14+
"indent": 4,
15+
"browser": true,
16+
"globals": {
17+
"console": true,
18+
"it": true,
19+
"xit": true,
20+
"expect": true,
21+
"describe": true,
22+
"define": true,
23+
"beforeEach": true,
24+
"afterEach": true,
25+
"require": true
26+
},
27+
"esversion": 6,
28+
"asi": true
29+
}

Diff for: .travis.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,8 @@ before_script:
2727
# Faster builds if we don't need xdebug
2828
- if [[ "$WS_TEST" != "php" ]]; then phpenv config-rm xdebug.ini; fi
2929

30-
# Install yarn
31-
- npm install -g yarn
32-
3330
# Install dependencies
3431
- if [[ "$WS_TEST" = "js" ]]; then npm install; fi
35-
- if [[ "$WS_TEST" = "js" ]]; then ./node_modules/bower/bin/bower install; fi
3632
- if [[ "$WS_TEST" = "php" ]]; then composer install; fi
3733

3834
# Set up DB
@@ -55,8 +51,7 @@ script:
5551
- if [[ "$WS_TEST" = "php_lint" ]]; then find . -name \*.php -not -path './vendor/*' -exec php -l "{}" \;; fi
5652

5753
# JS
58-
- if [[ "$WS_TEST" = "js" ]]; then ./node_modules/grunt-cli/bin/grunt; fi
59-
- if [[ "$WS_TEST" = "js" ]]; then ./node_modules/grunt-cli/bin/grunt karma:continuous; fi
54+
- if [[ "$WS_TEST" = "js" ]]; then npm run build; fi
6055

6156
after_script:
6257
- if [[ "$WS_TEST" = "php" ]]; then cat storage/logs/laravel.log; fi

Diff for: Gruntfile.js

-77
This file was deleted.

Diff for: app/client/js/entertab.js

-48
This file was deleted.

Diff for: app/client/js/models/wine.js

-64
This file was deleted.

Diff for: app/client/js/retastebutton.js

-86
This file was deleted.

Diff for: app/client/js/views/errormodalview.js

-40
This file was deleted.

0 commit comments

Comments
 (0)