Skip to content

Commit

Permalink
Move luaparse.js to the root now that we can
Browse files Browse the repository at this point in the history
  • Loading branch information
oxyc committed Jun 4, 2013
1 parent 3a8a4da commit f708400
Show file tree
Hide file tree
Showing 13 changed files with 16 additions and 17 deletions.
4 changes: 2 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module.exports = function (grunt) {
' */\n'
},
dist: {
src: ['lib/luaparse.js'],
src: ['luaparse.js'],
dest: 'dist/<%= pkg.name %>.js'
}
},
Expand All @@ -45,7 +45,7 @@ module.exports = function (grunt) {
browser: {
options: { browser: true, globals: { define: true } },
src: [
'lib/*.js',
'luaparse.js',
'examples/**/*.js',
'benchmarks/*.js'
]
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ update:
# Usage: make VERSION=0.1.0 version-bump
version-bump:
@sed -i 's|\("version": "\)[^"]*\("\)|\1$(VERSION)\2|' bower.json package.json
@sed -i "s|\(exports\.version = '\)[^']*\('\)|\1$(VERSION)\2|" lib/luaparse.js
@git add package.json bower.json lib/luaparse.js
@sed -i "s|\(exports\.version = '\)[^']*\('\)|\1$(VERSION)\2|" luaparse.js
@git add package.json bower.json luaparse.js
@git commit -m "Version $(VERSION)"
@git tag "v$(VERSION)"

Expand Down Expand Up @@ -67,7 +67,7 @@ scaffold-test:
docs: docco coverage docs-test docs-md

docco:
@$(BIN)/doccoh lib/*.js
@$(BIN)/doccoh luaparse.js

docs-test:
@$(MAKE) -s test REPORTER=doc \
Expand Down Expand Up @@ -114,7 +114,7 @@ complexity-analysis:
@./scripts/complexity 10
@node $(LIB)/complexity-report/src/cli.js \
-lws --maxcc 15 \
lib/luaparse.js
luaparse.js

coverage-analysis: coverage
@$(BIN)/istanbul check-coverage --statements -7 --branches -11 --functions -1 \
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "luaparse",
"version": "0.0.11",
"main": "./lib/luaparse.js",
"main": "./luaparse.js",
"dependencies": {},
"ignore": [
"**/.*",
Expand Down
2 changes: 1 addition & 1 deletion docs/coverage.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Coverage is reported using [istanbul](https://github.com/yahoo/istanbul).

<iframe src="coverage/lib/luaparse.js.html" style="width: 100%; height: 600px"></iframe>
<iframe src="coverage/luaparse/luaparse.js.html" style="width: 100%; height: 600px"></iframe>
2 changes: 1 addition & 1 deletion examples/stats.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<button id="analyze">Analyze</button>

<div id="results"></div>
<script src="../lib/luaparse.js"></script>
<script src="../luaparse.js"></script>
<script src="js/walker.js"></script>
<script src="http://code.jquery.com/jquery-1.8.3.min.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion examples/treeview.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<div id="tree"></div>
</div>

<script src="../lib/luaparse.js"></script>
<script src="../luaparse.js"></script>
<script src="//yui.yahooapis.com/combo?2.9.0/build/yahoo-dom-event/yahoo-dom-event.js&2.9.0/build/treeview/treeview-min.js"></script>
<script src="//d1n0x3qji82z53.cloudfront.net/src-min-noconflict/ace.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = require(process.env.COVERAGE ? './lib-cov/luaparse' : './lib/luaparse');
module.exports = require('./luaparse');
1 change: 0 additions & 1 deletion lib/.jshintrc

This file was deleted.

File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/complexity
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env node
var cr = require('complexity-report')
, fs = require('fs')
, script = fs.readFileSync(__dirname + '/../lib/luaparse.js', 'utf-8')
, script = fs.readFileSync(__dirname + '/../luaparse.js', 'utf-8')
, args = process.argv.slice(2)
, threshold = 10
, options = { logicalor: false, switchcase: false };
Expand Down
2 changes: 1 addition & 1 deletion test/benchmarks.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
paths: {
benchmark: 'lib/benchmark'
, jquery: 'http://code.jquery.com/jquery-1.8.3.min'
, luaparse: '../lib/luaparse'
, luaparse: '../luaparse'
, text: 'https://github.com/requirejs/text/raw/master/text'
}
});
Expand Down
4 changes: 2 additions & 2 deletions test/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
require({
// RequireJS accepts relative paths in the module name; `curl.js` does
// not. Both accept a `paths` map of module paths to relative paths.
'paths': { 'luaparse': '../lib/luaparse' },
'paths': { 'luaparse': '../luaparse' },
// Thwart aggressive resource caching. RequireJS only.
'urlArgs': 'async=' + (+new Date())
}, ['luaparse', 'runner'].concat(specs), function (Spec, testSuite) {
Expand All @@ -67,7 +67,7 @@
testSuite.run();
});
} else {
this.document.write('<script src="../lib/luaparse.js"><\/script>');
this.document.write('<script src="../luaparse.js"><\/script>');

Spec.forEach(specs, function(spec) {
this.document.write('<script src="spec/' + spec + '.js"><\/script>');
Expand Down
2 changes: 1 addition & 1 deletion test/runner.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

var Spec = load('Spec', './lib/spec')
, Newton = load('Newton', './lib/newton')
, luaparse = load('luaparse', '../lib/luaparse')
, luaparse = load('luaparse', '../luaparse')
, options = { scope: true }
, specs = [
'assignments'
Expand Down

0 comments on commit f708400

Please sign in to comment.