babel-plugin-system-import-transformer - npm Package Compare versions

Comparing version 2.3.0 to 2.4.0

dist/index.js

@@ -14,3 +14,3 @@ 'use strict';
           var params = path.get('arguments');
-          if (params.length && params[0].isLiteral()) {
+          if (params.length) {
             (0, _babelArgumentProvider.setBabelArgument)(babel);
@@ -20,7 +20,2 @@ var transformer = new _SystemImportExpressionTransformer2.default(state, params);
             if (transformedExpression) {
-              // console.log(require.main.filename);// /home/teo/Dropbox/babel-related/babel-plugin-system-import-transformer/test/index.js
-              // console.log(state.file.opts.filename);// /home/teo/Dropbox/babel-related/babel-plugin-system-import-transformer/test/fixtures/umd/var/actual.js
-              // console.log(__dirname);// /home/teo/Dropbox/babel-related/babel-plugin-system-import-transformer/dist
-              // console.log(__filename);// /home/teo/Dropbox/babel-related/babel-plugin-system-import-transformer/dist/index.js
-              // console.log(process.cwd());// /home/teo/Dropbox/babel-related/babel-plugin-system-import-transformer
               path.replaceWith(transformedExpression);
@@ -27,0 +22,0 @@ }

dist/SystemImportExpressionTransformer.js

@@ -28,6 +28,10 @@ 'use strict';
     var param = params[0];
-    this.importedModuleLiteral = _babelArgumentProvider.types.stringLiteral(param.node.value);
 
-    var moduleName = (0, _moduleImportHelper.getImportModuleName)(this.file, this.importedModuleLiteral.value);
-    this.moduleNameLiteral = _babelArgumentProvider.types.stringLiteral(moduleName);
+    this.importedModuleExpression = param.node;
+    this.moduleNameExpression = this.importedModuleExpression;
+
+    if (this.importedModuleExpression.type === 'StringLiteral') {
+      var moduleName = (0, _moduleImportHelper.getImportModuleName)(this.file, this.importedModuleExpression.value);
+      this.moduleNameExpression = _babelArgumentProvider.types.stringLiteral(moduleName); // for AMD and Global when configured
+    }
   }
@@ -117,7 +121,7 @@
       if (this.moduleType === 'amd') {
-        moduleImportExpression = this.getAmdRequirePromise(this.moduleNameLiteral);
+        moduleImportExpression = this.getAmdRequirePromise(this.moduleNameExpression);
       } else if (this.moduleType === 'common') {
-        moduleImportExpression = this.getCommonJSRequirePromise(this.importedModuleLiteral);
+        moduleImportExpression = this.getCommonJSRequirePromise(this.importedModuleExpression);
       } else if (this.moduleType === 'global') {
-        moduleImportExpression = this.getGlobalRequirePromise(this.moduleNameLiteral);
+        moduleImportExpression = this.getGlobalRequirePromise(this.moduleNameExpression);
       } else {
@@ -130,3 +134,3 @@ // umd
 
-        var umdRequire = _babelArgumentProvider.types.conditionalExpression(amdTest, this.getAmdRequirePromise(this.moduleNameLiteral), _babelArgumentProvider.types.conditionalExpression(commonJSOrComponentTest, this.getCommonJSRequirePromise(this.importedModuleLiteral), this.getGlobalRequirePromise(this.moduleNameLiteral)));
+        var umdRequire = _babelArgumentProvider.types.conditionalExpression(amdTest, this.getAmdRequirePromise(this.moduleNameExpression), _babelArgumentProvider.types.conditionalExpression(commonJSOrComponentTest, this.getCommonJSRequirePromise(this.importedModuleExpression), this.getGlobalRequirePromise(this.moduleNameExpression)));
         moduleImportExpression = umdRequire;
@@ -133,0 +137,0 @@ }

package.json

 {
   "name": "babel-plugin-system-import-transformer",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Babel plugin that replaces System.import with the equivalent UMD pattern",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

No alert changes

Worsened metrics

Total package byte prevSize

24232

decreased by-2.17%

Lines of code

287

decreased by-0.69%

No dependency changes