diff options
| -rw-r--r-- | .gitignore | 462 | ||||
| -rw-r--r-- | .npmrc | 1 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | test/common-tap.js | 2 | ||||
| -rw-r--r-- | test/tap/00-config-setup.js | 6 | ||||
| -rw-r--r-- | test/tap/config-basic.js | 18 | ||||
| -rw-r--r-- | test/tap/config-builtin.js | 3 |
7 files changed, 22 insertions, 473 deletions
diff --git a/.gitignore b/.gitignore index 005cbb7ec..c18ac2019 100644 --- a/.gitignore +++ b/.gitignore @@ -31,465 +31,3 @@ npm-debug.log /node_modules/sprintf-js/ /node_modules/standard/ /node_modules/tap/ - -# required by standard -/node_modules/acorn/ -/node_modules/align-text/ -/node_modules/alter/ -/node_modules/amdefine/ -/node_modules/ansi-styles/ -/node_modules/argparse/ -/node_modules/array-union/ -/node_modules/array-uniq/ -/node_modules/arrify/ -/node_modules/ast-traverse/ -/node_modules/ast-types/ -/node_modules/async/ -/node_modules/babel-core/ -/node_modules/babel-plugin-constant-folding/ -/node_modules/babel-plugin-dead-code-elimination/ -/node_modules/babel-plugin-eval/ -/node_modules/babel-plugin-inline-environment-variables/ -/node_modules/babel-plugin-jscript/ -/node_modules/babel-plugin-member-expression-literals/ -/node_modules/babel-plugin-property-literals/ -/node_modules/babel-plugin-proto-to-assign/ -/node_modules/babel-plugin-react-constant-elements/ -/node_modules/babel-plugin-react-display-name/ -/node_modules/babel-plugin-remove-console/ -/node_modules/babel-plugin-remove-debugger/ -/node_modules/babel-plugin-runtime/ -/node_modules/babel-plugin-undeclared-variables-check/ -/node_modules/babel-plugin-undefined-to-void/ -/node_modules/babylon/ -/node_modules/balanced-match/ -/node_modules/bluebird/ -/node_modules/brace-expansion/ -/node_modules/breakable/ -/node_modules/camelcase/ -/node_modules/center-align/ -/node_modules/chalk/ -/node_modules/cli-width/ -/node_modules/cliui/ -/node_modules/clone/ -/node_modules/commander/ -/node_modules/commoner/ -/node_modules/concat-map/ -/node_modules/concat-stream/ -/node_modules/convert-source-map/ -/node_modules/core-js/ -/node_modules/core-util-is/ -/node_modules/d/ -/node_modules/debug-log/ -/node_modules/debug/ -/node_modules/decamelize/ -/node_modules/deep-is/ -/node_modules/defaults/ -/node_modules/defs/ -/node_modules/deglob/ -/node_modules/del/ -/node_modules/detect-indent/ -/node_modules/diff/ -/node_modules/disparity/ -/node_modules/doctrine/ -/node_modules/es5-ext/ -/node_modules/es6-iterator/ -/node_modules/es6-map/ -/node_modules/es6-set/ -/node_modules/es6-symbol/ -/node_modules/es6-weak-map/ -/node_modules/escape-string-regexp/ -/node_modules/escope/ -/node_modules/esformatter-eol-last/ -/node_modules/esformatter-ignore/ -/node_modules/esformatter-jsx/ -/node_modules/esformatter-literal-notation/ -/node_modules/esformatter-quotes/ -/node_modules/esformatter-semicolon-first/ -/node_modules/esformatter-spaced-lined-comment/ -/node_modules/esformatter/ -/node_modules/eslint-config-standard-react/ -/node_modules/eslint-config-standard/ -/node_modules/eslint-plugin-react/ -/node_modules/eslint-plugin-standard/ -/node_modules/eslint/ -/node_modules/espree/ -/node_modules/esrecurse/ -/node_modules/estraverse-fb/ -/node_modules/estraverse/ -/node_modules/esutils/ -/node_modules/event-emitter/ -/node_modules/extend/ -/node_modules/falafel/ -/node_modules/fast-levenshtein/ -/node_modules/figures/ -/node_modules/file-entry-cache/ -/node_modules/find-root/ -/node_modules/flat-cache/ -/node_modules/foreach/ -/node_modules/fs-readdir-recursive/ -/node_modules/generate-function/ -/node_modules/generate-object-property/ -/node_modules/get-stdin/ -/node_modules/globals/ -/node_modules/globby/ -/node_modules/handlebars/ -/node_modules/has-ansi/ -/node_modules/home-or-tmp/ -/node_modules/iconv-lite/ -/node_modules/ignore/ -/node_modules/inquirer/ -/node_modules/install/ -/node_modules/invert-kv/ -/node_modules/is-buffer/ -/node_modules/is-finite/ -/node_modules/is-integer/ -/node_modules/is-my-json-valid/ -/node_modules/is-path-cwd/ -/node_modules/is-path-in-cwd/ -/node_modules/is-path-inside/ -/node_modules/is-property/ -/node_modules/is-resolvable/ -/node_modules/isarray/ -/node_modules/js-beautify/ -/node_modules/js-tokens/ -/node_modules/js-yaml/ -/node_modules/jsesc/ -/node_modules/json-stable-stringify/ -/node_modules/json5/ -/node_modules/jsonify/ -/node_modules/jsonpointer/ -/node_modules/kind-of/ -/node_modules/lazy-cache/ -/node_modules/lcid/ -/node_modules/left-pad/ -/node_modules/leven/ -/node_modules/levn/ -/node_modules/line-numbers/ -/node_modules/lodash._arraycopy/ -/node_modules/lodash._arrayeach/ -/node_modules/lodash._arraymap/ -/node_modules/lodash._basecopy/ -/node_modules/lodash._basedifference/ -/node_modules/lodash._baseflatten/ -/node_modules/lodash._basefor/ -/node_modules/lodash._createassigner/ -/node_modules/lodash._isiterateecall/ -/node_modules/lodash._pickbyarray/ -/node_modules/lodash._pickbycallback/ -/node_modules/lodash.isplainobject/ -/node_modules/lodash.istypedarray/ -/node_modules/lodash.keysin/ -/node_modules/lodash.merge/ -/node_modules/lodash.omit/ -/node_modules/lodash.toplainobject/ -/node_modules/lodash/ -/node_modules/longest/ -/node_modules/lru-cache/ -/node_modules/minimatch/ -/node_modules/minimist/ -/node_modules/mout/ -/node_modules/ms/ -/node_modules/multiline/ -/node_modules/mute-stream/ -/node_modules/npm-path/ -/node_modules/npm-run/ -/node_modules/number-is-nan/ -/node_modules/object-assign/ -/node_modules/object-keys/ -/node_modules/optimist/ -/node_modules/optionator/ -/node_modules/os-homedir/ -/node_modules/os-locale/ -/node_modules/os-tmpdir/ -/node_modules/output-file-sync/ -/node_modules/path-exists/ -/node_modules/path-is-absolute/ -/node_modules/path/ -/node_modules/pify/ -/node_modules/pinkie-promise/ -/node_modules/pinkie/ -/node_modules/pkg-config/ -/node_modules/prelude-ls/ -/node_modules/private/ -/node_modules/process-nextick-args/ -/node_modules/protochain/ -/node_modules/q/ -/node_modules/read-json-sync/ -/node_modules/readline2/ -/node_modules/recast/ -/node_modules/regenerate/ -/node_modules/regenerator/ -/node_modules/regexpu/ -/node_modules/regjsgen/ -/node_modules/regjsparser/ -/node_modules/repeat-string/ -/node_modules/repeating/ -/node_modules/resolve/ -/node_modules/right-align/ -/node_modules/rocambole-indent/ -/node_modules/rocambole-linebreak/ -/node_modules/rocambole-node/ -/node_modules/rocambole-token/ -/node_modules/rocambole-whitespace/ -/node_modules/rocambole/ -/node_modules/run-async/ -/node_modules/run-parallel/ -/node_modules/rx-lite/ -/node_modules/serializerr/ -/node_modules/shebang-regex/ -/node_modules/shelljs/ -/node_modules/sigmund/ -/node_modules/simple-fmt/ -/node_modules/simple-is/ -/node_modules/slash/ -/node_modules/source-map-support/ -/node_modules/source-map/ -/node_modules/stable/ -/node_modules/standard-engine/ -/node_modules/standard-format/ -/node_modules/stdin/ -/node_modules/string.prototype.endswith/ -/node_modules/string_decoder/ -/node_modules/stringmap/ -/node_modules/stringset/ -/node_modules/strip-indent/ -/node_modules/strip-json-comments/ -/node_modules/supports-color/ -/node_modules/sync-exec/ -/node_modules/through/ -/node_modules/to-double-quotes/ -/node_modules/to-fast-properties/ -/node_modules/to-single-quotes/ -/node_modules/trim-right/ -/node_modules/try-resolve/ -/node_modules/tryit/ -/node_modules/tryor/ -/node_modules/type-check/ -/node_modules/typedarray/ -/node_modules/uglify-js/ -/node_modules/uglify-to-browserify/ -/node_modules/uniq/ -/node_modules/user-home/ -/node_modules/util-deprecate/ -/node_modules/window-size/ -/node_modules/wordwrap/ -/node_modules/write/ -/node_modules/xml-escape/ -/node_modules/xtend/ -/node_modules/y18n/ -/node_modules/yargs/ - -# required by nock -/node_modules/assertion-error/ -/node_modules/chai/ -/node_modules/core-util-is/ -/node_modules/debug/ -/node_modules/deep-eql/ -/node_modules/isarray/ -/node_modules/lodash/ -/node_modules/ms/ -/node_modules/process-nextick-args/ -/node_modules/propagate/ -/node_modules/string_decoder/ -/node_modules/type-detect/ -/node_modules/util-deprecate/ - -# required by npm-registry-couchapp -/node_modules/ansi-styles/ -/node_modules/asn1/ -/node_modules/assert-plus/ -/node_modules/async/ -/node_modules/aws-sign2/ -/node_modules/bl/ -/node_modules/bluebird/ -/node_modules/boom/ -/node_modules/browser-request/ -/node_modules/caseless/ -/node_modules/chalk/ -/node_modules/coffee-script/ -/node_modules/colors/ -/node_modules/combined-stream/ -/node_modules/commander/ -/node_modules/connect/ -/node_modules/core-util-is/ -/node_modules/couchapp/ -/node_modules/cryptiles/ -/node_modules/ctype/ -/node_modules/debug/ -/node_modules/delayed-stream/ -/node_modules/ee-first/ -/node_modules/errs/ -/node_modules/escape-html/ -/node_modules/escape-string-regexp/ -/node_modules/finalhandler/ -/node_modules/follow/ -/node_modules/forever-agent/ -/node_modules/form-data/ -/node_modules/generate-function/ -/node_modules/generate-object-property/ -/node_modules/graceful-readlink/ -/node_modules/har-validator/ -/node_modules/has-ansi/ -/node_modules/hawk/ -/node_modules/hoek/ -/node_modules/http-proxy/ -/node_modules/http-signature/ -/node_modules/is-my-json-valid/ -/node_modules/is-property/ -/node_modules/isarray/ -/node_modules/isstream/ -/node_modules/json-stringify-safe/ -/node_modules/json/ -/node_modules/jsonpointer/ -/node_modules/mime-db/ -/node_modules/mime-types/ -/node_modules/ms/ -/node_modules/nano/ -/node_modules/node-uuid/ -/node_modules/oauth-sign/ -/node_modules/on-finished/ -/node_modules/optimist/ -/node_modules/parseurl/ -/node_modules/pkginfo/ -/node_modules/process-nextick-args/ -/node_modules/punycode/ -/node_modules/qs/ -/node_modules/querystring/ -/node_modules/sntp/ -/node_modules/string_decoder/ -/node_modules/stringstream/ -/node_modules/supports-color/ -/node_modules/tough-cookie/ -/node_modules/tunnel-agent/ -/node_modules/underscore/ -/node_modules/url/ -/node_modules/util-deprecate/ -/node_modules/utils-merge/ -/node_modules/watch/ -/node_modules/wordwrap/ -/node_modules/xtend/ - -# required by npm-registry-mock -/node_modules/core-util-is/ -/node_modules/hock/ -/node_modules/isarray/ -/node_modules/process-nextick-args/ -/node_modules/string_decoder/ -/node_modules/util-deprecate/ -/node_modules/util-extend/ - -# required by tap -/node_modules/align-text/ -/node_modules/amdefine/ -/node_modules/ansi-styles/ -/node_modules/argparse/ -/node_modules/asn1/ -/node_modules/assert-plus/ -/node_modules/async/ -/node_modules/aws-sign2/ -/node_modules/balanced-match/ -/node_modules/boom/ -/node_modules/brace-expansion/ -/node_modules/camelcase/ -/node_modules/center-align/ -/node_modules/chalk/ -/node_modules/cliui/ -/node_modules/codecov.io/ -/node_modules/code-point-at/ -/node_modules/combined-stream/ -/node_modules/concat-map/ -/node_modules/core-util-is/ -/node_modules/coveralls/ -/node_modules/cryptiles/ -/node_modules/ctype/ -/node_modules/debug/ -/node_modules/decamelize/ -/node_modules/deep-is/ -/node_modules/deeper/ -/node_modules/defined/ -/node_modules/delayed-stream/ -/node_modules/diff/ -/node_modules/duplexer/ -/node_modules/escape-string-regexp/ -/node_modules/escodegen/ -/node_modules/esprima/ -/node_modules/estraverse/ -/node_modules/esutils/ -/node_modules/events-to-array/ -/node_modules/fast-levenshtein/ -/node_modules/fileset/ -/node_modules/foreground-child/ -/node_modules/forever-agent/ -/node_modules/form-data/ -/node_modules/handlebars/ -/node_modules/has-ansi/ -/node_modules/has-flag/ -/node_modules/hawk/ -/node_modules/hoek/ -/node_modules/http-signature/ -/node_modules/invert-kv/ -/node_modules/is-buffer/ -/node_modules/is-fullwidth-code-point/ -/node_modules/is-utf8/ -/node_modules/isarray/ -/node_modules/istanbul/ -/node_modules/js-yaml/ -/node_modules/json-stringify-safe/ -/node_modules/kind-of/ -/node_modules/lcid/ -/node_modules/lcov-parse/ -/node_modules/levn/ -/node_modules/lodash/ -/node_modules/log-driver/ -/node_modules/longest/ -/node_modules/mime-types/ -/node_modules/mime/ -/node_modules/minimatch/ -/node_modules/minimist/ -/node_modules/ms/ -/node_modules/node-uuid/ -/node_modules/nyc/ -/node_modules/oauth-sign/ -/node_modules/only-shallow/ -/node_modules/optimist/ -/node_modules/optionator/ -/node_modules/os-locale/ -/node_modules/prelude-ls/ -/node_modules/process-nextick-args/ -/node_modules/punycode/ -/node_modules/qs/ -/node_modules/repeat-string/ -/node_modules/resolve/ -/node_modules/resumer/ -/node_modules/right-align/ -/node_modules/signal-exit/ -/node_modules/sntp/ -/node_modules/source-map/ -/node_modules/split/ -/node_modules/stream-combiner/ -/node_modules/string-width/ -/node_modules/string_decoder/ -/node_modules/stringstream/ -/node_modules/strip-bom/ -/node_modules/supports-color/ -/node_modules/tap-mocha-reporter/ -/node_modules/tap-parser/ -/node_modules/tape/ -/node_modules/tmatch/ -/node_modules/tough-cookie/ -/node_modules/tunnel-agent/ -/node_modules/type-check/ -/node_modules/uglify-js/ -/node_modules/uglify-to-browserify/ -/node_modules/underscore.string/ -/node_modules/underscore/ -/node_modules/unicode-length/ -/node_modules/urlgrey/ -/node_modules/util-deprecate/ -/node_modules/wrap-ansi/ -/node_modules/win-spawn/ -/node_modules/window-size/ -/node_modules/wordwrap/ -/node_modules/y18n/ -/node_modules/yargs/ @@ -1,2 +1,3 @@ save-prefix = ~ proprietary-attribs = false +legacy-bundling = true @@ -167,7 +167,8 @@ publish: link doc git push origin --tags &&\ npm publish --tag=$(PUBLISHTAG) -release: +release: markedclean marked-manclean doc-clean doc + node cli.js prune --production @bash scripts/release.sh sandwich: diff --git a/test/common-tap.js b/test/common-tap.js index 86144c7c9..2e53ec925 100644 --- a/test/common-tap.js +++ b/test/common-tap.js @@ -18,6 +18,8 @@ var npm_config_cache = path.resolve(__dirname, 'npm_cache') process.env.npm_config_cache = exports.npm_config_cache = npm_config_cache process.env.npm_config_userconfig = exports.npm_config_userconfig = path.join(__dirname, 'fixtures', 'config', 'userconfig') process.env.npm_config_globalconfig = exports.npm_config_globalconfig = path.join(__dirname, 'fixtures', 'config', 'globalconfig') +process.env.npm_config_global_style = 'false' +process.env.npm_config_legacy_bundling = 'false' process.env.random_env_var = 'foo' var bin = exports.bin = require.resolve('../bin/npm-cli.js') diff --git a/test/tap/00-config-setup.js b/test/tap/00-config-setup.js index 0d267851e..0310f48d5 100644 --- a/test/tap/00-config-setup.js +++ b/test/tap/00-config-setup.js @@ -61,7 +61,11 @@ try { fs.statSync(projectConf) } catch (er) { // project conf not found, probably working with packed npm - fs.writeFileSync(projectConf, 'save-prefix = ~\nproprietary-attribs = false\n') + fs.writeFileSync(projectConf, function () {/* +save-prefix = ~ +proprietary-attribs = false +legacy-bundling = true + */}.toString().split('\n').slice(1, -1).join('\n')) } var projectRc = path.join(__dirname, '..', 'fixtures', 'config', '.npmrc') diff --git a/test/tap/config-basic.js b/test/tap/config-basic.js index 82fa8ab58..ff3318147 100644 --- a/test/tap/config-basic.js +++ b/test/tap/config-basic.js @@ -5,7 +5,8 @@ var path = require('path') var projectData = { 'save-prefix': '~', - 'proprietary-attribs': false + 'proprietary-attribs': false, + 'legacy-bundling': true } var ucData = common.ucData @@ -53,15 +54,16 @@ var expectSources = { } test('no builtin', function (t) { + t.comment(process.env) npmconf.load(cli, function (er, conf) { if (er) throw er - t.same(conf.list, expectList) - t.same(conf.sources, expectSources) - t.same(npmconf.rootConf.list, []) - t.equal(npmconf.rootConf.root, npmconf.defs.defaults) - t.equal(conf.root, npmconf.defs.defaults) - t.equal(conf.get('umask'), parseInt('022', 8)) - t.equal(conf.get('heading'), 'npm') + t.same(conf.list, expectList, 'config properties in list format match expected') + t.same(conf.sources, expectSources, 'config by source matches expected') + t.same(npmconf.rootConf.list, [], 'root configuration is empty') + t.equal(npmconf.rootConf.root, npmconf.defs.defaults, 'defaults match up') + t.equal(conf.root, npmconf.defs.defaults, 'current root config matches defaults') + t.equal(conf.get('umask'), parseInt('022', 8), 'umask is as expected') + t.equal(conf.get('heading'), 'npm', 'config name is as expected') t.end() }) }) diff --git a/test/tap/config-builtin.js b/test/tap/config-builtin.js index 708eb3056..cb1e4eb20 100644 --- a/test/tap/config-builtin.js +++ b/test/tap/config-builtin.js @@ -16,7 +16,8 @@ var cli = { foo: 'bar', heading: 'foo', 'git-tag-version': false } var projectData = { 'save-prefix': '~', - 'proprietary-attribs': false + 'proprietary-attribs': false, + 'legacy-bundling': true } var expectList = [ |