@zohodesk/react-cli 0.0.1-beta.17 → 0.0.1-beta.171

package/lib/loaderUtils/configsAssetsLoaders.js

@@ -0,0 +1,117 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.configAudioLoader = configAudioLoader;
+exports.configFontLoader = configFontLoader;
+exports.configImageLoader = configImageLoader;
+exports.configSVGLoader = configSVGLoader;
+exports.configVideoLoader = configVideoLoader;
+exports.configVideoLoaderObj = configVideoLoaderObj;
+exports.createNameTemplate = createNameTemplate;
+
+var _path = _interopRequireDefault(require("path"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// function getLoaderOptionQueryString(params) {
+const ImageExtRegex = /\.jpe?g$|\.gif$|\.png$/;
+const FontExtRegex = /\.woff2|\.woff$|\.ttf$|\.eot$/;
+const SVGExtRegex = /\.svg$/;
+const AudioExtRegex = /\.ogg$/;
+const VidioExtRegex = /\.mp4$/;
+
+function createLoaderOptionQueryString(loaderName, nameTemplate, limit = 1000) {
+  return `${loaderName}?limit=${limit}&name=${nameTemplate}`;
+}
+
+function configImageLoader(nameTemplate) {
+  return {
+    test: ImageExtRegex,
+    use: createLoaderOptionQueryString('url-loader', `./images/${nameTemplate}`)
+  };
+}
+
+function configFontLoader(nameTemplate) {
+  return {
+    test: FontExtRegex,
+    use: createLoaderOptionQueryString('url-loader', `./fonts/${nameTemplate}`)
+  };
+}
+
+function configSVGLoader(nameTemplate) {
+  return {
+    test: SVGExtRegex,
+    use: createLoaderOptionQueryString('url-loader', `./fonts/${nameTemplate}`, 1)
+  };
+}
+
+function configAudioLoader(nameTemplate) {
+  return {
+    test: AudioExtRegex,
+    use: createLoaderOptionQueryString('file-loader', `./fonts/${nameTemplate}`, 1)
+  };
+}
+
+function configVideoLoader(nameTemplate) {
+  return {
+    test: VidioExtRegex,
+    use: createLoaderOptionQueryString('url-loader', `./images/${nameTemplate}`, 1)
+  };
+}
+
+function configVideoLoaderObj(nameTemplate) {
+  return {
+    test: VidioExtRegex,
+    use: {
+      loader: 'url-loader',
+      options: {
+        limit: 1000,
+        name: nameTemplate,
+        fallback: _path.default.join(__dirname, '..', 'loaders', 'fileLoader.js')
+      }
+    }
+  };
+}
+
+function createNameTemplate(enableChunkHash) {
+  const ext = `${enableChunkHash ? '.[hash:20]' : ''}.[ext]`;
+  return `[name]${ext}`;
+}
+/*
+export function createImageAndFontsAndSVGLoaders(enableChunkHash) {
+  const nameTemplate = createNameTemplate(enableChunkHash);
+  return [
+    configImageLoader(nameTemplate),
+    configFontLoader(nameTemplate),
+    configSVGLoader(nameTemplate),
+    configAudioLoader(nameTemplate)
+  ];
+}
+*/
+
+/*
+export function createLoaderOptionObject(
+  loaderName,
+  nameTemplate,
+  fallback,
+  limit = 1000
+) {
+  return {
+    loader: loaderName,
+    options: {
+      limit,
+      name: nameTemplate,
+      fallback
+    }
+  };
+}
+
+function configLoaderObject(filter, loaderAndOptions) {
+  return {
+    test: filter,
+    use: loaderAndOptions
+  };
+}
+*/

package/lib/loaderUtils/getCSSLoaders.js

@@ -0,0 +1,113 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _miniCssExtractPlugin = _interopRequireDefault(require("mini-css-extract-plugin"));
+
+var _cssClassNameGenerate = _interopRequireDefault(require("../utils/cssClassNameGenerate"));
+
+var _utils = require("../utils");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+let options = (0, _utils.getOptions)();
+let isWin = process.platform === 'win32';
+
+function windowsModification(array) {
+  return isWin ? array.map(r => r.replace(/\//g, '\\')) : array;
+}
+
+function excludeEmptyCheckPlugin({
+  enable,
+  ignore,
+  plugins
+}) {
+  return enable ? ignore.length === 0 ? plugins : [require('../postcss-plugins/ExcludePlugin')({
+    ignore,
+    plugins
+  })] : [];
+}
+
+let getCSSLoaders = (plugins, exclude, mediaQueryHoverActiveString, classNameBlob, cssUniqueness, selectorReplace, cssHashSelectors, classNamePrefix) => {
+  // console.log('plugins:')
+  // console.log(plugins)
+  // console.log('exclude:')
+  // console.log(exclude)
+  const {
+    devCssFileBountry
+  } = options.app;
+  const {
+    valueReplacer
+  } = options.css;
+  const {
+    cssSelectorZipPath
+  } = options.impactService;
+  let rtlExcludeLocal = windowsModification(exclude.rtl);
+  let hoverActiveExcludeLocal = windowsModification(exclude.hoverActive);
+  let combinerMediaQueryExcludeLocal = windowsModification(exclude.combinerMediaQuery);
+  let cssLoaderOptions = {
+    // importLoaders: hasRTL||hoverActive ? 1 : 0,
+    importLoaders: 1,
+    modules: {},
+    sourceMap: true
+  };
+
+  if (classNameBlob) {
+    cssLoaderOptions.modules.localIdentName = classNameBlob;
+  } else {
+    cssLoaderOptions.modules.getLocalIdent = (0, _cssClassNameGenerate.default)(cssUniqueness, cssHashSelectors, classNamePrefix);
+  }
+
+  const postcssPlugins = [valueReplacer && require('../postcss-plugins/ValueReplacer')(valueReplacer), selectorReplace && require('postcss-selector-replace')(selectorReplace), ...excludeEmptyCheckPlugin({
+    enable: plugins.hasRTL,
+    ignore: rtlExcludeLocal,
+    plugins: [require('@zohodesk/postcss-rtl')({
+      addPrefixToSelector: function addPrefixToSelector(selector, prefix) {
+        if (prefix === '[dir]') {
+          return selector;
+        }
+
+        return `${prefix} ${selector}`; // Make selectors like [dir=rtl] > .selector
+      }
+    })]
+  }), ...excludeEmptyCheckPlugin({
+    enable: plugins.combinerMediaQuery,
+    ignore: combinerMediaQueryExcludeLocal,
+    plugins: [require('postcss-combine-media-query')]
+  }), ...excludeEmptyCheckPlugin({
+    enable: plugins.hoverActive,
+    ignore: hoverActiveExcludeLocal,
+    plugins: [require('../postcss-plugins/hoverActivePlugin')(mediaQueryHoverActiveString)]
+  }) // require('../postcss-plugins/variableModifier')()
+  ].filter(Boolean);
+  return [cssSelectorZipPath && {
+    loader: require.resolve('../loaders/selectorMappingLoader')
+  }, {
+    loader: _miniCssExtractPlugin.default.loader,
+    options: {
+      publicPath: '../'
+    }
+  }, {
+    loader: 'css-loader',
+    options: cssLoaderOptions
+  }, devCssFileBountry && {
+    loader: require.resolve('../loaders/fileBountryLoader'),
+    options: {
+      devCssFileBountry
+    }
+  }, postcssPlugins.length > 0 ? {
+    loader: 'postcss-loader',
+    options: {
+      ident: 'postcss',
+      plugins: function () {
+        return postcssPlugins;
+      }
+    }
+  } : null].filter(Boolean);
+};
+
+var _default = getCSSLoaders;
+exports.default = _default;

package/lib/loaderUtils/getDevJsLoaders.js

@@ -1,51 +1,62 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = void 0;
 
-var _path = require('path');
-
-var _path2 = _interopRequireDefault(_path);
+var _path = _interopRequireDefault(require("path"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var getDevJsLoaders = function getDevJsLoaders(needEslinting, disableES5Transpile, hotReload) {
-  var loaders = [];
+let getDevJsLoaders = options => {
+  let {
+    app: {
+      disableES5Transpile,
+      instrumentScript,
+      devConsoleExculde
+    },
+    esLint: {
+      enable: enableEslint
+    }
+  } = options;
+  let loaders = [];
 
-  if (hotReload) {
-    // loaders.push({
-    //   loader: require.resolve('../loaders/scriptInstrumentLoader.js')
-    // });
+  if (instrumentScript) {
+    loaders.push({
+      loader: require.resolve('../loaders/scriptInstrumentLoader.js')
+    });
   }
 
   loaders.push({
     loader: 'babel-loader',
     options: {
-      presets: [[require.resolve('babel-preset-env'), disableES5Transpile ? {
+      presets: [[require.resolve('@babel/preset-env'), disableES5Transpile ? {
         modules: false,
-        useBuiltIns: true,
+        useBuiltIns: 'usage',
+        corejs: 3,
         targets: {
-          browsers: ['Chrome >= 60', 'Safari >= 10.1', 'iOS >= 10.3', 'Firefox >= 54', 'Edge >= 15']
+          browsers: ['last 3 Chrome versions', 'last 3 Firefox versions', 'last 3 Edge versions']
         }
-      } : { modules: false }], require.resolve('babel-preset-react')],
-      plugins: disableES5Transpile ? [] : [[require.resolve('babel-plugin-transform-runtime'), {
-        helpers: true,
-        polyfill: true,
-        regenerator: false,
-        moduleName: 'babel-runtime'
-      }]],
+      } : {
+        modules: false
+      }], require.resolve('@babel/preset-react')],
+      plugins: disableES5Transpile ? [require.resolve('@babel/plugin-syntax-dynamic-import'), require.resolve('babel-plugin-lodash'), require.resolve('@babel/plugin-proposal-object-rest-spread'), devConsoleExculde ? [require.resolve('babel-plugin-transform-remove-console'), {
+        exclude: ['error', 'log']
+      }] : null].filter(Boolean) : [require.resolve('@babel/plugin-syntax-dynamic-import'), require.resolve('babel-plugin-lodash'), require.resolve('@babel/plugin-proposal-object-rest-spread'), devConsoleExculde ? [require.resolve('babel-plugin-transform-remove-console'), {
+        exclude: ['error', 'log']
+      }] : null].filter(Boolean),
       cacheDirectory: true
     }
   });
 
-  if (needEslinting) {
+  if (enableEslint) {
     loaders.push({
       loader: 'eslint-loader',
       options: {
         emitError: true,
         emitWarning: true,
-        configFile: _path2.default.join(__dirname, '..', '..', '.eslintrc.js')
+        configFile: _path.default.join(__dirname, '..', '..', '.eslintrc.js')
       }
     });
   }
@@ -53,4 +64,5 @@ var getDevJsLoaders = function getDevJsLoaders(needEslinting, disableES5Transpil
   return loaders;
 };
 
-exports.default = getDevJsLoaders;
+var _default = getDevJsLoaders;
+exports.default = _default;

package/lib/loaderUtils/index.js

@@ -1,16 +1,23 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
-var _getDevJsLoaders = require('./getDevJsLoaders');
-
-Object.defineProperty(exports, 'getDevJsLoaders', {
+Object.defineProperty(exports, "getCSSLoaders", {
   enumerable: true,
-  get: function get() {
-    return _interopRequireDefault(_getDevJsLoaders).default;
+  get: function () {
+    return _getCSSLoaders.default;
   }
 });
+Object.defineProperty(exports, "getDevJsLoaders", {
+  enumerable: true,
+  get: function () {
+    return _getDevJsLoaders.default;
+  }
+});
+
+var _getDevJsLoaders = _interopRequireDefault(require("./getDevJsLoaders"));
+
+var _getCSSLoaders = _interopRequireDefault(require("./getCSSLoaders"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/loaders/docsLoader.js

@@ -1,22 +1,22 @@
-'use strict';
+"use strict";
 
-var _fs = require('fs');
+var _fs = _interopRequireDefault(require("fs"));
 
-var _fs2 = _interopRequireDefault(_fs);
-
-var _path = require('path');
-
-var _path2 = _interopRequireDefault(_path);
+var _path = _interopRequireDefault(require("path"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 module.exports = function (source) {
-  var comNameAry = this.resourcePath.split(_path2.default.sep);
-  var filePath = this.resourcePath;
-  var appPath = _fs2.default.realpathSync(process.cwd());
-  var changePath = filePath.replace('/lib/', '/src/');
-  var comName = comNameAry[comNameAry.length - 1];
-  var name = comName.substring(0, comName.lastIndexOf('.'));
-  var src = _fs2.default.readFileSync(filePath.startsWith(appPath) ? filePath : changePath).toString();
-  return source + ';' + name + '.source=' + JSON.stringify(src) + ';' + name + '.filePath=' + JSON.stringify(filePath);
+  let comNameAry = this.resourcePath.split(_path.default.sep);
+  let filePath = this.resourcePath;
+
+  let appPath = _fs.default.realpathSync(process.cwd());
+
+  let changePath = filePath.replace('/lib/', '/src/');
+  let comName = comNameAry[comNameAry.length - 1];
+  let name = comName.substring(0, comName.lastIndexOf('.'));
+
+  let src = _fs.default.readFileSync(filePath.startsWith(appPath) ? filePath : changePath).toString();
+
+  return `${source};${name}.source=${JSON.stringify(src)};${name}.filePath=${JSON.stringify(filePath)}`;
 };

package/lib/loaders/docsPropsLoader.js

@@ -1,30 +1,27 @@
-'use strict';
+"use strict";
 
-var _reactDocgen = require('react-docgen');
+var _reactDocgen = _interopRequireDefault(require("react-docgen"));
 
-var _reactDocgen2 = _interopRequireDefault(_reactDocgen);
+var _path = _interopRequireDefault(require("path"));
 
-var _path = require('path');
-
-var _path2 = _interopRequireDefault(_path);
-
-var _utils = require('../utils');
+var _utils = require("../utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // import loaderUtils from 'loader-utils';
-module.exports = function (source) {
-  undefined.cacheable && undefined.cacheable();
-  // let query = loaderUtils.parseQuery(this.query);
+module.exports = source => {
+  (void 0).cacheable && (void 0).cacheable(); // let query = loaderUtils.parseQuery(this.query);
+
+  let value = {};
 
-  var value = {};
   try {
-    value = _reactDocgen2.default.parse(source);
+    value = _reactDocgen.default.parse(source);
   } catch (e) {
     (0, _utils.log)('ERROR in docgen-loader', e);
   }
-  var comNameAry = undefined.resourcePath.split(_path2.default.sep);
-  var comName = comNameAry[comNameAry.length - 1];
-  var name = comName.substring(0, comName.lastIndexOf('.'));
-  return source + ';' + name + '.propsObj=' + JSON.stringify(value);
+
+  let comNameAry = (void 0).resourcePath.split(_path.default.sep);
+  let comName = comNameAry[comNameAry.length - 1];
+  let name = comName.substring(0, comName.lastIndexOf('.'));
+  return `${source};${name}.propsObj=${JSON.stringify(value)}`;
 };

package/lib/loaders/fileBountryLoader.js

@@ -0,0 +1,17 @@
+"use strict";
+
+var _path = _interopRequireDefault(require("path"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+module.exports = function (source) {
+  const {
+    rootContext,
+    resourcePath,
+    query
+  } = this;
+  const {
+    devCssFileBountry
+  } = query;
+  return `/*${devCssFileBountry} ${_path.default.relative(rootContext, resourcePath)}*/\n${source}`;
+};

package/lib/loaders/fileLoader.js

@@ -1,62 +1,64 @@
-'use strict';
+"use strict";
 
-var _path = require('path');
+var _path = _interopRequireDefault(require("path"));
 
-var _path2 = _interopRequireDefault(_path);
+var _loaderUtils = _interopRequireDefault(require("loader-utils"));
 
-var _loaderUtils = require('loader-utils');
-
-var _loaderUtils2 = _interopRequireDefault(_loaderUtils);
+var _common = require("../common");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 module.exports = function (content) {
+  let {
+    userRequest
+  } = this._module.issuer;
   this.cacheable && this.cacheable();
+
   if (!this.emitFile) {
     throw new Error('emitFile is required from module system');
   }
 
-  var options = _loaderUtils2.default.getOptions(this) || {};
-  var query = this.resourceQuery ? _loaderUtils2.default.parseQuery(this.resourceQuery) : {};
-
-  // let configKey = query.config || 'fileLoader';
+  let options = _loaderUtils.default.getOptions(this) || {};
+  let query = this.resourceQuery ? _loaderUtils.default.parseQuery(this.resourceQuery) : {}; // let configKey = query.config || 'fileLoader';
 
-  var config = {
-    publicPath: false,
+  let config = {
+    // publicPath: false,
     useRelativePath: false,
-    name: '[hash].[ext]',
-    publicPathStrigify: true
-  };
+    name: '[hash].[ext]' // publicPathStrigify: true
 
-  // options takes precedence over config
-  Object.keys(options).forEach(function (attr) {
+  }; // options takes precedence over config
+
+  Object.keys(options).forEach(attr => {
     config[attr] = options[attr];
-  });
+  }); // query takes precedence over config and options
 
-  // query takes precedence over config and options
-  Object.keys(query).forEach(function (attr) {
+  Object.keys(query).forEach(attr => {
     config[attr] = query[attr];
   });
+  let context = config.context || options.context;
 
-  var context = config.context || options.context;
-  var url = _loaderUtils2.default.interpolateName(this, config.name, {
+  let url = _loaderUtils.default.interpolateName(this, config.name, {
     context: context,
     content: content,
     regExp: config.regExp
   });
 
-  var outputPath = '';
+  let outputPath = '';
+  let filePath = this.resourcePath;
 
-  var filePath = this.resourcePath;
   if (config.useRelativePath) {
-    var issuerContext = this._module && this._module.issuer && this._module.issuer.context || context;
-    var relativeUrl = issuerContext && _path2.default.relative(issuerContext, filePath).split(_path2.default.sep).join('/');
-    var relativePath = relativeUrl && _path2.default.dirname(relativeUrl) + '/';
+    let issuerContext = this._module && this._module.issuer && this._module.issuer.context || context;
+
+    let relativeUrl = issuerContext && _path.default.relative(issuerContext, filePath).split(_path.default.sep).join('/');
+
+    let relativePath = relativeUrl && `${_path.default.dirname(relativeUrl)}/`;
+
     if (~relativePath.indexOf('../')) {
-      outputPath = _path2.default.posix.join(outputPath, relativePath, url);
+      outputPath = _path.default.posix.join(outputPath, relativePath, url);
     } else {
       outputPath = relativePath + url;
     }
+
     url = relativePath + url;
   } else if (config.outputPath) {
     // support functions as outputPath to generate them dynamically
@@ -66,21 +68,28 @@ module.exports = function (content) {
     outputPath = url;
   }
 
-  var publicPath = '__webpack_public_path__ + ' + JSON.stringify(url);
-  if (config.publicPath !== false) {
-    // support functions as publicPath to generate them dynamically
-    if (config.publicPathStringify) {
-      publicPath = JSON.Stringify(typeof config.publicPath === 'function' ? config.publicPath(url) : config.publicPath + url);
-    } else {
-      publicPath = typeof config.publicPath === 'function' ? config.publicPath(url) : config.publicPath + url;
-    }
-  }
+  let requestFromJS = /\.js$/.test(userRequest);
+  let publicPath = requestFromJS ? (0, _common.getPublicPathConfig)(url) : `__webpack_public_path__ + ${JSON.stringify(url)}`; // if (config.publicPath !== false) {
+  //   // support functions as publicPath to generate them dynamically
+  //   if (config.publicPathStringify) {
+  //     publicPath = JSON.Stringify(
+  //       typeof config.publicPath === 'function'
+  //         ? config.publicPath(url)
+  //         : config.publicPath + url
+  //     );
+  //   } else {
+  //     publicPath =
+  //       typeof config.publicPath === 'function'
+  //         ? config.publicPath(url)
+  //         : config.publicPath + url;
+  //   }
+  // }
 
   if (query.emitFile === undefined || query.emitFile) {
     this.emitFile(outputPath, content);
   }
 
-  return 'module.exports = ' + publicPath + ';';
+  return `module.exports = ${publicPath};`;
 };
 
 module.exports.raw = true;

package/lib/loaders/scriptInstrumentLoader.js

@@ -1,16 +1,16 @@
-'use strict';
+"use strict";
 
-var _esprima = require('esprima');
+var esprima = _interopRequireWildcard(require("esprima"));
 
-var _esprima2 = _interopRequireDefault(_esprima);
+var _escodegen = _interopRequireDefault(require("escodegen"));
 
-var _escodegen = require('escodegen');
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _escodegen2 = _interopRequireDefault(_escodegen);
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var start = {
+let start = {
   type: 'ExpressionStatement',
   expression: {
     type: 'CallExpression',
@@ -54,24 +54,30 @@ var start = {
   }
 };
 
-var scriptInstrumentLoader = function scriptInstrumentLoader(source) {
-  var parsed = _esprima2.default.parseModule(source, { jsx: true });
-  for (var i in parsed.body) {
+let scriptInstrumentLoader = function (source) {
+  let parsed = esprima.parseModule(source, {
+    jsx: true
+  });
+
+  for (let i in parsed.body) {
     if (parsed.body[i].type === 'FunctionDeclaration' || parsed.body[i].type === 'ExportDefaultDeclaration' || parsed.body[i].type === 'ExportNamedDeclaration') {
-      var ParsedTemp = void 0;
+      let ParsedTemp;
+
       if (parsed.body[i].type === 'FunctionDeclaration') {
         ParsedTemp = parsed.body[i];
       } else {
         ParsedTemp = parsed.body[i].declaration;
       }
+
       if (ParsedTemp) {
         if (ParsedTemp.id) {
-          var funcname = ParsedTemp.id.name;
+          let funcname = ParsedTemp.id.name;
+
           if (funcname !== 'mapStateToProps') {
             if (!funcname.includes('_')) {
-              var startFunc = JSON.parse(JSON.stringify(start));
-              startFunc.expression.arguments[0].value = undefined.resourcePath;
-              startFunc.expression.arguments[0].raw = undefined.resourcePath;
+              let startFunc = JSON.parse(JSON.stringify(start));
+              startFunc.expression.arguments[0].value = this.resourcePath;
+              startFunc.expression.arguments[0].raw = this.resourcePath;
               startFunc.expression.arguments[1].value = funcname;
               startFunc.expression.arguments[1].raw = funcname;
               ParsedTemp.body.body.unshift(startFunc);
@@ -82,8 +88,7 @@ var scriptInstrumentLoader = function scriptInstrumentLoader(source) {
     }
   }
 
-  return _escodegen2.default.generate(parsed);
-  // function removeDuplicates(arr) {
+  return _escodegen.default.generate(parsed); // function removeDuplicates(arr) {
   //   let uniqueArray = [];
   //   for (let i = 0; i < arr.length; i++) {
   //     if (uniqueArray.indexOf(arr[i]) == -1) {
@@ -95,9 +100,7 @@ var scriptInstrumentLoader = function scriptInstrumentLoader(source) {
   // funcArray = removeDuplicates(funcArray);
 };
 
-module.exports = scriptInstrumentLoader;
-
-// let start = {
+module.exports = scriptInstrumentLoader; // let start = {
 //   type: 'ExpressionStatement',
 //   expression: {
 //     type: 'CallExpression',