diff --git a/.gitignore b/.gitignore index b9683429cd..da1c45be6a 100644 --- a/.gitignore +++ b/.gitignore @@ -24,21 +24,4 @@ logs/ # compiled output dist tmp - -# dependencies -node_modules -bower_components - -# misc -/.sass-cache -/connect.lock -/coverage/* -/libpeerconnection.log -npm-debug.log* -testem.log - -# idea *.ts files -typings/ - -# vscode -jsconfig.json +/commit diff --git a/gradle/scripts/ember.gradle b/gradle/scripts/ember.gradle index ec509be88c..af34b7f120 100644 --- a/gradle/scripts/ember.gradle +++ b/gradle/scripts/ember.gradle @@ -18,7 +18,7 @@ node { workDir = file("${project.buildDir}/nodejs") // Set the work directory for NPM - yarnWorkDir = file("${project.buildDir}/ywarn") + yarnWorkDir = file("${project.buildDir}/yarn") // Set the work directory where node_modules should be located nodeModulesDir = file("${project.projectDir}") diff --git a/wherehows-web/.gitignore b/wherehows-web/.gitignore new file mode 100644 index 0000000000..35216c34ee --- /dev/null +++ b/wherehows-web/.gitignore @@ -0,0 +1,18 @@ +# dependencies +node_modules +bower_components + +# misc +/.sass-cache +/connect.lock +/coverage/* +/libpeerconnection.log +npm-debug.log* +testem.log +yarn-error.log + +# idea *.ts files +typings/ + +# vscode +jsconfig.json diff --git a/wherehows-web/.travis.yml b/wherehows-web/.travis.yml deleted file mode 100644 index d98801699b..0000000000 --- a/wherehows-web/.travis.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -language: node_js -node_js: - - "4" - -sudo: false - -cache: - directories: - - $HOME/.npm - - $HOME/.cache # includes bowers cache - -before_install: - - npm config set spin false - - npm install -g bower - - bower --version - - npm install phantomjs-prebuilt - - node_modules/phantomjs-prebuilt/bin/phantomjs --version - -install: - - npm install - - bower install - -script: - - npm test