Skip to content

Commit

Permalink
updates for yarn/npm install
Browse files Browse the repository at this point in the history
  • Loading branch information
bhofmei committed Aug 15, 2017
1 parent a23dd74 commit 0addba0
Show file tree
Hide file tree
Showing 7 changed files with 72 additions and 64 deletions.
3 changes: 0 additions & 3 deletions .bowerrc

This file was deleted.

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ test/*
!test/spec
!test/run-jasmine.js
!test/data
built
node_modules
6 changes: 6 additions & 0 deletions .jsbeautifyrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"js": {
"keep_array_indentation": false,
"break_chained_methods": true,
}
}
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@ node_js:
- 7
sudo: false
cache:
directories:
- $HOME/.cache/bower
- pip
- yarn
before_install:
- pip install --user RangeHTTPServer
- npm install -g bower
install:
- bower install
- yarn install
before_script:
- python -m RangeHTTPServer &
script:
Expand Down
23 changes: 0 additions & 23 deletions bower.json

This file was deleted.

9 changes: 7 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
"description": "Multiple heatmap-style plots for user-specified sequence contexts",
"main": "js/main.js",
"scripts": {
"preinstall": "export YN=1",
"postinstall": "unset YN",
"test": "echo \"Error: no test specified\" && exit 1"
},

"repository": {
"type": "git",
"url": "git+https://github.com/bhofmei/jbplugin-nucdens.git"
Expand All @@ -29,5 +30,9 @@
"directories": {
"test": "test"
},
"homepage": "https://github.com/bhofmei/jbplugin-nucdens#readme"
"homepage": "https://github.com/bhofmei/jbplugin-nucdens#readme",
"devDependencies": {
"jasmine": "^2.7.0",
"jbrowse" : "git+https://github.com/bhofmei/jbrowse"
}
}
86 changes: 55 additions & 31 deletions test/index.html
Original file line number Diff line number Diff line change
@@ -1,46 +1,70 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http:https://www.w3.org/TR/html4/loose.dtd">
<html>

<head>
<meta charset="utf-8">
<title>Jasmine Spec Runner</title>
<meta charset="utf-8">
<title>Jasmine Spec Runner</title>

<link rel="stylesheet" href="jasmine-core/lib/jasmine-core/jasmine.css">
<script src="jasmine-core/lib/jasmine-core/jasmine.js"></script>
<script src="jasmine-core/lib/jasmine-core/jasmine-html.js"></script>
<script src="jasmine-core/lib/jasmine-core/boot.js"></script>
<link rel="stylesheet" href="../node_modules/jasmine-core/lib/jasmine-core/jasmine.css">
<script src="../node_modules/jasmine-core/lib/jasmine-core/jasmine.js"></script>
<script src="../node_modules/jasmine-core/lib/jasmine-core/jasmine-html.js"></script>
<script src="../node_modules/jasmine-core/lib/jasmine-core/boot.js"></script>
<!--<script src ="jasmine-jquery/lib/jasmine-jquery.js"></script>
<script src="jquery/src/jquery.js"></script>-->

<!-- include source files here... -->
<script type="text/javascript" src="dojo/dojo.js" data-dojo-config="async: 1" ></script>

<script type="text/javascript">
require( { baseUrl: '.',
packages: [
'dojo',
'dijit',
'dojox',
'jszlib',
{ name: 'lazyload', location: 'lazyload', main: 'lazyload' },
'dgrid',
'dstore',
'FileSaver',
{ name: 'jDataView', location: 'jDataView/src', main: 'jdataview' },
{ name: 'JBrowse', location: 'jbrowse/src/JBrowse' },
{ name: 'NucleotideDensityPlugin', location: '../js' }
]
},
['dojo/ready','JBrowse/Browser','NucleotideDensityPlugin/View/Track/NucleotideDensity', 'NucleotideDensityPlugin/View/ColorHandler'],
function( ready,Browser,NucleotideDensity, colorHandler ) {
});
</script>
<script type="text/javascript" src="spec/NucleotideDensityPlugin.spec.js"></script>
<!-- include source files here... -->
<script type="text/javascript" src="../node_modules/dojo/dojo.js" data-dojo-config="async: 1"></script>

<script type="text/javascript">
require({
baseUrl: '../node_modules',
packages: [
'dojo',
'dijit',
'dojox',
'jszlib',
'dgrid',
{
name: 'lazyload',
location: 'lazyload',
main: 'lazyload'
},
{
name: 'dstore',
location: "dojo-dstore"
},
{
name: 'FileSaver',
location: 'filesaver.js/',
main: 'FileSaver'
},
{
name: 'jDataView',
location: 'jDataView/src',
main: 'jdataview'
},
{
name: 'JBrowse',
location: 'jbrowse/src/JBrowse'
},
{
name: 'NucleotideDensityPlugin',
location: '../js'
}
]
}, ['dojo/ready', 'JBrowse/Browser', 'NucleotideDensityPlugin/View/Track/NucleotideDensity', 'NucleotideDensityPlugin/View/ColorHandler'],
function(ready, Browser, NucleotideDensity, colorHandler) {});

</script>
<script type="text/javascript" src="spec/NucleotideDensityPlugin.spec.js"></script>


</head>

<body>
<div id="sandbox" style="overflow:hidden; height:1px;"></div>
<div id="sandbox" style="overflow:hidden; height:1px;"></div>

</body>

</html>

0 comments on commit 0addba0

Please sign in to comment.