@zohodesk/react-cli 0.0.1-beta.16 → 0.0.1-beta.160

package/lib/common/getEntries.js

@@ -1,43 +1,52 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = void 0;
 
-var _path = require('path');
+var _path = _interopRequireDefault(require("path"));
 
-var _path2 = _interopRequireDefault(_path);
-
-var _utils = require('../utils');
+var _utils = require("../utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var getEntries = function getEntries(appSchemas, mode) {
-  var appPath = process.cwd();
-  var _appSchemas$app = appSchemas.app,
-      isReactMig = _appSchemas$app.isReactMig,
-      hasWidget = _appSchemas$app.hasWidget,
-      hasEFC = _appSchemas$app.hasEFC,
-      server = _appSchemas$app.server,
-      folder = _appSchemas$app.folder;
-
-
-  var mainJs = [];
-  var entry = { main: mainJs };
-
-  if (mode === 'dev') {
-    mainJs.push(_path2.default.join(__dirname, '..', 'templates', 'WMSTemplate') + '?wmsPath=wss:' + (0, _utils.getServerURL)(server));
+let getEntries = (appSchemas, mode) => {
+  let appPath = process.cwd();
+  let {
+    isReactMig,
+    hasWidget,
+    server,
+    folder
+  } = appSchemas.app;
+  const {
+    hasEFC: prevOptionForEnableEFC
+  } = appSchemas.app;
+  const {
+    hasEFC: newOptionForEnableEFC
+  } = appSchemas.efc;
+  const hasEFC = newOptionForEnableEFC || prevOptionForEnableEFC;
+  let mainJs = [];
+  let entry = {
+    main: mainJs
+  };
+
+  if (mode === 'dev' || mode === 'dev-no-warn') {
+    mainJs.push(`${_path.default.join(__dirname, '..', 'templates', 'WMSTemplate')}?wmsPath=wss:${(0, _utils.getServerURL)(server)}`);
   }
 
-  mainJs.push(_path2.default.join(appPath, folder, isReactMig ? 'migration.js' : 'index.js'));
+  mainJs.push(_path.default.join(appPath, folder, isReactMig ? 'migration.js' : 'index.js'));
 
   if (hasWidget) {
-    entry.widget = [_path2.default.join(appPath, folder, 'widget.js')];
+    entry.widget = [_path.default.join(appPath, folder, 'widget.js')];
   }
+
   if (hasEFC) {
-    entry.efc = [_path2.default.join(appPath, folder, 'efc.js')];
+    entry.efc = [_path.default.join(appPath, folder, 'efc.js')];
   }
 
   return entry;
 };
-exports.default = getEntries;
+
+var _default = getEntries;
+exports.default = _default;

package/lib/common/getPublicPathConfig.js

@@ -0,0 +1,40 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _utils = require("../utils");
+
+let {
+  app: {
+    publicPaths,
+    cdnMapping: {
+      isCdnEnabled,
+      variableName
+    },
+    server: {
+      mode
+    }
+  }
+} = (0, _utils.getOptions)();
+let isDevelopment = mode === 'dev' || mode === 'prod' || mode === 'dev-no-warn';
+
+var _default = url => {
+  let type = (0, _utils.getFileType)(url);
+
+  if (!isDevelopment) {
+    if (publicPaths && publicPaths.callback) {
+      return `${publicPaths.callback}(${JSON.stringify(type)}) + ${JSON.stringify(url)}`;
+    } else if (isCdnEnabled) {
+      return `window["${variableName}"] + ${JSON.stringify(url)}`;
+    } else if (publicPaths) {
+      return `__REACT_CLI_${type.toUpperCase()}_PUBLIC_PATH__ + ${JSON.stringify(url)}`;
+    }
+  }
+
+  return `__webpack_public_path__ + ${JSON.stringify(url)}`;
+};
+
+exports.default = _default;

package/lib/common/index.js

@@ -1,25 +1,39 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
-var _splitChunks = require('./splitChunks');
-
-Object.defineProperty(exports, 'splitChunks', {
+Object.defineProperty(exports, "splitChunks", {
   enumerable: true,
-  get: function get() {
-    return _interopRequireDefault(_splitChunks).default;
+  get: function () {
+    return _splitChunks.default;
   }
 });
-
-var _getEntries = require('./getEntries');
-
-Object.defineProperty(exports, 'getEntries', {
+Object.defineProperty(exports, "getEntries", {
+  enumerable: true,
+  get: function () {
+    return _getEntries.default;
+  }
+});
+Object.defineProperty(exports, "getPublicPathConfig", {
   enumerable: true,
-  get: function get() {
-    return _interopRequireDefault(_getEntries).default;
+  get: function () {
+    return _getPublicPathConfig.default;
   }
 });
+Object.defineProperty(exports, "templateParameters", {
+  enumerable: true,
+  get: function () {
+    return _templateParameters.default;
+  }
+});
+
+var _splitChunks = _interopRequireDefault(require("./splitChunks"));
+
+var _getEntries = _interopRequireDefault(require("./getEntries"));
+
+var _getPublicPathConfig = _interopRequireDefault(require("./getPublicPathConfig"));
+
+var _templateParameters = _interopRequireDefault(require("./templateParameters"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/common/splitChunks.js

@@ -1,41 +1,79 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = void 0;
 
-var _path = require('path');
+var _path = _interopRequireDefault(require("path"));
 
-var _path2 = _interopRequireDefault(_path);
+var _utils = require("../utils");
+
+var _os = _interopRequireDefault(require("os"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var isVendor = function isVendor(module) {
-  var userRequest = module.userRequest;
+let isWindows = _os.default.platform().toLowerCase() === 'win32';
+let ps = _path.default.sep;
+let options = (0, _utils.getOptions)();
+let {
+  app: {
+    vendorExclude,
+    customChunks,
+    vendorInclude
+  }
+} = options;
 
-  return userRequest && userRequest.indexOf('node_modules') >= 0 && userRequest.indexOf('node_modules/script-loader') === -1 && userRequest.indexOf('node_modules/raw-loader') === -1 && userRequest.indexOf('node_modules' + _path2.default.sep + 'react') === -1 && userRequest.indexOf('.css') === -1 && userRequest.indexOf('publicPathConfig.js') === -1;
+let isVendor = function isVendor(module) {
+  let {
+    userRequest
+  } = module;
+  let excludeList = ['script-loader', 'raw-loader', 'react', 'react-dom'];
+  excludeList = [...excludeList, ...vendorExclude];
+  return userRequest && (vendorInclude.some(item => userRequest.indexOf(item) !== -1) || userRequest.indexOf('node_modules') >= 0 && userRequest.endsWith('.css') === false && userRequest.endsWith('publicPathConfig.js') === false && excludeList.every(item => userRequest.indexOf(`node_modules${ps}${item}${ps}`) === -1));
 };
 
-var isReact = function isReact(module) {
-  var userRequest = module.userRequest;
-
-  return userRequest && userRequest.indexOf('node_modules' + _path2.default.sep + 'react') >= 0;
+let isReact = module => {
+  let {
+    userRequest
+  } = module;
+  let reactBundle = ['react', 'react-dom'];
+  return userRequest && reactBundle.some(pkg => userRequest.indexOf(`node_modules${ps}${pkg}${ps}`) >= 0);
 };
 
-exports.default = {
-  cacheGroups: {
-    default: false,
-    'react.vendor': {
-      name: 'react.vendor',
-      chunks: 'all',
-      minChunks: 1,
-      test: isReact
-    },
-    vendor: {
-      name: 'vendor',
-      chunks: 'all',
-      minChunks: 1,
-      test: isVendor
-    }
+let defaultChunks = {
+  'react.vendor': {
+    name: 'react.vendor',
+    chunks: 'all',
+    minChunks: 1,
+    test: isReact,
+    priority: -10
+  },
+  vendor: {
+    name: 'vendor',
+    chunks: 'all',
+    minChunks: 1,
+    test: isVendor,
+    priority: -10
   }
-};
+};
+let customChunksConfig = {};
+customChunks.map(({
+  name,
+  pattern,
+  size = 2
+}, index) => customChunksConfig[name] = {
+  name,
+  test: new RegExp(isWindows ? pattern.replace(/\//g, '\\') : pattern),
+  chunks: 'all',
+  enforce: true,
+  minChunks: size,
+  priority: -10 * (index + 2)
+});
+var _default = {
+  cacheGroups: Object.assign({
+    default: false,
+    vendors: false
+  }, defaultChunks, customChunksConfig)
+};
+exports.default = _default;

package/lib/common/sslcertUpdater.js

@@ -0,0 +1,59 @@
+"use strict";
+
+var _https = _interopRequireDefault(require("https"));
+
+var _http = _interopRequireDefault(require("http"));
+
+var _path = _interopRequireDefault(require("path"));
+
+var _fs = _interopRequireDefault(require("fs"));
+
+var _getOptions = _interopRequireDefault(require("../utils/getOptions"));
+
+var _urlConcat = require("../utils/urlConcat");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const {
+  sslCertURL
+} = (0, _getOptions.default)();
+
+const CRET_FOLDER_PATH = _path.default.join(__dirname, '..', '..', 'cert');
+
+console.log({
+  CRET_FOLDER_PATH,
+  sslCertURL
+});
+const CERT_PATH = 'cert.pem';
+const KEY_PATH = 'key.pem';
+const PASSPHRASE_PATH = 'passphrase.pem';
+
+function updateSSlFile(sslCertURL, filename) {
+  let url = (0, _urlConcat.urlConcat)(sslCertURL, filename);
+  console.log({
+    url
+  });
+  (url.startsWith('https://') ? _https.default : _http.default).get(url, resp => {
+    let fpath = _path.default.join(CRET_FOLDER_PATH, filename);
+
+    let data = ''; // A chunk of data has been received.
+
+    resp.on('data', chunk => {
+      data += chunk;
+    }); // The whole response has been received. Print out the result.
+
+    resp.on('end', () => {
+      _fs.default.writeFileSync(fpath, data);
+    }); // return;
+  }).on('error', err => {
+    console.log(`Error: ${err.message}`);
+  });
+}
+
+if (!sslCertURL) {
+  throw 'sslCertURL not given';
+}
+
+updateSSlFile(sslCertURL, PASSPHRASE_PATH);
+updateSSlFile(sslCertURL, CERT_PATH);
+updateSSlFile(sslCertURL, KEY_PATH);

package/lib/common/templateParameters.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _default = (compilation, assets, assetTags, options) => {
+  Object.keys(assetTags).forEach(rootTag => {
+    assetTags[rootTag].forEach(tag => {
+      tag.attributes.nonce = '{{--CSP-nonce}}';
+    });
+  });
+  return {
+    compilation,
+    webpackConfig: compilation.options,
+    htmlWebpackPlugin: {
+      tags: assetTags,
+      files: assets,
+      options
+    }
+  };
+};
+
+exports.default = _default;

package/lib/configs/jest.config.js

@@ -1,25 +1,25 @@
-'use strict';
+"use strict";
 
-var _path = require('path');
-
-var _path2 = _interopRequireDefault(_path);
+var _path = _interopRequireDefault(require("path"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var appPath = process.cwd();
-
-var commonConfig = {
+let appPath = process.cwd();
+let commonConfig = {
   coverageReporters: ['json', 'html', 'json-summary', 'text'],
   collectCoverage: true,
-  moduleDirectories: [_path2.default.resolve(__dirname, '..', '..', 'node_modules'), 'node_modules'],
+  moduleDirectories: [_path.default.resolve(__dirname, '..', '..', 'node_modules'), 'node_modules'],
   transform: {
-    '^.+\\.(js|jsx)$': _path2.default.resolve(__dirname, '..', 'jest', 'preProcessors', 'jsPreprocessor.js'),
-    '^.+\\.css$': _path2.default.resolve(__dirname, '..', 'jest', 'preProcessors', 'cssPreprocessor.js'),
-    '^(?!.*\\.(js|jsx|css|json)$)': _path2.default.resolve(__dirname, '..', 'jest', 'preProcessors', 'otherFilesPreprocessor.js')
+    '^.+\\.(js|jsx)$': _path.default.resolve(__dirname, '..', 'jest', 'preProcessors', 'jsPreprocessor.js'),
+    '^.+\\.css$': _path.default.resolve(__dirname, '..', 'jest', 'preProcessors', 'cssPreprocessor.js'),
+    '^(?!.*\\.(js|jsx|css|json)$)': _path.default.resolve(__dirname, '..', 'jest', 'preProcessors', 'otherFilesPreprocessor.js')
+  },
+  moduleNameMapper: {
+    '\\.(css|less)$': 'identity-obj-proxy'
   },
   transformIgnorePatterns: ['/node_modules.*?.js$'],
   moduleFileExtensions: ['js'],
-  setupFiles: [_path2.default.resolve(appPath, '__testUtils__', 'globals.js'), _path2.default.resolve(__dirname, '..', 'jest', 'setup.js')],
+  setupFiles: [_path.default.resolve(appPath, '__testUtils__', 'globals.js'), _path.default.resolve(__dirname, '..', 'jest', 'setup.js')],
   globals: {
     __DEVELOPMENT__: true,
     __DOCS__: false,
@@ -27,20 +27,13 @@ var commonConfig = {
   }
 };
 
-module.exports = function () {
-  for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-    args[_key] = arguments[_key];
-  }
-
-  var appFolder = args[0],
-      _args$ = args[1],
-      forCommittedFiles = _args$ === undefined ? false : _args$;
-
+module.exports = (...args) => {
+  let [appFolder, forCommittedFiles = false] = args;
 
   if (forCommittedFiles) {
     return Object.assign({}, commonConfig, {
-      coverageDirectory: _path2.default.resolve(appPath, 'commitCoverage'),
-      testResultsProcessor: _path2.default.resolve(__dirname, '..', 'jest', 'commitedFilesResult.js')
+      coverageDirectory: _path.default.resolve(appPath, 'commitCoverage'),
+      testResultsProcessor: _path.default.resolve(__dirname, '..', 'jest', 'commitedFilesResult.js')
     });
   }
 
@@ -48,11 +41,8 @@ module.exports = function () {
     rootDir: appPath,
     testPathIgnorePatterns: ['/node_modules/', 'docs'],
     unmockedModulePathPatterns: ['__tests__', 'node_modules', '.*'],
-    roots: ['<rootDir>/' + appFolder + '/'],
+    roots: [`<rootDir>/${appFolder}/`],
     testRegex: '(/__tests__/.*|\\.(test|spec))\\.(jsx|js|json|node)$',
-    moduleNameMapper: {
-      '\\.(css|less)$': 'identity-obj-proxy'
-    },
-    testResultsProcessor: _path2.default.resolve(__dirname, '..', 'jest', 'result.js')
+    testResultsProcessor: _path.default.resolve(__dirname, '..', 'jest', 'result.js')
   });
 };

package/lib/configs/webpack.component.umd.config.js

@@ -1,41 +1,38 @@
-'use strict';
+"use strict";
 
-var _path = require('path');
+var _path = _interopRequireDefault(require("path"));
 
-var _path2 = _interopRequireDefault(_path);
+var _miniCssExtractPlugin = _interopRequireDefault(require("mini-css-extract-plugin"));
 
-var _miniCssExtractPlugin = require('mini-css-extract-plugin');
+var _utils = require("../utils");
 
-var _miniCssExtractPlugin2 = _interopRequireDefault(_miniCssExtractPlugin);
-
-var _utils = require('../utils');
-
-var _pluginUtils = require('../pluginUtils');
+var _pluginUtils = require("../pluginUtils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var options = (0, _utils.getOptions)();
-
-var _options$umd$componen = options.umd.component,
-    umdVar = _options$umd$componen.umdVar,
-    isHtml = _options$umd$componen.isHtml,
-    isDocs = _options$umd$componen.isDocs,
-    watch = _options$umd$componen.watch,
-    outputFolder = _options$umd$componen.outputFolder,
-    cssUniqueness = _options$umd$componen.cssUniqueness,
-    folder = _options$umd$componen.folder;
-
-
-var appPath = process.cwd();
-var className = cssUniqueness ? 'fz__[hash:base64:5]' : '[name]__[local]';
-
+let options = (0, _utils.getOptions)();
+let {
+  umd: {
+    component: {
+      umdVar,
+      isHtml,
+      isDocs,
+      watch,
+      outputFolder,
+      cssUniqueness,
+      folder
+    }
+  }
+} = options;
+let appPath = process.cwd();
+let className = cssUniqueness ? 'fz__[hash:base64:5]' : '[name]__[local]';
 module.exports = {
   watch: watch,
   entry: {
-    main: _path2.default.join(appPath, folder, isHtml ? 'html.js' : 'index.js')
+    main: _path.default.join(appPath, folder, isHtml ? 'html.js' : 'index.js')
   },
   output: {
-    path: _path2.default.join(appPath, outputFolder),
+    path: _path.default.join(appPath, outputFolder),
     filename: 'js/[name].js',
     library: umdVar,
     libraryTarget: 'umd'
@@ -51,21 +48,18 @@ module.exports = {
       use: [{
         loader: 'babel-loader',
         options: {
-          presets: [[require.resolve('babel-preset-env'), { modules: false }], require.resolve('babel-preset-react')],
-          plugins: [[require.resolve('babel-plugin-transform-runtime'), {
-            helpers: true,
-            polyfill: true,
-            regenerator: false,
-            moduleName: 'babel-runtime'
-          }]],
+          presets: [[require.resolve('@babel/preset-env'), {
+            modules: false
+          }], require.resolve('@babel/preset-react')],
+          plugins: [require.resolve('@babel/plugin-proposal-object-rest-spread')],
           cacheDirectory: true
         }
       }],
-      include: _path2.default.join(appPath, 'src')
+      include: _path.default.join(appPath, 'src')
     }, {
       test: /(\.module)?\.css$/,
       use: [{
-        loader: _miniCssExtractPlugin2.default.loader,
+        loader: _miniCssExtractPlugin.default.loader,
         options: {
           publicPath: '../'
         }
@@ -101,9 +95,9 @@ module.exports = {
     }]
   },
   resolve: {
-    modules: [_path2.default.resolve(__dirname, '..', '..', 'node_modules'), 'node_modules']
+    modules: [_path.default.resolve(__dirname, '..', '..', 'node_modules'), 'node_modules']
   },
   resolveLoader: {
-    modules: [_path2.default.resolve(__dirname, '..', '..', 'node_modules'), 'node_modules']
+    modules: [_path.default.resolve(__dirname, '..', '..', 'node_modules'), 'node_modules']
   }
 };