Skip to content

Commit

Permalink
Add missing commonJS and AMD wrappers
Browse files Browse the repository at this point in the history
- previous commit accidentally removed support

fixes #72
  • Loading branch information
j3tan committed Jun 11, 2015
1 parent dc66d6e commit 09a0231
Showing 1 changed file with 44 additions and 27 deletions.
71 changes: 44 additions & 27 deletions Makefile.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ var NODE = 'node ', // intentional extra space
JS_DIRS = getSourceDirectories(),

// Files
SRC_JQUERY_FILES = ['lib/box.js', 'lib/event-target.js', 'lib/dom-jquery.js', 'lib/context.js', 'lib/application.js'],
SRC_NATIVE_FILES = ['lib/box.js', 'lib/event-target.js', 'lib/dom-native.js', 'lib/context.js', 'lib/application.js'],
TESTING_JQUERY_FILES = ['lib/box.js', 'lib/event-target.js', 'lib/dom-jquery.js', 'lib/application-stub.js', 'lib/test-service-provider.js'],
TESTING_NATIVE_FILES = ['lib/box.js', 'lib/event-target.js', 'lib/dom-native.js', 'lib/application-stub.js', 'lib/test-service-provider.js'],
SRC_JQUERY_FILES = ['lib/wrap-start.partial', 'lib/box.js', 'lib/event-target.js', 'lib/dom-jquery.js', 'lib/context.js', 'lib/application.js', 'lib/wrap-end.partial'],
SRC_NATIVE_FILES = ['lib/wrap-start.partial', 'lib/box.js', 'lib/event-target.js', 'lib/dom-native.js', 'lib/context.js', 'lib/application.js', 'lib/wrap-end.partial'],
TESTING_JQUERY_FILES = ['lib/wrap-start.partial', 'lib/box.js', 'lib/event-target.js', 'lib/dom-jquery.js', 'lib/application-stub.js', 'lib/test-service-provider.js', 'lib/wrap-end.partial'],
TESTING_NATIVE_FILES = ['lib/wrap-start.partial', 'lib/box.js', 'lib/event-target.js', 'lib/dom-native.js', 'lib/application-stub.js', 'lib/test-service-provider.js', 'lib/wrap-end.partial'],
JS_FILES = find(JS_DIRS).filter(fileType('js')).join(' '),
TEST_FILES = find('tests/').filter(fileType('js')).join(' ');

Expand Down Expand Up @@ -144,6 +144,21 @@ function getVersionTags() {
}, []).sort(semver.compare);
}

/**
* Verifies that common module loaders can be used with dist files
* @returns {void}
* @private
*/
function validateModuleLoading() {
var t3js = require(DIST_DIR + DIST_NAME + '.js');

// Validate CommonJS
if (!t3js || !('Application' in t3js)) {
echo('ERROR: The dist file is not wrapped correctly for CommonJS');
exit(1);
}
}

/**
* Creates a release version tag and pushes to origin.
* @param {string} type The type of release to do (patch, minor, major)
Expand All @@ -166,29 +181,32 @@ function release(type) {
target.dist();
target.changelog();

// Step 3: Add files to current commit
// Step 3: Validate CommonJS wrapping
validateModuleLoading();

// Step 4: Add files to current commit
execOrExit('git add -A');
execOrExit('git commit --amend --no-edit');

// Step 4: reset the git tag to the latest commit
// Step 5: reset the git tag to the latest commit
execOrExit('git tag -f ' + newVersion);

// Step 5: publish to git
// Step 6: publish to git
execOrExit('git push origin master --tags');

// Step 6: publish to npm
// Step 7: publish to npm
execOrExit('npm publish');

// Step 7: Update version number in docs site
// Step 8: Update version number in docs site
execOrExit('git checkout gh-pages');
('version: ' + newVersion).to('_data/t3.yml');
execOrExit('git commit -am "Update version number to ' + newVersion + '"');
execOrExit('git fetch origin && git rebase origin/gh-pages && git push origin gh-pages');

// Step 8: Switch back to master
// Step 9: Switch back to master
execOrExit('git checkout master');

// Step 9: Party time
// Step 10: Party time
}


Expand Down Expand Up @@ -229,7 +247,6 @@ target.docs = function() {
echo('Documentation has been output to /jsdoc');
};


function generateDistFiles(dist){
var pkg = require('./package.json'),
distFilename = DIST_DIR + dist.name + '.js',
Expand Down Expand Up @@ -273,21 +290,21 @@ target.dist = function() {
mkdir(DIST_DIR);
}

[{
name: DIST_NATIVE_NAME,
files: SRC_NATIVE_FILES,
testingFiles: TESTING_NATIVE_FILES
}, {
name: DIST_JQUERY_NAME,
files: SRC_JQUERY_FILES,
testingFiles: TESTING_JQUERY_FILES
}, {
name: DIST_NAME,
files: SRC_JQUERY_FILES,
testingFiles: TESTING_JQUERY_FILES
}].forEach(function(dist){
generateDistFiles(dist);
});
[{
name: DIST_NATIVE_NAME,
files: SRC_NATIVE_FILES,
testingFiles: TESTING_NATIVE_FILES
}, {
name: DIST_JQUERY_NAME,
files: SRC_JQUERY_FILES,
testingFiles: TESTING_JQUERY_FILES
}, {
name: DIST_NAME,
files: SRC_JQUERY_FILES,
testingFiles: TESTING_JQUERY_FILES
}].forEach(function(dist){
generateDistFiles(dist);
});
};

target.changelog = function() {
Expand Down

0 comments on commit 09a0231

Please sign in to comment.