Skip to content

Commit

Permalink
rename build to dist
Browse files Browse the repository at this point in the history
  • Loading branch information
jhchen committed Jun 23, 2014
1 parent 17d78c8 commit 1f461a0
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/build
/node_modules
/coverage
/dist
/lib
/node_modules
*.log
7 changes: 5 additions & 2 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@
.travis.yml
_*
bower.json
npm-debug.log
build
*.log
coverage
dist/examples
dist/test
dist/quill-exposed.js
dist/tandem-core.js
examples
grunt
src
Expand Down
11 changes: 6 additions & 5 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@
"Keegan Poppen <keegan.poppen@gmail.com>"
],
"description": "Cross browser rich text editor",
"main": "index.js",
"main": "dist/quill.js",
"license": "BSD",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"build",
"examples",
"test"
"src",
"test",
"Gruntfile.coffee",
"index.js",
"package.json"
]
}
26 changes: 13 additions & 13 deletions grunt/build.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,40 @@ module.exports = (grunt) ->
bundleOptions:
standalone: 'Quill'
files: [
{ 'build/quill.js': ['src/quill.coffee'] }
{ 'build/quill.exposed.js': ['test/quill.coffee'] }
{ 'dist/quill.js': ['src/quill.coffee'] }
{ 'dist/quill.exposed.js': ['test/quill.coffee'] }
]
'tandem':
options:
bundleOptions:
standalone: 'Tandem'
files: [{ 'build/tandem-core.js': ['node_modules/tandem-core/index.js'] }]
files: [{ 'dist/tandem-core.js': ['node_modules/tandem-core/index.js'] }]
'quill-watchify':
options:
bundleOptions:
standalone: 'Quill'
keepAlive: true
watch: true
files: [{ 'build/quill.js': ['src/quill.coffee'] }]
files: [{ 'dist/quill.js': ['src/quill.coffee'] }]
'quill-exposed-watchify':
options:
bundleOptions:
standalone: 'Quill'
keepAlive: true
watch: true
files: [{ 'build/quill.exposed.js': ['test/quill.coffee'] }]
files: [{ 'dist/quill.exposed.js': ['test/quill.coffee'] }]
)

grunt.config('clean',
all: ['build']
all: ['dist']
coffee: ['lib']
coverage: ['src/**/*.js']
)

grunt.config('coffee',
all:
expand: true
dest: 'build/'
dest: 'dist/'
src: ['examples/scripts/*.coffee', 'test/**/*.coffee']
ext: '.js'
src:
Expand All @@ -70,15 +70,15 @@ module.exports = (grunt) ->
' * Jason Chen, Salesforce.com\n' +
' */\n\n'
quill:
'build/quill.js': ['build/quill.js']
'build/quill.min.js': ['build/quill.min.js']
'dist/quill.js': ['dist/quill.js']
'dist/quill.min.js': ['dist/quill.min.js']
)

grunt.config('jade',
all:
options:
pretty: true
dest: 'build/'
dest: 'dist/'
expand: true
ext: '.html'
src: ['examples/*.jade', 'test/fixtures/*.jade']
Expand All @@ -96,17 +96,17 @@ module.exports = (grunt) ->
flatten: true
src: 'src/themes/**/*.styl'
rename: (dest, src) ->
return "build/themes/quill.#{src}"
return "dist/themes/quill.#{src}"
}]
examples:
expand: true
ext: '.css'
dest: 'build/'
dest: 'dist/'
src: ['examples/styles/*.styl']
)

grunt.config('uglify',
quill:
files: { 'build/quill.min.js': ['build/quill.js'] }
files: { 'dist/quill.min.js': ['dist/quill.js'] }
)

2 changes: 1 addition & 1 deletion test/e2e/edit.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ switchToEditorFrame = ->
browser.driver.switchTo().frame(browser.driver.findElement(By.tagName("iframe")))

describe('Editing text', ->
browser.driver.get('http://localhost:9000/build/demo/index.html')
browser.driver.get('http://localhost:9000/dist/demo/index.html')

it('click into editor', ->
browser.driver.findElement(By.id('editor-container')).click()
Expand Down
2 changes: 1 addition & 1 deletion test/karma.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ var customLaunchers = _.reduce(browsers, function(memo, browser, name) {

module.exports = function(config) {
config.set({
basePath: '../build',
basePath: '../dist',
frameworks: ['jasmine'],
files: [
'../node_modules/jquery/dist/jquery.js',
Expand Down
2 changes: 1 addition & 1 deletion test/protractor.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ exports.config = {
allScriptsTimeout: 11000,

specs: [
'../build/test/e2e/*.js'
'../dist/test/e2e/*.js'
],
exclude: [],

Expand Down

0 comments on commit 1f461a0

Please sign in to comment.