-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updated versioning, changelog, and cleanup (#18)
* Updated versioning, changelog, and cleanup * Version bump in eslint-config-enact to disable jsdoc rule. Reviewed-By: Ryan Duffy ([email protected]) Integrated-By: Aaron Tam ([email protected])
- Loading branch information
Showing
4 changed files
with
60 additions
and
106 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,77 +1,10 @@ | ||
var | ||
path = require('path'), | ||
fs = require('fs'), | ||
appConfig = require('./src/app-config'), | ||
isoConfig = require('./src/iso-config'), | ||
containerConfig = require('./src/container-app-config'), | ||
libConfig = require('./src/library-config'), | ||
karmaConfig = require('./src/karma-config'), | ||
mixin = require('./src/mixin'), | ||
entrypoint = require('./src/entrypoint'); | ||
|
||
var opts; | ||
try { | ||
var obj = JSON.parse(fs.readFileSync('./package.json', {encoding:'utf8'})); | ||
opts = obj.enact || {}; | ||
} catch(e) { | ||
opts = {}; | ||
} | ||
|
||
var customProps = ['name', 'title', 'namedLibs', 'ri', 'htmlTemplate', 'prerender', 'alwaysPrerender', 'screenTypes']; | ||
|
||
var setup = function(config, overrides, entryDeps) { | ||
for(var i=0; i<customProps.length; i++) { | ||
// ignore our custom properties; assume they've been used directly | ||
delete overrides[customProps[i]]; | ||
} | ||
var updatedConfig = mixin(config, overrides); | ||
updatedConfig.entry = entrypoint(updatedConfig.entry, entryDeps); | ||
return updatedConfig; | ||
}; | ||
|
||
module.exports = { | ||
app: function(args) { | ||
opts = mixin(opts, args || {}); | ||
if(process.env.ENYO_CONTAINER) { | ||
opts.namedLibs = process.env.ENYO_CONTAINER.split(','); | ||
return this.container(opts); | ||
} else { | ||
var app = appConfig(opts); | ||
var iso = (opts.prerender && (process.argv.indexOf('-p')>-1 || opts.alwaysPrerender)) ? isoConfig(opts) : null; | ||
var entries = [require.resolve('babel-polyfill')]; | ||
if(process.argv.indexOf('-p')==-1) { | ||
entries.push(require.resolve('react-addons-perf')); | ||
} | ||
var out = [setup(app, opts, entries)]; | ||
if(iso) { | ||
out.unshift(mixin(iso, opts)); | ||
} | ||
return out.length===1 ? out[0] : out; | ||
} | ||
}, | ||
container: function(args) { | ||
opts = mixin(opts, args || {}); | ||
var c = containerConfig(opts); | ||
return setup(c, opts, []); | ||
}, | ||
library: function(args) { | ||
opts = mixin(opts, args || {}); | ||
var c = libConfig(opts); | ||
return setup(c, opts, []); | ||
}, | ||
karma: function(args) { | ||
opts = mixin(opts, args || {}); | ||
return (function(karmaObj) { | ||
var c = karmaConfig({karma:karmaObj, ri:opts.ri}); | ||
karmaObj.set(mixin(c, opts || {})); | ||
}); | ||
}, | ||
eslint: require('eslint-config-enact'), | ||
babelrc: path.join(__dirname, 'src', '.babelrc'), | ||
webpack: require('webpack'), | ||
ExtractTextPlugin: require('extract-text-webpack-plugin'), | ||
HtmlWebpackPlugin: require('html-webpack-plugin'), | ||
NamedLibraryPlugin: require('./src/NamedLibraryPlugin'), | ||
NamedLibraryRefPlugin: require('./src/NamedLibraryRefPlugin'), | ||
LessPluginRi: require('resolution-independence') | ||
}; | ||
init: require('./global-cli/init'), | ||
pack: require('./global-cli/pack'), | ||
serve: require('./global-cli/serve'), | ||
clean: require('./global-cli/clean'), | ||
lint: require('./global-cli/lint'), | ||
test: require('./global-cli/test'), | ||
transpile: require('./global-cli/transpile') | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
{ | ||
"name": "enact-dev", | ||
"version": "0.2.0", | ||
"version": "0.3.0", | ||
"description": "Full-featured build environment for Enact applications.", | ||
"main": "index.js", | ||
"author": "Jason Robitaille <[email protected]>", | ||
|
@@ -10,43 +10,43 @@ | |
"enact": "./bin/enact.js" | ||
}, | ||
"dependencies": { | ||
"autoprefixer": "~6.5.0", | ||
"babel-core": "~6.17.0", | ||
"babel-eslint": "~7.0.0", | ||
"babel-loader": "~6.2.5", | ||
"autoprefixer": "~6.5.2", | ||
"babel-core": "~6.18.2", | ||
"babel-eslint": "~7.1.0", | ||
"babel-loader": "~6.2.7", | ||
"babel-plugin-dev-expression": "~0.2.1", | ||
"babel-plugin-transform-react-constant-elements": "~6.9.1", | ||
"babel-plugin-transform-react-inline-elements": "~6.8.0", | ||
"babel-preset-es2015": "~6.16.0", | ||
"babel-preset-es2015": "~6.18.0", | ||
"babel-preset-react": "~6.16.0", | ||
"babel-preset-stage-0": "~6.16.0", | ||
"case-sensitive-paths-webpack-plugin": "~1.1.4", | ||
"chai": "~3.5.0", | ||
"chalk": "~1.1.3", | ||
"connect-history-api-fallback": "~1.3.0", | ||
"cross-spawn": "~4.0.2", | ||
"cross-spawn": "~5.0.1", | ||
"css-loader": "~0.25.0", | ||
"detect-port": "~1.0.1", | ||
"detect-port": "~1.0.5", | ||
"dirty-chai": "~1.2.2", | ||
"enyo-console-spy": "enyojs/enyo-console-spy", | ||
"enzyme": "~2.4.1", | ||
"enzyme": "~2.5.1", | ||
"eslint": "~3.9.1", | ||
"eslint-config-enact": "github:enyojs/eslint-config-enact", | ||
"eslint-config-enact": "enyojs/eslint-config-enact#1.1.1", | ||
"eslint-loader": "~1.6.1", | ||
"eslint-plugin-babel": "~3.3.0", | ||
"eslint-plugin-enact": "github:enyojs/eslint-plugin-enact", | ||
"eslint-plugin-react": "~6.5.0", | ||
"eslint-plugin-enact": "enyojs/eslint-plugin-enact#0.1.0", | ||
"eslint-plugin-react": "~6.6.0", | ||
"expose-loader": "~0.7.1", | ||
"extract-text-webpack-plugin": "~1.0.1", | ||
"file-loader": "~0.9.0", | ||
"filesize": "~3.3.0", | ||
"find-cache-dir": "~0.1.1", | ||
"fs-extra": "~0.30.0", | ||
"fs-extra": "~1.0.0", | ||
"glob": "~7.1.1", | ||
"graceful-fs-webpack-plugin": "github:enyojs/graceful-fs-webpack-plugin", | ||
"html-webpack-plugin": "~2.22.0", | ||
"graceful-fs-webpack-plugin": "enyojs/graceful-fs-webpack-plugin#0.1.0", | ||
"html-webpack-plugin": "~2.24.1", | ||
"http-proxy-middleware": "~0.17.2", | ||
"ilib-loader": "enyojs/ilib-loader", | ||
"ilib-loader": "enyojs/ilib-loader#0.1.1", | ||
"json-loader": "~0.5.4", | ||
"karma": "~1.3.0", | ||
"karma-babel-preprocessor": "~6.0.1", | ||
|
@@ -61,32 +61,32 @@ | |
"less": "~2.7.1", | ||
"less-loader": "~2.2.3", | ||
"minimist": "~1.2.0", | ||
"mocha": "~3.1.0", | ||
"mocha": "~3.1.2", | ||
"ncp": "~2.0.0", | ||
"node-fetch": "^1.6.3", | ||
"object-assign": "~4.1.0", | ||
"path-exists": "~3.0.0", | ||
"phantomjs-prebuilt": "~2.1.13", | ||
"postcss-loader": "~0.13.0", | ||
"postcss-loader": "~1.1.0", | ||
"postcss-remove-classes": "~1.0.2", | ||
"promise": "~7.1.1", | ||
"react": "~15.3.2", | ||
"react-addons-perf": "~15.3.2", | ||
"react-addons-test-utils": "~15.3.2", | ||
"react-dev-utils": "~0.2.1", | ||
"react-dev-utils": "~0.3.0", | ||
"react-dom": "~15.3.2", | ||
"recursive-readdir": "~2.1.0", | ||
"require-from-string": "^1.2.1", | ||
"resolution-independence": "~0.0.3", | ||
"rimraf": "~2.5.4", | ||
"semver": "~5.3.0", | ||
"sinon": "git+https://github.com/sinonjs/sinon.git", | ||
"string.fromcodepoint": "^0.2.1", | ||
"string.prototype.codepointat": "^0.2.0", | ||
"string.fromcodepoint": "~0.2.1", | ||
"string.prototype.codepointat": "~0.2.0", | ||
"strip-ansi": "~3.0.1", | ||
"style-loader": "~0.13.1", | ||
"webos-meta-webpack-plugin": "github:enyojs/webos-meta-webpack-plugin", | ||
"webpack": "~1.13.2", | ||
"webos-meta-webpack-plugin": "enyojs/webos-meta-webpack-plugin#0.1.1", | ||
"webpack": "~1.13.3", | ||
"webpack-bundle-analyzer": "~1.4.1", | ||
"webpack-dev-server": "~1.16.2", | ||
"whatwg-fetch": "~1.0.0" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters