Merge pull request #980 from openlattice/develop

2021-03-04 release

Author: UnsungHero97

.eslintrc

@@ -79,7 +79,14 @@
     ],
     "padded-blocks": "off",
     "prefer-destructuring": "warn",
-    "space-before-function-paren": ["error", "never"],
+    "space-before-function-paren": [
+      "error",
+      {
+        "anonymous": "never",
+        "named": "never",
+        "asyncArrow": "always"
+      }
+    ],
 
     "flowtype/define-flow-type": "error",
     "flowtype/space-after-type-colon": ["error", "never"],

.flowconfig

@@ -16,9 +16,11 @@
 <PROJECT_ROOT>/build/.*
 <PROJECT_ROOT>/config/.*
 !<PROJECT_ROOT>/node_modules/lattice
+!<PROJECT_ROOT>/node_modules/lattice-auth
 !<PROJECT_ROOT>/node_modules/lattice-sagas
+!<PROJECT_ROOT>/node_modules/lattice-utils
 !<PROJECT_ROOT>/node_modules/redux-reqseq
 .*/node_modules/immutable/.*
 
-[libs]
-./src/types.js.flow
+[options]
+esproposal.optional_chaining=enable

.github/dependabot.yml

@@ -0,0 +1,15 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: weekly
+    day: sunday
+    time: "01:00"
+    timezone: America/Los_Angeles
+  open-pull-requests-limit: 50
+  versioning-strategy: increase-if-necessary
+  ignore:
+  - dependency-name: immutable
+    versions:
+    - ">= 0"

.github/workflows/build.yml

@@ -0,0 +1,62 @@
+name: build
+
+on:
+  push:
+    branches:
+      - develop
+      - master
+  pull_request:
+    branches:
+      - develop
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [10.x, 12.x, 14.x]
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: node ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: cache node modules
+        uses: actions/cache@v2
+        with:
+          # https://github.com/actions/cache/blob/main/examples.md#macos-and-ubuntu
+          # https://github.com/actions/cache/issues/67
+          path: ~/.npm
+          key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.OS }}-node-
+
+      - name: npm config
+        env:
+          FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}
+        run: |
+          npm config set "@fortawesome:registry" https://npm.fontawesome.com/
+          npm config set "//npm.fontawesome.com/:_authToken" "$FONTAWESOME_NPM_AUTH_TOKEN"
+
+      # https://docs.npmjs.com/cli/v6/commands/npm-ci
+      - name: npm ci
+        run: npm ci
+
+      - name: npm run lint
+        run: npm run lint
+
+      - name: npm run flow
+        run: npm run flow
+
+      - name: npm run test
+        run: npm run test
+
+      - name: npm run build:prod
+        run: npm run build:prod
+
+      - name: codecov
+        uses: codecov/codecov-action@v1

.gitignore

@@ -2,7 +2,6 @@ coverage/
 
 # npm
 npm-debug.log
-package-lock.json
 node_modules/
 
 # macOS

.importsortrc

@@ -0,0 +1,6 @@
+{
+  ".js": {
+    "parser": "babylon",
+    "style": "openlattice"
+  }
+}

.travis.yml

@@ -1,3 +1 @@
 # lattice-edm
-
-[![Greenkeeper badge](https://badges.greenkeeper.io/openlattice/lattice-edm.svg)](https://greenkeeper.io/)

README.md

@@ -14,56 +14,36 @@ const {
 
 module.exports = (env) => {
 
-  /*
-   * constants
-   */
+  //
+  // constants
+  //
 
   const BABEL_CONFIG = path.resolve(__dirname, '../babel/babel.config.js');
   const BASE_PATH = `/${env.basePath || 'edm'}/`;
   const ENV_DEV = 'development';
   const ENV_PROD = 'production';
 
-  // NOTE: for future reference
-  // const getNodeModulesRegEx = toInclude => (
-  //   new RegExp(`/(node_modules|openlattice)/(${toInclude.join('|')})`)
-  // );
-
-  /*
-   * loaders
-   */
+  //
+  // loaders
+  //
 
   const BABEL_LOADER = {
     test: /\.js$/,
     exclude: /node_modules/,
     include: [
       APP_PATHS.ABS.SOURCE,
-      // NOTE: for future reference
-      // getNodeModulesRegEx(['redux-reqseq']),
     ],
     use: {
       loader: 'babel-loader',
       options: {
-        cacheDirectory: true,
         configFile: BABEL_CONFIG,
       },
     },
   };
 
-  const FILE_LOADER_ASSETS_IMAGES = {
-    test: /\.(gif|ico|jpg|jpeg|png|svg|webp)(\?.*)?$/,
-    exclude: /node_modules/,
-    use: [{
-      loader: 'file-loader',
-      options: {
-        name: '[name].[hash:8].[ext]',
-        outputPath: `${APP_PATHS.REL.STATIC_ASSETS_IMAGES}/`,
-      }
-    }]
-  };
-
-  /*
-   * plugins
-   */
+  //
+  // plugins
+  //
 
   const BANNER_PLUGIN = new Webpack.BannerPlugin({
     banner: APP_CONFIG.BANNER,
@@ -80,14 +60,9 @@ module.exports = (env) => {
     __VERSION__: JSON.stringify(`v${PACKAGE.version}`),
   });
 
-  // https://github.com/moment/moment/issues/2373
-  // https://stackoverflow.com/a/25426019/196921
-  // https://github.com/facebookincubator/create-react-app/pull/2187
-  const IGNORE_MOMENT_LOCALES = new Webpack.IgnorePlugin(/^\.\/locale$/, /moment$/);
-
-  /*
-   * base webpack config
-   */
+  //
+  // base webpack config
+  //
 
   return {
     bail: true,
@@ -99,12 +74,19 @@ module.exports = (env) => {
     module: {
       rules: [
         BABEL_LOADER,
-        FILE_LOADER_ASSETS_IMAGES,
+        {
+          generator: {
+            filename: (
+              env.production
+                ? `${APP_PATHS.REL.STATIC_ASSETS}/[name].[contenthash].[ext]`
+                : `${APP_PATHS.REL.STATIC_ASSETS}/[name].[ext]`
+            )
+          },
+          test: /\.(gif|ico|jpg|jpeg|png|svg|webp)(\?.*)?$/,
+          type: 'asset/resource',
+        },
       ],
     },
-    node: {
-      net: 'empty',
-    },
     optimization: {
       minimize: !!env.production,
     },
@@ -118,7 +100,6 @@ module.exports = (env) => {
     plugins: [
       DEFINE_PLUGIN,
       BANNER_PLUGIN,
-      IGNORE_MOMENT_LOCALES,
     ],
     resolve: {
       extensions: ['.js', '.css'],

config/webpack/webpack.config.base.js

@@ -1,33 +1,17 @@
 /* eslint-disable import/extensions */
 
 const HtmlWebpackPlugin = require('html-webpack-plugin');
-const Webpack = require('webpack');
 
 const APP_PATHS = require('../app/paths.config.js');
 const baseWebpackConfig = require('./webpack.config.base.js');
 
 module.exports = (env) => {
 
-  const DEV_SERVER_PORT = 9100;
+  const DEV_SERVER_PORT = 9000;
   const baseConfig = baseWebpackConfig(env);
 
-  const output = Object.assign({}, baseConfig.output, {
-    filename: `${APP_PATHS.REL.STATIC_JS}/index.js`,
-  });
-
-  const plugins = [
-    new HtmlWebpackPlugin({
-      favicon: `${APP_PATHS.ABS.SOURCE_ASSETS_IMAGES}/ol-favicon.png`,
-      inject: true,
-      template: `${APP_PATHS.ABS.SOURCE}/index.html`,
-    }),
-    new Webpack.HotModuleReplacementPlugin(),
-    ...baseConfig.plugins
-  ];
-
-  return Object.assign({}, baseConfig, {
-    output,
-    plugins,
+  return {
+    ...baseConfig,
     devServer: {
       contentBase: APP_PATHS.ABS.BUILD,
       historyApiFallback: {
@@ -38,5 +22,16 @@ module.exports = (env) => {
       publicPath: baseConfig.output.publicPath,
     },
     devtool: false,
-  });
+    output: {
+      ...baseConfig.output,
+      filename: `${APP_PATHS.REL.STATIC_JS}/index.js`,
+    },
+    plugins: [
+      new HtmlWebpackPlugin({
+        favicon: `${APP_PATHS.ABS.SOURCE_ASSETS_IMAGES}/ol-favicon.png`,
+        template: `${APP_PATHS.ABS.SOURCE}/index.html`,
+      }),
+      ...baseConfig.plugins
+    ],
+  };
 };