Skip to content
This repository has been archived by the owner on Apr 10, 2019. It is now read-only.

Commit

Permalink
get rid of tmp build folder and start ignoring the dist folder
Browse files Browse the repository at this point in the history
  • Loading branch information
jgravois committed Dec 22, 2015
1 parent 205e9e4 commit 003f3ff
Show file tree
Hide file tree
Showing 44 changed files with 20 additions and 4,067 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Expand Up @@ -10,6 +10,10 @@ complexity.xml
# Ignore environment variables set on this machine
.env

# Ignore built content
dist/
tmp/

# Mac
.DS_Store
Icon
Expand Down
47 changes: 10 additions & 37 deletions Gruntfile.js
Expand Up @@ -5,7 +5,7 @@ module.exports = function(grunt) {
pkg: grunt.file.readJSON('package.json'),

connect: {
dev: {
dist: {
options: {
port: 8080,
base: '.',
Expand Down Expand Up @@ -60,10 +60,10 @@ module.exports = function(grunt) {
],
tasks: [
'jshint',
'clean:dev',
'compass:dev',
'clean:dist',
'compass:dist',
'handlebars',
'concat:dev'
'concat:dist'
]
// options: {
// nospawn: true
Expand Down Expand Up @@ -92,14 +92,6 @@ module.exports = function(grunt) {
noLineComments: true,
raw: 'asset_cache_buster :none\n'
}
},
// Development
dev: {
options: {
sassDir: 'src/scss',
cssDir: 'tmp',
imagesDir: 'src/img'
}
}
},

Expand Down Expand Up @@ -142,21 +134,6 @@ module.exports = function(grunt) {
// define a string to put between each file in the concatenated output
separator: '\n\n'
},
dev: {
files: {
'tmp/geotrigger-editor.js': [
'src/js/header.js',
'src/js/app.js',
'tmp/templates.js',
'src/js/lib/*.js',
'src/js/modules/*.js',
'src/js/controllers/*.js',
'src/js/models/*.js',
'src/js/views/*.js',
'src/js/footer.js'
]
}
},
dist: {
files: {
'dist/js/<%= pkg.name %>.js': [
Expand Down Expand Up @@ -214,12 +191,6 @@ module.exports = function(grunt) {
src: [
'dist/img/'
]
},
dev: {
src: [
'tmp/geotrigger-editor.css',
'tmp/geotrigger-editor.js'
]
}
},

Expand Down Expand Up @@ -364,11 +335,12 @@ module.exports = function(grunt) {

grunt.registerTask('dev', [
'jshint',
'clean:dev',
'compass:dev',
'clean:dist',
'compass:dist',
'handlebars',
'concat:dev',
'connect:dev',
'concat:dist',
'build_img',
'connect:dist',
'watch'
]);

Expand All @@ -379,6 +351,7 @@ module.exports = function(grunt) {
'compass:dist',
'handlebars',
'concat:dist',
'build_img',
'uglify:dist'
]);

Expand Down
7 changes: 4 additions & 3 deletions README.md
Expand Up @@ -15,7 +15,7 @@ This is the open source version of the Geotrigger Editor available for Esri cust

### Installation

The `dist` folder contains all the files you need to include the Geotrigger Editor in your project.
Tagged releases include a `dist` folder which contains all the files you need to include the Geotrigger Editor in your project.

* The built JavaScript and CSS files are available in both expanded and minified versions in `dist/js` and `dist/css` respectively.
* All images used by the Editor are in `dist/img`.
Expand Down Expand Up @@ -140,11 +140,12 @@ Once Node.js is installed, you can install the Grunt command line interface by r
#### Local Setup

1. Clone the repository and `cd` into the `geotrigger-editor` directory.
1. Run `npm install` to lay down the project's dependencies.
2. Run `npm install` to lay down the project's dependencies.
3. Run `grunt` to compile the source code and spin up a local server which watches the source code for changes.

#### Working locally

You'll need an HTTP server to serve files from the root of the repository. The `grunt dev` task takes care of building all source files to temporary files ignored by git (`src/js/geotrigger-editor.js` and `src/css/geotrigger-editor.css`), watching local files for changes, and running a local server for you at http://localhost:8080 (see the `Grunt Tasks` section for more information).
You'll need an HTTP server to serve files from the root of the repository. The `grunt dev` task takes care of building all source files to the `dist` folder (`dist/js/geotrigger-editor.js` and `dist/css/geotrigger-editor.css`), watching local files for changes, and running a local server for you at http://localhost:8080 (see the `Grunt Tasks` section for more information).

#### Testing locally (todo)

Expand Down

0 comments on commit 003f3ff

Please sign in to comment.