Skip to content
This repository was archived by the owner on Dec 3, 2023. It is now read-only.

Transform 'ngFoo' dependencies into 'angular-foo'. #11

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,17 @@ function containsSlash(str){
return str.indexOf("/") >= 0 || str.indexOf("\\") >= 0;
}

function transformNGModuleName (request) {
return request.replace(/^ng([A-Z])/, function (_, firstChar) {
return 'angular-' + firstChar.toLowerCase();
});
}

function transformDepItem (dependency) {
dependency.string = transformNGModuleName(dependency.string);
return dependency;
}

// Try to resolve a file of the form /somepath/module/module
// (calling it modmod for want of a better term)
function resolveModModFile(resolver, request, callback){
Expand Down Expand Up @@ -105,7 +116,7 @@ AngularPlugin.prototype = {
// - files containing multiple modules (shared prefix)
//
resolveModule: function(resolver, request, callback){
if( containsSlash(request.request) ){
if( containsSlash(request.request) || /^angular-/.test(request.request) ){
return callback();
}
var split = request.request.split('.');
Expand Down Expand Up @@ -172,7 +183,7 @@ AngularPlugin.prototype = {
var deps = parser.evaluateExpression(expr.arguments[1]);
this._addModuleDefinition(parser, expr, mod);
if( deps.items ){
return deps.items.every(
return deps.items.map(transformDepItem).every(
this._addDependency.bind(this, parser, expr));
}
return this._addDependency(parser, expr, mod);
Expand All @@ -184,7 +195,7 @@ AngularPlugin.prototype = {
var mod = parser.evaluateExpression(expr.arguments[0]);
var deps = parser.evaluateExpression(expr.arguments[1]);
this._addModuleDefinition(parser, expr, mod);
return deps.items.every(
return deps.items.map(transformDepItem).every(
this._addDependency.bind(this, parser, expr));
},

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

angular.module('ngDependency', []);
2 changes: 2 additions & 0 deletions test/scenarios/basic-module-dependency-transform/in/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// 1 dep
angular.module('myModule', ['ngDependency']);
33 changes: 33 additions & 0 deletions test/scenarios/basic-module-dependency-transform/out/bundle.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/******/ ([
/* 0 */
/***/ function(module, exports, __webpack_require__) {

__webpack_require__(1);
/* WEBPACK VAR INJECTION */(function(angular) {// 1 dep
(module.exports['myModule'] = angular.module('myModule', ['ngDependency'])
);

/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(2)))

/***/ },
/* 1 */
/***/ function(module, exports, __webpack_require__) {

/* WEBPACK VAR INJECTION */(function(angular) {
(module.exports['ngDependency'] = angular.module('ngDependency', []));

/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(2)))

/***/ },
/* 2 */
/***/ function(module, exports, __webpack_require__) {


// stub for angular module


/*** EXPORTS FROM exports-loader ***/
module.exports = window.angular

/***/ }
/******/ ])
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
var AngularPlugin = require('../../../lib');
module.exports = {
entry: "main.js",
plugins: [new AngularPlugin()]
};
53 changes: 33 additions & 20 deletions test/scenarios/basic-module-dependency/out/bundle.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,33 @@
([
function(module, exports, __webpack_require__) {
// 'dependency'
__webpack_require__(1);

(function(angular) {
(module.exports['myModule'] = angular.module('myModule', ['dependency']));
}.call(exports, __webpack_require__(2)))

},
function(module, exports, __webpack_require__) {

(function(angular) {
(module.exports['dependency'] = angular.module('dependency', []));
}.call(exports, __webpack_require__(2)))
},
function(module, exports, __webpack_require__) {
// stub
}
])
/******/ ([
/* 0 */
/***/ function(module, exports, __webpack_require__) {

__webpack_require__(1);
/* WEBPACK VAR INJECTION */(function(angular) {// 1 dep
(module.exports['myModule'] = angular.module('myModule', ['dependency'])
);

/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(2)))

/***/ },
/* 1 */
/***/ function(module, exports, __webpack_require__) {

/* WEBPACK VAR INJECTION */(function(angular) {
(module.exports['dependency'] = angular.module('dependency', []));

/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(2)))

/***/ },
/* 2 */
/***/ function(module, exports, __webpack_require__) {


// stub for angular module


/*** EXPORTS FROM exports-loader ***/
module.exports = window.angular

/***/ }
/******/ ])
33 changes: 22 additions & 11 deletions test/scenarios/basic-module/out/bundle.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
([
function(module, exports, __webpack_require__) {

(function(angular) {
(module.exports['main'] = angular.module('main', []));
}.call(exports, __webpack_require__(1)))
},
function(module, exports, require) {
// angular.js stub
}
])
/******/ ([
/* 0 */
/***/ function(module, exports, __webpack_require__) {

/* WEBPACK VAR INJECTION */(function(angular) {// Simplest test
(module.exports['main'] = angular.module('main', []));

/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))

/***/ },
/* 1 */
/***/ function(module, exports, __webpack_require__) {


// stub for angular module


/*** EXPORTS FROM exports-loader ***/
module.exports = window.angular

/***/ }
/******/ ])