Yet Another Switch to CommonJS

.editorconfig

@@ -0,0 +1,17 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{js,json,yaml,yml}]
+indent_style = space
+indent_size = 2
+
+[*.py]
+indent_style = space
+indent_size = 4

.gitignore

@@ -7,17 +7,7 @@
 .cproject
 .project
 .settings
-Makefile
 TAGS
-aclocal.m4
-autom4te.cache
-build
-config.log
-config.status
-configure
+coverage
 dist
-js/forge.bundle.js
-js/forge.min.js
 node_modules
-nodejs/coverage
-tests/forge

nodejs/.istanbul.yml → .istanbul.yml

@@ -1,2 +1,2 @@
 instrumentation:
-  root: ..
+  root: .

.jscsrc

@@ -1,10 +1,6 @@
 {
   "excludeFiles": [
-    "./js/forge.bundle.js",
-    "./js/forge.min.js",
-    "./js/jsbn.js",
-    "./nodejs/ui/require.js",
-    "./nodejs/ui/test.min.js"
+    "./lib/jsbn.js"
   ],
   "disallowKeywords": ["with"],
   "disallowKeywordsOnNewLine": ["else", "catch"],
@@ -16,44 +12,67 @@
   // use w/angular directive templates?
   //"disallowMultipleLineStrings": true,
   "disallowNewlineBeforeBlockStatements": true,
+  //"disallowSpaceAfterKeywords": [
+  //  "if",
+  //  "for",
+  //  "while",
+  //  "do",
+  //  "switch",
+  //  "catch"
+  //],
   "disallowSpaceAfterObjectKeys": true,
   "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
   "disallowSpaceBeforeBinaryOperators": [","],
   "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
   "disallowSpacesInAnonymousFunctionExpression": {
     "beforeOpeningRoundBrace": true
   },
+  //"disallowSpacesInCallExpression": true,
   "disallowSpacesInFunctionDeclaration": {
     "beforeOpeningRoundBrace": true
   },
   "disallowSpacesInNamedFunctionExpression": {
     "beforeOpeningRoundBrace": true
   },
+  //"disallowSpacesInsideArrayBrackets": true,
   "disallowSpacesInsideParentheses": true,
   "disallowTrailingComma": true,
   "disallowTrailingWhitespace": true,
+  //"maximumLineLength": {
+  //  "value": 80,
+  //  "allExcept": ["comments", "regex"]
+  //},
   "requireCommaBeforeLineBreak": true,
   "requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
   "requireLineFeedAtFileEnd": true,
+  "requireSemicolons": true,
   "requireSpaceAfterBinaryOperators": ["?", ":", "+", "-", "/", "*", "%", "==", "===", "!=", "!==", ">", ">=", "<", "<=", "&&", "||"],
   "requireSpaceBeforeBinaryOperators": ["?", ":", "+", "-", "/", "*", "%", "==", "===", "!=", "!==", ">", ">=", "<", "<=", "&&", "||"],
+  //"requireSpaceBeforeObjectValues": true,
   "requireSpaceAfterKeywords": [
     "else",
     "do",
     "return",
     "try"
   ],
+  //"requireSpaceBeforeKeywords": [
+  //  "else",
+  //  "while",
+  //  "catch"
+  //],
   "requireSpaceBeforeBlockStatements": true,
   "requireSpacesInConditionalExpression": {
     "afterTest": true,
     "beforeConsequent": true,
     "afterConsequent": true,
     "beforeAlternate": true
   },
+  //"requireSpacesInForStatement": true,
   "requireSpacesInFunction": {
     "beforeOpeningCurlyBrace": true
   },
   "safeContextKeyword": "self",
+  //"validateIndentation": 2,
   "validateLineBreaks": "LF",
   // FIXME: enable doc checks (update to use newer jscs jsdoc module)
   //"validateJSDoc": {

.jshintignore

@@ -1,6 +0,0 @@
-js/forge.bundle.js
-minify.js
-nodejs/build.js
-nodejs/minify.js
-nodejs/ui/require.js
-nodejs/ui/test.min.js

.jshintrc

@@ -1,3 +1,4 @@
 {
-  "sub": true
+  "sub": true,
+  "esversion": 6
 }

.npmignore

@@ -0,0 +1,43 @@
+# cruft
+*.py[co]
+*.sw[nop]
+*~
+.bower.json
+.cdtproject
+.classpath
+.cproject
+.project
+.settings
+TAGS
+
+# development
+.editorconfig
+.istanbul.yml
+.jscsrc
+.jshintignore
+.jshintrc
+.npmignore
+.travis.yml
+CONTRIBUTING.md
+examples
+karma*.js
+tests
+webpack*.js
+
+# installed
+node_modules
+
+# built
+dist
+coverage
+
+# browser WebWorker files
+lib/prime.worker.js
+
+# index.all.js
+lib/index.all.js
+lib/form.js
+lib/http.js
+lib/socket.js
+lib/tlssocket.js
+lib/xhr.js

.travis.yml

@@ -4,9 +4,17 @@ node_js:
   - "6"
   - "node"
 sudo: false
-install: (cd nodejs && npm install)
+install: npm install
 script:
-  - (cd nodejs && npm test)
+  - if [ "x$BUNDLER" = "x" ]; then npm test; fi
+  - if [ "x$BUNDLER" != "x" ]; then npm run test-karma; fi
+# only run karma tests for one node version
+matrix:
+  include:
+  - node_js: "6"
+    env: BUNDLER=webpack
+  - node_js: "6"
+    env: BUNDLER=browserify
 notifications:
   email:
     on_success: change

CHANGELOG.md

@@ -0,0 +1,83 @@
+Forge ChangeLog
+===============
+
+## 0.7.0 - 2017-??-??
+
+### Fixed
+
+- Fix test looping bugs so all tests are run.
+
+### Changed
+
+- Major refactor to use CommonJS plus a browser build system.
+- Updated tests, examples, docs.
+- Updated dependencies.
+- Updated flash build system.
+- Improve OID mapping code.
+- Change test servers from Python to JavaScript.
+- Improve PhantomJS support.
+- Move Bower/bundle support to
+  [forge-dist](https://github.com/digitalbazaar/forge-dist).
+
+### Added
+
+- webpack bundler support via `npm run build`:
+  - Builds .js, .min.js, and basic sourcemaps.
+  - Basic build: forge.js.
+  - Build with extra utils and networking support: forge.all.js.
+  - Build WebWorker support: prime.worker.js.
+- Browserify support in package.json.
+- Karma browser testing.
+- `forge.options` field.
+- `forge.options.usePureJavaScript` flag.
+- `forge.util.isNodejs` flag (used to select "native" APIs).
+- Run PhantomJS tests in Travis-CI.
+- Add "Donations" section to README.
+- Add IRC to "Contact" section of README.
+- Add "Security Considerations" section to README.
+- Add pbkdf2 usePureJavaScript test.
+- Add rsa.generateKeyPair async and usePureJavaScript tests.
+- Add .editorconfig support.
+
+### Removed
+
+- **BREAKING**: Can no longer call `forge({...})` to create new instances.
+- Remove a large amount of old cruft.
+
+### Migration from 0.6.x to 0.7.x
+
+- (all) If you used the feature to create a new forge instance with new
+  configuration options you will need to rework your code. That ability has
+  been removed due to implementation complexity. The main rare use was to set
+  the option to use pure JavaScript. That is now available as a library global
+  flag `forge.options.usePureJavaScript`.
+- (npm,bower) If you used the default main file there is little to nothing to
+  change.
+- (npm) If you accessed a sub-resource like `forge/js/pki` you should either
+  switch to just using the main `forge` and access `forge.pki` or update to
+  `forge/lib/pki`.
+- (bower) If you used a sub-resource like `forge/js/pki` you should switch to
+  just using `forge` and access `forge.pki`. The bower release bundles
+  everything in one minified file.
+- (bower) A configured workerScript like
+  `/bower_components/forge/js/prime.worker.js` will need to change to
+  `/bower_components/forge/dist/prime.worker.min.js`.
+- (all) If you used the networking support or flash socket support, you will
+  need to use a custom build and/or adjust where files are loaded from. This
+  functionality is not included in the bower distribution by default and is
+  also now in a different directory.
+- (all) The library should now directly support building custom bundles with
+  webpack, browserify, or similar.
+
+### Notes
+
+- This major update requires updating the version to 0.7.x. The existing
+  work-in-progress "0.7.x" branch will be painfully rebased on top of this new
+  0.7.x and moved forward to 0.8.x or later as needed.
+- 0.7.x is a start of simplifying forge based on common issues and what has
+  appeared to be the most common usage. Please file issues with feedback if the
+  changes are problematic for your use cases.
+
+## 0.6.x - 2016 and earlier
+
+- See Git commit log or https://github.com/digitalbazaar/forge.

CONTRIBUTING.md

@@ -20,7 +20,9 @@ Versioning
 Release Process
 ---------------
 
-* commit changes
+## Update the main repository:
+
+* Commit changes.
 * `$EDITOR package.json`: update to release version and remove `-dev` suffix.
 * `git commit package.json -m "Release {version}."`
 * `git tag {version}`
@@ -29,12 +31,32 @@ Release Process
 * `git push`
 * `git push --tags`
 
+## Publish to NPM:
+
 To ensure a clean upload, use a clean updated checkout, and run the following:
 
 * `git checkout {version}`
 * `npm publish`
 
+## Update bundled distribution
+
+This is kept in a different repository due to accumulated per-release bundle
+sizes.
+
+* Checkout [forge-dist][].
+* Build a clean Forge version you want to distribute:
+  * `git checkout {version}`
+  * `npm run build`
+* Copy files to `forge-dist`:
+  * `cp dist/forge.min.js{,.map} dist/prime.worker.min.js{,.map} FORGEDIST/dist/`
+* Release `forge-dist`:
+  * `git commit -a -m "Release {version}."`
+  * `git tag {version}`
+  * `git push`
+  * `git push --tags`
+
 [Node.js Style Guide]: http://nodeguide.com/style.html
-[jshint]: http://www.jshint.com/install/
-[Semantic Versioning]: http://semver.org/
 [README]: ./README.md
+[Semantic Versioning]: http://semver.org/
+[forge-dist]: https://github.com/digitalbazaar/forge-dist
+[jshint]: http://www.jshint.com/install/

LICENSE

@@ -1,11 +1,11 @@
-You may use the Forge project under the terms of either the BSD License or the 
+You may use the Forge project under the terms of either the BSD License or the
 GNU General Public License (GPL) Version 2.
 
-The BSD License is recommended for most projects. It is simple and easy to 
+The BSD License is recommended for most projects. It is simple and easy to
 understand and it places almost no restrictions on what you can do with the
 Forge project.
 
-If the GPL suits your project better you are also free to use Forge under 
+If the GPL suits your project better you are also free to use Forge under
 that license.
 
 You don't have to do anything special to choose one license or the other and