diff options
author | --global <aearly@fluid.com> | 2016-01-15 16:56:37 -0800 |
---|---|---|
committer | --global <aearly@fluid.com> | 2016-01-15 16:56:37 -0800 |
commit | f984553b9d5a2d4600b599ec6746c459707c7338 (patch) | |
tree | 8d0dcc5a806c4b9387815d82501ffbe6ce48be8e | |
parent | 9f5a7d04f5c9aa05fabe9f94c393c536e6561bec (diff) | |
download | async-f984553b9d5a2d4600b599ec6746c459707c7338.tar.gz |
update code style, increase linter coverage, refactor makefile
-rw-r--r-- | .editorconfig | 4 | ||||
-rw-r--r-- | Makefile | 31 | ||||
-rw-r--r-- | karma.conf.js | 30 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | support/build/aggregate-build.js | 4 | ||||
-rw-r--r-- | support/build/compile-modules.js | 15 | ||||
-rw-r--r-- | support/build/plugin-lodash-import-rename.js | 4 | ||||
-rwxr-xr-x | support/sync-package-managers.js | 28 |
8 files changed, 74 insertions, 44 deletions
diff --git a/.editorconfig b/.editorconfig index 239100f..44b5d31 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,3 +11,7 @@ indent_size = 4 [package.json] indent_size = 2 + +[Makefile] +indent_style = tab +indent_size = 4 @@ -2,14 +2,19 @@ export PATH := ./node_modules/.bin/:$(PATH):./bin/ PACKAGE = asyncjs REQUIRE_NAME = async -NODE = node_modules/babel-cli/bin/babel-node.js -UGLIFY = node_modules/.bin/uglifyjs -XYZ = node_modules/.bin/xyz --repo git@github.com:caolan/async.git +BABEL_NODE = babel-node +UGLIFY = uglifyjs +XYZ = xyz --repo git@github.com:caolan/async.git BUILDDIR = build DIST = dist SRC = lib/index.js SCRIPTS = ./support +JS_SRC = $(shell find lib/ -type f -name '*.js') package.json +LINT_FILES = lib/ test/ mocha_test/ $(shell find perf/ -maxdepth 2 -type f) support/ gulpfile.js karma.conf.js + +UMD_BUNDLE = $(BUILDDIR)/async-bundle.js +CJS_BUNDLE = $(BUILDDIR)/async-cjs.js all: lint test clean build @@ -21,14 +26,22 @@ clean: rm -rf $(DIST) lint: - jshint $(SRC) test/*.js mocha_test/* perf/*.js - jscs $(SRC) test/*.js mocha_test/* perf/*.js + jshint $(LINT_FILES) + jscs $(LINT_FILES) + + +build-bundle: build-modules $(UMD_BUNDLE) $(CJS_BUNDLE) + +build-modules: + $(BABEL_NODE) $(SCRIPTS)/build/modules-cjs.js + +$(UMD_BUNDLE): $(JS_SRC) + $(BABEL_NODE) $(SCRIPTS)/build/aggregate-bundle.js +$(CJS_BUNDLE): $(JS_SRC) + $(BABEL_NODE) $(SCRIPTS)/build/aggregate-cjs.js -build-bundle: - $(NODE) $(SCRIPTS)/build/modules-cjs.js - $(NODE) $(SCRIPTS)/build/aggregate-bundle.js - $(NODE) $(SCRIPTS)/build/aggregate-cjs.js +.PHONY: build-modules build-bundle build-dist: mkdir -p $(DIST) diff --git a/karma.conf.js b/karma.conf.js index bfc96fd..ae08916 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,17 +1,17 @@ -module.exports = function (config) { - config.set({ - browsers: ['Firefox'], - files: ['mocha_test/*.js'], - frameworks: ['browserify', 'mocha'], - preprocessors: { - '**/*': ['browserify'] - }, - reporters: ['mocha'], - singleRun: true, +module.exports = function(config) { + config.set({ + browsers: ['Firefox'], + files: ['mocha_test/*.js'], + frameworks: ['browserify', 'mocha'], + preprocessors: { + '**/*': ['browserify'] + }, + reporters: ['mocha'], + singleRun: true, - browserify: { - debug: true, - transform: ['babelify'] - } - }); + browserify: { + debug: true, + transform: ['babelify'] + } + }); }; diff --git a/package.json b/package.json index 886fa67..e2d2a97 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "scripts": { "coverage": "nyc npm test && nyc report", "coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls", - "lint": "jshint lib/*.js test/*.js perf/*.js && jscs lib/*.js test/*.js perf/*.js", + "lint": "jshint lib/ test/ mocha_test/ perf/memory.js perf/suites.js perf/benchmark.js support/ gulpfile.js karma.conf.js && jscs lib/ test/ mocha_test/ perf/memory.js perf/suites.js perf/benchmark.js support/ gulpfile.js karma.conf.js", "mocha-browser-test": "karma start", "mocha-node-test": "mocha mocha_test/ --compilers js:babel-core/register", "mocha-test": "npm run mocha-node-test", diff --git a/support/build/aggregate-build.js b/support/build/aggregate-build.js index 01b8462..61833b8 100644 --- a/support/build/aggregate-build.js +++ b/support/build/aggregate-build.js @@ -5,7 +5,7 @@ import rimraf from 'rimraf/rimraf'; export default function buildBundle(options) { function bundle() { rollup.rollup({ - entry: options.outpath + '/index.js' + entry: options.outpath + '/index.js' }).then(function ( bundle ) { bundle.write({ format: options.format, @@ -15,6 +15,6 @@ export default function buildBundle(options) { rimraf.sync(options.outpath); }).catch(console.error); } - + compileModules(bundle, options); } diff --git a/support/build/compile-modules.js b/support/build/compile-modules.js index 515051f..8f13c3d 100644 --- a/support/build/compile-modules.js +++ b/support/build/compile-modules.js @@ -9,7 +9,12 @@ import {join as joinPath} from 'path'; import fs from 'fs-extra'; export default function(cb, options) { - options = _.defaults({}, options, {path:'lib/', outpath:'build/modules', es6: false, lodashRename: false}); + options = _.defaults({}, options, { + path:'lib/', + outpath:'build/modules', + es6: false, + lodashRename: false + }); let plugins = []; if (options.lodashRename) { @@ -24,12 +29,16 @@ export default function(cb, options) { fs.emptyDirSync(options.outpath); fs.emptyDirSync(joinPath(options.outpath, 'internal')); async.each(files, (file, callback) => { - var filename = file.startsWith(options.path) ? file.slice(options.path.length) : file; + let filename = file.startsWith(options.path) ? + file.slice(options.path.length) : + file; + transformFile(file, { babelrc: false, plugins: plugins }, function(err, content) { - fs.writeFile(joinPath(options.outpath, filename), content.code, callback); + let outpath = joinPath(options.outpath, filename); + fs.writeFile(outpath, content.code, callback); }); }, cb); }); diff --git a/support/build/plugin-lodash-import-rename.js b/support/build/plugin-lodash-import-rename.js index d3c2c70..6fe893b 100644 --- a/support/build/plugin-lodash-import-rename.js +++ b/support/build/plugin-lodash-import-rename.js @@ -14,7 +14,9 @@ export default function() { let dir = dirname(f).split(sep); let relative = _.repeat('../', dir.length + 1); - node.source.value = value.replace(/\blodash\b/, relative + 'node_modules/lodash-es'); + node.source.value = value.replace( + /\blodash\b/, + relative + 'node_modules/lodash-es'); } } } diff --git a/support/sync-package-managers.js b/support/sync-package-managers.js index 28c22e9..7294bcc 100755 --- a/support/sync-package-managers.js +++ b/support/sync-package-managers.js @@ -14,36 +14,38 @@ var INCLUDES = ['lib/async.js', 'README.md', 'LICENSE']; var REPOSITORY_NAME = 'caolan/async'; packageJson.jam = { - main: packageJson.main, - include: INCLUDES, - categories: ['Utilities'] + main: packageJson.main, + include: INCLUDES, + categories: ['Utilities'] }; packageJson.spm = { - main: packageJson.main + main: packageJson.main }; packageJson.volo = { - main: packageJson.main, - ignore: IGNORES + main: packageJson.main, + ignore: IGNORES }; var bowerSpecific = { - moduleType: ['amd', 'globals', 'node'], - ignore: IGNORES, - authors: [packageJson.author] + moduleType: ['amd', 'globals', 'node'], + ignore: IGNORES, + authors: [packageJson.author] }; var bowerInclude = ['name', 'description', 'main', 'keywords', - 'license', 'homepage', 'repository', 'devDependencies']; + 'license', 'homepage', 'repository', 'devDependencies' +]; var componentSpecific = { - repository: REPOSITORY_NAME, - scripts: [packageJson.main] + repository: REPOSITORY_NAME, + scripts: [packageJson.main] }; var componentInclude = ['name', 'description', 'version', 'keywords', - 'license', 'main']; + 'license', 'main' +]; var bowerJson = _.merge({}, _.pick(packageJson, bowerInclude), bowerSpecific); var componentJson = _.merge({}, _.pick(packageJson, componentInclude), componentSpecific); |