Skip to content
This repository has been archived by the owner on Mar 16, 2024. It is now read-only.

Commit

Permalink
fix(githubUsername): Broken object
Browse files Browse the repository at this point in the history
  • Loading branch information
mevbg committed Apr 11, 2017
1 parent 17e76d2 commit bfe18b3
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions Gruntfile.js
Expand Up @@ -3,7 +3,7 @@ module.exports = function(grunt) {
assets = grunt.file.exists('../assets.json') ?
grunt.file.readJSON('../assets.json').path :
'node_modules/my-jquery-plugins-assets/',
config = grunt.file.readJSON(assets + 'configs/config.json'),
common = grunt.file.readJSON(assets + 'configs/common.json'),
pkg = grunt.file.readJSON('package.json'),
settings = grunt.file.readJSON('configs/settings.json'),
banner = require(assets + 'configs/banner'),
Expand All @@ -13,18 +13,18 @@ module.exports = function(grunt) {
grunt.pluginData = {
assets: assets,
pkg: pkg,
config: config,
common: common,
settings: settings,
prod: prod,
env: env,

envPath: !prod ?
'assets/page/' :
'http://assets.' + config.domain + '/',
'http://assets.' + common.domain + '/',

banner: banner,

domain: pkg.name.toLowerCase() + '.' + config.domain
domain: pkg.name.toLowerCase() + '.' + common.domain
};

require('time-grunt')(grunt);
Expand Down
2 changes: 1 addition & 1 deletion configs/grunt/connect.js
Expand Up @@ -4,7 +4,7 @@ var grunt = require('grunt'),
module.exports = {
server: {
options: {
port: grunt.pluginData.config.port,
port: grunt.pluginData.common.port,
base: '.',
livereload: false
}
Expand Down
6 changes: 3 additions & 3 deletions configs/grunt/open.js
Expand Up @@ -3,7 +3,7 @@ var grunt = require('grunt');
module.exports = {
dev : {
app: 'Google Chrome',
path: 'http://localhost:<%= config.port %>'
path: 'http://localhost:<%= common.port %>'
},

prod : {
Expand All @@ -13,11 +13,11 @@ module.exports = {

build: {
app: 'Google Chrome',
path: 'https://travis-ci.org/<%= config.githubUsername %>/<%= pkg.name %>/builds'
path: 'https://travis-ci.org/<%= common.githubUsername %>/<%= pkg.name %>/builds'
},

repo: {
app: 'Google Chrome',
path: 'https://github.com/<%= config.githubUsername %>/<%= pkg.name %>'
path: 'https://github.com/<%= common.githubUsername %>/<%= pkg.name %>'
}
};
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -65,7 +65,7 @@
"lib-sass-data-uri": "0.0.2",
"load-grunt-config": "^0.19.2",
"load-grunt-tasks": "^3.2.0",
"my-jquery-plugins-assets": " git://github.com/martinmethod/my-jquery-plugins-assets.git#v1.5.0",
"my-jquery-plugins-assets": " git://github.com/martinmethod/my-jquery-plugins-assets.git#v1.6.0",
"node-sass-globbing": "0.0.23",
"time-grunt": "^1.2.1"
},
Expand Down

0 comments on commit bfe18b3

Please sign in to comment.