Skip to content

Commit

Permalink
build fix
Browse files Browse the repository at this point in the history
  • Loading branch information
azproduction committed Mar 4, 2015
1 parent f79715d commit 6141695
Show file tree
Hide file tree
Showing 12 changed files with 1,132 additions and 1,132 deletions.
8 changes: 0 additions & 8 deletions .documentup.json

This file was deleted.

1 change: 0 additions & 1 deletion CNAME

This file was deleted.

103 changes: 55 additions & 48 deletions package.json
@@ -1,50 +1,57 @@
{
"name": "lmd",
"version": "1.13.3",
"description": "LMD: Lazy Module Declaration",
"keywords": [
"lmd", "amd", "module",
"components", "styles", "builder",
"optimizer", "cli", "tool"
],
"homepage": "http://lmdjs.org/",
"license": "MIT",
"author": {
"name": "Mikhail Davydov",
"email": "i@azproduction.ru"
},
"bin": {
"lmd": "./bin/lmd"
},
"main": "./bin/lmd_builder.js",
"scripts": {
"test": "make test"
},
"repository": {
"type": "git",
"url": "git@github.com:azproduction/lmd.git"
},
"dependencies": {
"uglify-js": "1.3.4",
"jade": "0.26.1",
"express": "2.5.9",
"colors": "= 0.6.0-1",
"source-map": ">= 0.1.3",
"optimist": ">= 0.3.5",
"lodash-template": "1.0.0",
"glob": ">= 3.1.14",
"csso": ">= 1.3.10",
"readable-stream": "~1.0.0"
},
"devDependencies": {
"http-server": ">= 0.5.1",
"colors": ">= 0.6.0",
"mocha": "1.11.0",
"chai": "*",
"vow": "0.3.12"
},
"engines": {
"node": ">= 0.8.0"
},
"preferGlobal": true
"name": "lmd",
"version": "1.13.3",
"description": "LMD: Lazy Module Declaration",
"keywords": [
"lmd",
"amd",
"module",
"components",
"styles",
"builder",
"optimizer",
"cli",
"tool"
],
"homepage": "http://lmdjs.org/",
"license": "MIT",
"author": {
"name": "Mikhail Davydov",
"email": "i@azproduction.ru"
},
"bin": {
"lmd": "./bin/lmd"
},
"main": "./bin/lmd_builder.js",
"scripts": {
"test": "make test"
},
"repository": {
"type": "git",
"url": "git@github.com:azproduction/lmd.git"
},
"dependencies": {
"uglify-js": "1.3.4",
"jade": "0.26.1",
"express": "2.5.9",
"colors": "0.6.0-1",
"source-map": "~0.1.3",
"optimist": "~0.3.5",
"lodash-template": "1.0.0",
"glob": "~3.1.14",
"csso": "~1.3.10",
"readable-stream": "~1.0.0"
},
"devDependencies": {
"chai": "*",
"colors": "~0.6.0",
"http-server": "~0.5.1",
"mocha": "1.11.0",
"phantomjs": "1.9.16",
"vow": "0.3.12"
},
"engines": {
"node": ">= 0.8.0"
},
"preferGlobal": true
}
2 changes: 1 addition & 1 deletion src/plugin/common/script_loader.js
Expand Up @@ -42,4 +42,4 @@
return [moduleName, callback];
});

}(sandbox));
}(sandbox));
4 changes: 2 additions & 2 deletions src/plugin/common/wrap_module.js
Expand Up @@ -75,7 +75,7 @@ if ($P.WRAP_MODULE) {

var async_plain = function (module, contentTypeOrExtension) {
// its NOT a JSON ant its a plain code
if (!(/json$/).test(contentTypeOrExtension)/*if ($P.WRAP_MODULE) {*/ && async_is_plain_code(module)/*}*/) {
if (!(/json/).test(contentTypeOrExtension)/*if ($P.WRAP_MODULE) {*/ && async_is_plain_code(module)/*}*/) {
// its not a JSON and its a Plain LMD module - wrap it
module = '(function(require,exports,module){\n' + module + '\n})';
}
Expand Down Expand Up @@ -111,4 +111,4 @@ sb.on('*:is-plain-module', function (moduleName, module, isPlainCode) {
}
});

}(sandbox));
}(sandbox));
4 changes: 2 additions & 2 deletions test/build/test.bundles.js
Expand Up @@ -91,9 +91,9 @@ describe('lmd', function() {
var build = new Builder(cfgPath('flatten')),
bundles = build.buildConfig.bundles;

expect(bundles).to.have.deep.property('a');
expect(bundles).to.have.property('a');
expect(bundles).to.not.have.deep.property('a.bundles');
expect(bundles).to.have.deep.property('a' + SUB_BUNDLE_SEPARATOR + 'b');
expect(bundles).to.have.property('a' + SUB_BUNDLE_SEPARATOR + 'b');
});

it('constructs output using host bundle output name', function () {
Expand Down

0 comments on commit 6141695

Please sign in to comment.