Skip to content
This repository has been archived by the owner on Nov 20, 2018. It is now read-only.

#1569 build cleanup #1633

Merged
merged 31 commits into from
Aug 8, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
6cacd4e
chore(build): start cleaning up build
Jul 29, 2016
5b4766d
chore(travis.yml): remove ci branch limits
Jul 29, 2016
4ab9728
chore(build): move jscs linting to makefile
Jul 29, 2016
86241fd
chore(build): move jscs linting to makefile
Jul 29, 2016
c1533d1
chore(build): move jshint linting to makefile
Jul 29, 2016
e174c39
chore(build): concat, minify, and source maps for all artifacts
Aug 1, 2016
d034eed
fix(build): travis tests fail w/out grunt uglify
Aug 1, 2016
c63725a
chore(build): move test runner logic into Makefile
Aug 3, 2016
df76114
fix(build): create _build dir before building
Aug 3, 2016
4d797bd
chore(build): lint before test
Aug 3, 2016
20f904c
chore(build): cleanup test-related Grunt deps
Aug 3, 2016
053d4d5
chore(build): cp non-js to _build
rnicholus Aug 6, 2016
2fb7515
chore(build): minify css in build target
rnicholus Aug 6, 2016
9c10712
chore(build): create zip files for download
rnicholus Aug 6, 2016
e24fe2a
chore(build): JS header comment
Aug 7, 2016
7f3f2a2
chore(build): prepare for publish to npm
Aug 7, 2016
c9f3e6e
chore(build): run build with more recent version of node
Aug 7, 2016
bd06868
chore(build): goodbye grunt
Aug 7, 2016
1bb3135
chore(build): cleanup package.json
Aug 7, 2016
7cd196e
chore(package.json): add contributors
Aug 7, 2016
370bfca
chore(Makefile): easy version rev
Aug 7, 2016
93f3787
chore(Makefile): final cleanup
Aug 8, 2016
260a50b
chore(Makefile): leave out core for jquery builds
Aug 8, 2016
f0757fa
chore(Makefile): include dnd in published artifacts too
Aug 8, 2016
e55eb90
docs(README.md): update build/test instructions
Aug 8, 2016
d1324a5
chore(build): prepare for 5.11.0 release
Aug 8, 2016
4a6a502
chore(build): more consistent name for dnd zip
Aug 8, 2016
eda9119
chore(build): don't need a standalone dnd zip
Aug 8, 2016
89a96d0
fix(build): source files missing from sourcemap
Aug 8, 2016
6345c09
docs(getting started): update quickstart w/ ui/core build refs
Aug 8, 2016
e2bf728
docs(getting started): typo
Aug 8, 2016
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
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ master
hardcopy*
selenium.log*

pid.txt
root-server.PID
test-resources-server.PID

fine-uploader/
test/upload/*
Expand All @@ -35,8 +36,6 @@ node_modules/

bin/

build/

src

npm-debug.log
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

18 changes: 14 additions & 4 deletions .jscsrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
{
"excludeFiles": ["client/js/third-party/**/*.js"],
"preset": "airbnb",

"disallowKeywordsOnNewLine": false,
"disallowMultipleVarDecl": false,
"disallowSpaceAfterObjectKeys": true,

"disallowSpacesInCallExpression": false,
"maximumLineLength": false,
"validateIndentation": 4,
"validateQuoteMarks": "\"",

"requireDollarBeforejQueryAssignment": false,
"requirePaddingNewLinesAfterBlocks": false,
"requirePaddingNewLinesBeforeLineComments": false,
"requireSpaceAfterComma": false,
"requireSpacesInAnonymousFunctionExpression": false,
"requireSpaceBeforeBlockStatements": false,
"requireSpacesInsideObjectBrackets": false,
"requireTrailingComma": false,
"safeContextKeyword": ["self", "handler", "thisSignatureRequester", "controller"]
}
}
2 changes: 1 addition & 1 deletion .jshintignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
client/js/third-party/*.js
client/js/third-party/*
2 changes: 1 addition & 1 deletion .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"eqeqeq" : true, // Require triple equals i.e. `===`.
"forin" : true, // Tolerate `for in` loops without `hasOwnPrototype`.
"immed" : true, // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
"latedef" : true, // Prohibit variable use before definition.
"latedef" : false, // Prohibit variable use before definition.
"newcap" : true, // Require capitalization of all constructor functions e.g. `new F()`.
"noarg" : true, // Prohibit use of `arguments.caller` and `arguments.callee`.
"noempty" : true, // Prohibit use of empty blocks.
Expand Down
11 changes: 1 addition & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ sudo: false
language: node_js

node_js:
- '0.10.33'
- '5.0.0'

env:
global:
- LOGS_DIR=/tmp/fineuploader-build/logs
- DISPLAY=:99.0
- secure: |-
AZ/GEWzykeSzxh+4r14eKq2dMQnZyEvx99zFnTSp30Ke9QqJP3UQvMdwHzuV
Expand All @@ -23,11 +22,3 @@ env:

before_script:
- "sh -e /etc/init.d/xvfb start"

branches:
only:
- master
- develop
- /^feature.*$/
- /^.*fix.*$/
- /^release.*$/
File renamed without changes.
70 changes: 0 additions & 70 deletions Gruntfile.js

This file was deleted.

Loading