Merge pull request #1281 from openlattice/develop

Release 2021-06-16

Author: solomontang

.eslintrc

@@ -1,19 +1,19 @@
 {
-  "parser": "babel-eslint",
+  "env": {
+    "browser": true,
+    "jest": true
+  },
   "extends": [
     "airbnb",
     "plugin:flowtype/recommended"
   ],
+  "parser": "babel-eslint",
   "plugins": [
     "flowtype",
     "jest",
     "react",
     "react-hooks"
   ],
-  "env": {
-    "browser": true,
-    "jest": true
-  },
   "settings": {
     "flowtype": {
       "onlyFilesWithFlowAnnotation": true
@@ -70,6 +70,7 @@
           "OrderedList",
           "Map",
           "OrderedMap",
+          "Seq",
           "Set",
           "OrderedSet",
           "SortableContainer",

config/babel/babel.config.js

@@ -2,31 +2,38 @@ module.exports = {
   plugins: [
     '@babel/plugin-proposal-class-properties',
     '@babel/plugin-proposal-object-rest-spread',
-    '@babel/plugin-transform-runtime',
+    ['@babel/plugin-transform-runtime', {
+      corejs: 3,
+    }],
     [
       'babel-plugin-styled-components',
       { ssr: false, displayName: false, namespace: 'sc' },
     ],
     ['babel-plugin-transform-imports', {
+      '@fortawesome/free-solid-svg-icons': {
+        transform: (importName) => `@fortawesome/free-solid-svg-icons/${importName}`,
+        preventFullImport: true,
+        skipDefaultConversion: true,
+      },
       '@fortawesome/pro-duotone-svg-icons': {
-        transform: (importName) => `@fortawesome/pro-duotone-svg-icons/${importName}`,
         preventFullImport: true,
         skipDefaultConversion: true,
+        transform: (importName) => `@fortawesome/pro-duotone-svg-icons/${importName}`,
       },
       '@fortawesome/pro-light-svg-icons': {
-        transform: (importName) => `@fortawesome/pro-light-svg-icons/${importName}`,
         preventFullImport: true,
         skipDefaultConversion: true,
+        transform: (importName) => `@fortawesome/pro-light-svg-icons/${importName}`,
       },
       '@fortawesome/pro-regular-svg-icons': {
-        transform: (importName) => `@fortawesome/pro-regular-svg-icons/${importName}`,
         preventFullImport: true,
         skipDefaultConversion: true,
+        transform: (importName) => `@fortawesome/pro-regular-svg-icons/${importName}`,
       },
       '@fortawesome/pro-solid-svg-icons': {
-        transform: (importName) => `@fortawesome/pro-solid-svg-icons/${importName}`,
         preventFullImport: true,
         skipDefaultConversion: true,
+        transform: (importName) => `@fortawesome/pro-solid-svg-icons/${importName}`,
       },
     }],
   ],

config/jest/babelJestTransformer.js

@@ -1,5 +1,6 @@
+/* eslint-disable import/no-extraneous-dependencies */
 const path = require('path');
 
-module.exports = require('babel-jest').createTransformer({
+module.exports = require('babel-jest').default.createTransformer({
   configFile: path.resolve(__dirname, '../babel/babel.config.js')
 });

config/jest/test.config.js

@@ -1,2 +1 @@
-import '@babel/polyfill';
 import 'jest-styled-components';

config/lib/lib.config.js

@@ -1,4 +1,7 @@
 module.exports = {
+  core: {
+    builder: 'webpack5',
+  },
   stories: ['../../src/**/*.stories.js'],
   addons: [
     '@storybook/addon-actions',

config/lib/paths.config.js

@@ -1,12 +1,17 @@
-/* eslint-disable import/extensions */
+/* eslint-disable import/no-extraneous-dependencies */
 
 const path = require('path');
 const Webpack = require('webpack');
 
-const LIB_CONFIG = require('../lib/lib.config.js');
-const LIB_PATHS = require('../lib/paths.config.js');
 const PACKAGE = require('../../package.json');
 
+const BANNER = `
+${PACKAGE.name} - v${PACKAGE.version}
+${PACKAGE.description}
+${PACKAGE.homepage}
+Copyright (c) 2017-${(new Date()).getFullYear()}, OpenLattice, Inc. All rights reserved.
+`;
+
 module.exports = (env = {}) => {
 
   /*
@@ -16,8 +21,11 @@ module.exports = (env = {}) => {
   const BABEL_CONFIG = path.resolve(__dirname, '../babel/babel.config.js');
   const ENV_DEV = 'development';
   const ENV_PROD = 'production';
-  const LIB_FILE_NAME = 'index.js';
-  const LIB_NAMESPACE = 'LUK';
+
+  const ROOT = path.resolve(__dirname, '../..');
+  const BUILD = path.resolve(ROOT, 'build');
+  const NODE = path.resolve(ROOT, 'node_modules');
+  const SOURCE = path.resolve(ROOT, 'src');
 
   /*
    * loaders
@@ -26,9 +34,7 @@ module.exports = (env = {}) => {
   const BABEL_LOADER = {
     test: /\.js$/,
     exclude: /node_modules/,
-    include: [
-      LIB_PATHS.ABS.SOURCE,
-    ],
+    include: [SOURCE],
     use: {
       loader: 'babel-loader',
       options: {
@@ -42,7 +48,7 @@ module.exports = (env = {}) => {
    */
 
   const BANNER_PLUGIN = new Webpack.BannerPlugin({
-    banner: LIB_CONFIG.BANNER,
+    banner: BANNER,
     entryOnly: true,
   });
 
@@ -60,43 +66,29 @@ module.exports = (env = {}) => {
   return {
     bail: true,
     entry: [
-      LIB_PATHS.ABS.ENTRY,
+      path.resolve(ROOT, 'src/index.js'),
     ],
-    externals: {
-      react: {
-        root: 'React',
-        commonjs2: 'react',
-        commonjs: 'react',
-        amd: 'react'
-      },
-      'react-dom': {
-        root: 'ReactDOM',
-        commonjs2: 'react-dom',
-        commonjs: 'react-dom',
-        amd: 'react-dom'
-      },
-      'styled-components': {
-        amd: 'styled-components',
-        commonjs: 'styled-components',
-        commonjs2: 'styled-components',
-      },
-    },
     mode: env.production ? ENV_PROD : ENV_DEV,
     module: {
       rules: [
         BABEL_LOADER,
+        {
+          test: /\.(jpg|png|svg)$/,
+          type: 'asset/inline',
+        },
       ],
     },
     optimization: {
-      // minimize: !!env.production,
-      minimize: false,
+      minimize: !!env.production,
     },
     output: {
-      library: LIB_NAMESPACE,
-      libraryTarget: 'umd',
-      path: LIB_PATHS.ABS.BUILD,
+      filename: 'index.js',
+      library: {
+        name: 'LUK',
+        type: 'umd',
+      },
+      path: BUILD,
       publicPath: '/',
-      filename: LIB_FILE_NAME,
     },
     performance: {
       hints: false, // disable performance hints for now
@@ -108,8 +100,8 @@ module.exports = (env = {}) => {
     resolve: {
       extensions: ['.js'],
       modules: [
-        LIB_PATHS.ABS.SOURCE,
-        'node_modules',
+        SOURCE,
+        NODE,
       ],
     },
     target: 'web',