-
Notifications
You must be signed in to change notification settings - Fork 5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature/convert to npm #89
Open
qejk
wants to merge
113
commits into
develop
Choose a base branch
from
feature/convert-to-npm
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+3,015
−2,276
Open
Changes from all commits
Commits
Show all changes
113 commits
Select commit
Hold shift + click to select a range
9b715a0
Refactors Space.Logger class to use arguments on Constructor, removes…
qejk 03aef7d
Refactors Space.Module to: not use global Space.log, instantiate unde…
qejk dd32c4e
Moves temporarily Space.Logger code to coffeescript, adds support for…
qejk 193f43b
Refactors code: moves methods to base Space.Logger.Addapter class, ad…
qejk c71872c
Adds default configuration from ENV to module configuration, sets min…
qejk a778812
Refactors
qejk c8ea9ea
Removes blank lines
qejk 8942054
Moves instantiation of console transport to Space.Logger.WinstonAdapter
qejk 64f90e0
Simplifies initialization of transports, adds dedicated method for pr…
qejk 462bfef
Removes winston npm dependency
qejk dc4914f
Simplifies logging initialization by moving it to separate modules co…
qejk a48baa3
Moves coffeescript to ES6
qejk 0cd08c6
Removes unnecessary variable
qejk e5a071a
Adds state related additional helper methods to Space.Logger
qejk e06d264
Changes injector mapping type
qejk 37cafb0
Fixes module unit tests
qejk 319b591
Refactors Space.Logger unit tests
qejk fa9c2dc
One semicolon here, one semicolon there...
qejk e2d7773
Merge branch 'develop' of https://github.com/meteor-space/base into f…
qejk d886a5b
Removes back winston dependency from meteor
qejk cbb3ca5
Refactors Logger
qejk 07e5806
Updates .eslintrc
qejk 4118033
Adds package.json
qejk 8b916fe
Removes tightly coupled Meteor deps
qejk 63bbea2
Replaces used Meteor deps in favor of importable npm packages
qejk f46f9d8
Exports Space modules
qejk 5a0c432
Imports Space modules on tests
qejk 39532d7
Standardizes file naming convention
qejk 3fe3df1
Sets npm dependencies versions to minor
qejk e3af6bc
Converts injector-annotations
qejk 35ad270
Converts namespace
qejk 84aea80
Converts helpers
qejk 4e45a48
Imports Struct module on Space error and removes it from global Space
qejk bad61c9
Converts Injector, imports SpaceError and removes Injector from Space…
qejk 27416ab
Converts Module and removes it from Space global
qejk fcd9388
Replaces Space.Object with imported SpaceObject module
qejk 0420d48
Exports SpaceObject and removes Object from Space global
qejk 5b7724c
Converts Application and removes it from Space global
qejk 8fc3af0
Fixes import statement pointing to incorrect file
qejk 18c97c5
Converts bdd-api
qejk 6298b90
Combines namespace and helpers in to single Space file
qejk 399f602
Fixes issue with unexportable SpaceObject module with ES6
qejk b478b9c
Removes namespace
qejk 9a1a25a
Imports Space and replaces global related calls
qejk f165a99
Adds index
qejk 15fec86
Updates file paths on meteor package
qejk 09b729b
Imports modules on tests
qejk dbbb128
Updates CircleCI
qejk 08db363
Adds getnv directly via import
qejk 9bb64d5
Removes getenv and configuration, Pins node to >=4.0.0
qejk 15cdb0c
Updates CircleCI
qejk 9e4637c
Updates npm dependencies and CircleCI
qejk 35e5b62
Converts Struct unit test
qejk ed11964
Converts SpaceObject unit test
qejk 450580d
Converts Module unit test
qejk 9ef2712
Converts Injector unit test
qejk 2fc614b
Converts helpers unit test
qejk 37cfbe2
Fixes variables declarations
qejk 8eee8d9
Converts Application unit test
qejk c01ceb4
Fixes variables declarations
qejk d44dfa3
Updates package.json with: keywords, contributors, Pins npm to >= 1.4.*
qejk 4490b2d
Updates meteor package.js with new file paths
qejk 05d1adc
Adds a fallback to SpaceObject for ES6 class definitions
qejk 227fceb
Fixes variables declarations
qejk 05d2e80
Updates testing driver to Mocha
qejk 1e928db
Updates tests to run with Mocha
qejk d8e362a
Skips temporarily Meteor oriented tests
qejk 910a51a
Fixes CircleCI configuration for Mocha for failing tests with updated…
qejk e4412a5
Converts SpaceObject
qejk 86ea282
Converts Struct
qejk ae476d7
Updates imports to use converted SpaceObject, replaces tests with cha…
qejk d81fc1e
Fixes issue with SpaceError and ES6 not supporting binded class insta…
qejk 01a3ced
Removes unused file from meteor package
qejk 4867c31
Fixes uncecessary fallbacks, refactors __extends__ from SpaceObject
qejk 59f73e7
Updates babel, adds test script to npm
qejk 0baf369
Fixes colon in .babelrc
qejk 3e91d80
Updates babel
qejk ad8c7f6
Fixes variables declarations
qejk a4889c3
Fixes variable declarations
qejk 0db3289
Adds sinon-chai to npm package
qejk 47699d9
Fixes SpaceObject and test
qejk 5b5948f
Updates CircleCI to use npm mocha instead of spacejam
qejk 3aeceea
Fixes Module, Injector and tests
qejk 2b42b59
Renames custom chai assert ‘toMatch’ to chainable ‘sameAs’
qejk 8012fdb
Add .gitignore file
darko-mijic 290a216
Merge branch 'feature/convert-to-es6' of https://github.com/meteor-sp…
darko-mijic 160a8e9
Add space-testing as github npm dependency and introduce global test …
darko-mijic 8765bc2
Updates CircleCI
qejk 3c48c7c
Renames tests folder to test for Mocha and mocha.opts
qejk 8e628a6
Fixes incorrect plugin load order breaking tests
qejk 0561a60
Moves injector annotations to space file
qejk cd29ddd
Fixes incorrect variable name in __extend__ from SpaceObject
qejk ca212f3
Adds global sinon for testing
qejk 9a396fe
Changes file extension from tests.js to unit.js; fixes variable decla…
qejk de55bb8
Fixes variable declarations
qejk a0c70bf
Replaces unavailable Object.values from ES7 to lodash.values
qejk c6590ac
Adds global fallback
qejk 8253de8
Git \n/ gore!
qejk e75f764
Standardizes file naming convention
qejk 9c9e981
Updates npm script ‘test’ to use new tests path
qejk 3611b63
Updates CircleCI
qejk d4b028a
Moves files from source to src
qejk d3296c4
Updates common.js to use new modular approach of space-testing
qejk 1868acc
Fixes issue with package not being transpiled by Babel before running…
qejk bba127f
Updates CircleCI
qejk a2cc1e5
Removes preset from Babels compilation
qejk 256515f
Changes file paths on tests to use transpiled version of lib
qejk 4b369fe
Fixes issue with SpaceError not passing arguments to construct callbacks
qejk 532859f
Changes temporarily Module publication
qejk c8cae37
Adds build script to npm
qejk ed0987b
Updates CircleCI to not cache node_modules
qejk 1315eb2
Fixes reference to pinned space-testing package
qejk 34a0351
Changes construction super testing approach on Struct unit test
qejk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,8 @@ | ||
{ | ||
"plugins": ["transform-decorators-legacy"] | ||
} | ||
"plugins": [ | ||
"transform-decorators-legacy" | ||
], | ||
presets: [ | ||
["es2015", {"loose": true}] | ||
] | ||
} |
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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,11 +1,11 @@ | ||
machine: | ||
node: | ||
version: 0.10.33 | ||
pre: | ||
- curl https://install.meteor.com | /bin/sh | ||
version: 6.0.0 | ||
|
||
dependencies: | ||
pre: | ||
- npm install -g spacejam | ||
override: | ||
- npm install | ||
|
||
test: | ||
override: | ||
- spacejam test-packages ./ | ||
- npm test |
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 |
---|---|---|
|
@@ -7,102 +7,87 @@ Package.describe({ | |
}); | ||
|
||
Npm.depends({ | ||
"getenv": "0.5.0", | ||
"winston": "2.1.0", | ||
"babel-plugin-transform-decorators-legacy": "1.3.4" | ||
}); | ||
|
||
Package.onUse(function(api) { | ||
|
||
api.versionsFrom('1.2.0.1'); | ||
api.versionsFrom('1.4.2'); | ||
|
||
api.use([ | ||
'coffeescript', | ||
'check', | ||
'underscore', | ||
'ecmascript' | ||
]); | ||
|
||
api.use([ | ||
'ejson', | ||
'ddp', | ||
'random', | ||
'mongo', | ||
'tracker', | ||
'templating', | ||
'session', | ||
'blaze', | ||
'email', | ||
'accounts-base', | ||
'reactive-var' | ||
], {weak: true}); | ||
|
||
api.addFiles([ | ||
'source/lib/underscore_deep_extend_mixin.js', | ||
'source/namespace.coffee', | ||
'source/helpers.coffee', | ||
'source/configuration.js', | ||
'source/object.coffee', | ||
'source/lib/underscore-deep-extend-mixin.js', | ||
'source/space.js', | ||
'source/object.js', | ||
'source/logger.js', | ||
'source/struct.coffee', | ||
'source/struct.js', | ||
'source/error.js', | ||
'source/injector.coffee', | ||
'source/injector_annotations.coffee', | ||
'source/module.coffee', | ||
'source/application.coffee' | ||
'source/injector.js', | ||
'source/injector-annotations.js', | ||
'source/module.js', | ||
'source/application.js', | ||
'source/loggers/adapter.js', | ||
'source/loggers/console-adapter.js', | ||
'source/index.js', | ||
'source/meteor.js' | ||
]); | ||
|
||
// Test helpers | ||
api.addFiles([ | ||
'source/testing/bdd-api.coffee' | ||
'source/testing/bdd-api.js' | ||
]); | ||
|
||
api.export([ | ||
'SpaceObject', | ||
'Struct', | ||
'SpaceError', | ||
'Injector', | ||
'InjectionError', | ||
'Logger', | ||
'LoggingAdapter', | ||
'ConsoleLogger', | ||
'Module', | ||
'Application', | ||
'Space' | ||
]); | ||
}); | ||
|
||
Package.onTest(function(api) { | ||
|
||
api.use([ | ||
'meteor', | ||
'coffeescript', | ||
'check', | ||
'ecmascript', | ||
'space:base', | ||
|
||
// weak-dependencies | ||
'ddp', | ||
'random', | ||
'underscore', | ||
'mongo', | ||
'tracker', | ||
'templating', | ||
'ejson', | ||
'accounts-base', | ||
'email', | ||
'session', | ||
'reactive-var', | ||
'practicalmeteor:[email protected]', | ||
'practicalmeteor:[email protected]_6', | ||
'practicalmeteor:[email protected]_1', | ||
'practicalmeteor:[email protected]_2', | ||
|
||
'space:[email protected]' | ||
]); | ||
|
||
api.addFiles([ | ||
|
||
// unit tests | ||
'tests/unit/object.unit.coffee', | ||
'tests/unit/module.unit.coffee', | ||
'tests/unit/struct.unit.coffee', | ||
'tests/unit/application.unit.coffee', | ||
'tests/unit/injector.unit.coffee', | ||
'tests/unit/object.unit.js', | ||
'tests/unit/module.unit.js', | ||
'tests/unit/struct.unit.js', | ||
'tests/unit/application.unit.js', | ||
'tests/unit/injector.unit.js', | ||
'tests/unit/injector_annotations.unit.js', | ||
'tests/unit/helpers.unit.coffee', | ||
'tests/unit/helpers.unit.js', | ||
'tests/unit/error.tests.js', | ||
'tests/unit/logger.tests.js', | ||
|
||
// integration tests | ||
'tests/integration/application_with_modules.spec.js', | ||
'tests/integration/standalone_application.integration.coffee', | ||
'tests/integration/lifecycle_hooks.tests.js', | ||
'tests/integration/requiring-modules.tests.js', | ||
'tests/integration/module.regressions.js' | ||
]); | ||
|
||
}); |
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 |
---|---|---|
@@ -0,0 +1,57 @@ | ||
{ | ||
"name": "space-base", | ||
"version": "4.1.4", | ||
"description": "Modular Application Architecture", | ||
"keywords": [ | ||
"space", | ||
"modular", | ||
"architecture", | ||
"dependencies", | ||
"dependency", | ||
"injection", | ||
"di", | ||
"ioc", | ||
"inversion of control" | ||
], | ||
"author": "Dominik Guzei, Rhys Bartels-Waller, Darko Mijic, Adam Desivi", | ||
"contributors": [ | ||
"Dominik Guzei (https://github.com/DominikGuzei)", | ||
"Rhys Bartels-Waller (https://github.com/rhyslbw)", | ||
"Darko Mijić (https://github.com/darko-mijic)", | ||
"Jonas Aschenbrenner (https://github.com/Sanjo)", | ||
"Adam Desivi (https://github.com/qejk)" | ||
], | ||
"license": "MIT", | ||
"engines": { | ||
"node": ">= 4.0.x", | ||
"npm": ">= 1.4.x" | ||
}, | ||
"repository": { | ||
"type": "git", | ||
"url": "git://github.com/meteor-space/base.git" | ||
}, | ||
"dependencies": { | ||
"underscore": "^1.8.0", | ||
"simplecheck": "git://github.com/qejk/simplecheck.git", | ||
"lodash": "^4.17.0" | ||
}, | ||
"devDependencies": { | ||
"babel-core": "^6.21.0", | ||
"babel-cli": "^6.18.0", | ||
"babel-plugin-transform-decorators-legacy": "^1.3.4", | ||
"babel-preset-es2015": "^6.14.0", | ||
"chai": "^3.5.0", | ||
"sinon": "^1.17.7", | ||
"sinon-chai": "^2.8.0", | ||
"mocha": "^3.2.0", | ||
"space-testing": "git://github.com/meteor-space/testing.git#feature\/convert-to-npm" | ||
|
||
}, | ||
"scripts": { | ||
"build": "npm run compile", | ||
"compile": "./node_modules/.bin/babel -d lib/ src/", | ||
"prepublish": "npm run compile", | ||
"test": "npm run compile && node_modules/mocha/bin/mocha --require babel-core/register --recursive test/**/*.js", | ||
"test-watch": "npm test -- --watch" | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do to:
Can't figure out why this works above
6.0.0
, tried4.0.0
,5.0.0
and one from0.10.*
- no luck. This should work on those versions. babel/babel#5041