@elliemae/pui-cli 6.0.0-beta.35 → 6.0.0-beta.39

package/lib/cli-commands/utils.js

@@ -24,10 +24,15 @@ exports.logSuccess = (...args) => console.log(chalk.green(...args));
 exports.logError = console.error;
 
 const readPackageLock = async () => {
-  const appPkgLockFile = path.join(process.cwd(), 'package-lock.json');
-  const pkgLockJSON = await readFile(appPkgLockFile, 'utf8');
-  const { dependencies } = JSON.parse(pkgLockJSON);
-  return (moduleName) => dependencies[moduleName]?.version || '';
+  try {
+    const appPkgLockFile = path.join(process.cwd(), 'package-lock.json');
+    const pkgLockJSON = await readFile(appPkgLockFile, 'utf8');
+    const { dependencies } = JSON.parse(pkgLockJSON);
+    return (moduleName) => dependencies[moduleName]?.version || '';
+  } catch (err) {
+    console.warn('Package lock file not found');
+    return () => '';
+  }
 };
 
 const getSupportedBrowsers = async () => {

package/lib/cli-commands/vitest.js

@@ -0,0 +1,61 @@
+const { exit } = require('yargs');
+const { exec, logError, logSuccess } = require('./utils');
+
+const { CI = false } = process.env;
+
+async function test(commandOptions) {
+  await exec(`cross-env FORCE_COLOR=true vitest ${commandOptions}`);
+}
+
+// eslint-disable-next-line max-statements
+async function handler(argv) {
+  let commandOptions = '--coverage';
+  if (argv.fix) commandOptions = '-u';
+  else if (argv.watch) commandOptions = '--watch';
+  if (argv.p) commandOptions += ' --passWithNoTests';
+  if (argv.r) commandOptions += ' --related';
+  if (argv.s) commandOptions += ' --silent';
+  try {
+    if (CI) {
+      await exec('rimraf ./reports');
+    }
+
+    // eslint-disable-next-line jest/valid-title, jest/no-disabled-tests, jest/expect-expect
+    await test(commandOptions);
+    logSuccess('Unit test execution completed');
+  } catch (err) {
+    logError('Unit test execution failed', err);
+    exit(-1, err);
+    return -1;
+  }
+  return 0;
+}
+
+exports.command = 'vitest [options]';
+
+exports.describe = 'unit tests application code using vitest';
+
+exports.builder = {
+  fix: {
+    alias: 'f',
+    type: 'boolean',
+  },
+  watch: {
+    alias: 'w',
+    type: 'boolean',
+  },
+  passWithNoTests: {
+    alias: 'p',
+    type: 'boolean',
+  },
+  related: {
+    alias: 'r',
+    type: 'boolean',
+  },
+  silent: {
+    alias: 's',
+    type: 'boolean',
+  },
+};
+
+exports.handler = handler;

package/lib/lint/eslint/common.js

@@ -4,6 +4,7 @@ const webpackConfig = require('../../webpack/webpack.prod.babel');
 
 exports.baseExtends = [
   'plugin:eslint-comments/recommended',
+  'plugin:import/recommended',
   'plugin:prettier/recommended',
   'plugin:jest/recommended',
   'plugin:jsdoc/recommended',
@@ -12,7 +13,8 @@ exports.baseExtends = [
   'plugin:storybook/recommended',
 ];
 
-const basePlugins = ['testing-library', 'jest', 'jsdoc', 'wdio'];
+const basePlugins = ['testing-library', 'jest', 'jsdoc', 'wdio', 'import'];
+exports.basePlugins = basePlugins;
 
 exports.baseOverrides = [
   {

package/lib/lint/eslint/typescript/common.js

@@ -1,7 +1,8 @@
-const { baseExtends } = require('../common');
+const { baseExtends, basePlugins } = require('../common');
 
 exports.tsBaseExtends = [
   'plugin:@typescript-eslint/recommended',
+  'plugin:import/typescript',
   'plugin:@typescript-eslint/recommended-requiring-type-checking',
 ].concat(baseExtends);
 
@@ -24,6 +25,7 @@ exports.tsBaseRules = {
 exports.tsBaseConfig = {
   files: ['*.ts', '*.tsx'],
   parser: '@typescript-eslint/parser',
+  plugins: ['@typescript-eslint'].concat(basePlugins),
   parserOptions: {
     tsconfigRootDir: process.cwd(),
     project: 'tsconfig.json',
@@ -34,5 +36,8 @@ exports.tsBaseConfig = {
         alwaysTryTypes: true,
       },
     },
+    'import/parsers': {
+      '@typescript-eslint/parser': ['.ts', '.tsx'],
+    },
   },
 };

package/lib/lint/eslint/typescript/non-react.js

@@ -4,7 +4,7 @@ const { tsBaseExtends, tsBaseRules, tsBaseConfig } = require('./common');
 
 exports.tsConfig = {
   ...tsBaseConfig,
-  extends: ['airbnb-typescript/base'].concat(tsBaseExtends),
+  extends: ['airbnb-base', 'airbnb-typescript/base'].concat(tsBaseExtends),
   rules: {
     ...baseRules,
     ...tsBaseRules,

package/lib/lint/eslint/typescript/react.js

@@ -4,7 +4,12 @@ const { tsBaseExtends, tsBaseRules, tsBaseConfig } = require('./common');
 
 exports.tsReactConfig = {
   ...tsBaseConfig,
-  extends: ['airbnb-typescript'].concat(tsBaseExtends),
+  extends: [
+    'airbnb',
+    'airbnb/hooks',
+    'plugin:redux-saga/recommended',
+    'airbnb-typescript',
+  ].concat(tsBaseExtends),
   rules: {
     ...baseRules,
     ...tsBaseRules,

package/lib/testing/mocks/matchMedia.js

@@ -3,11 +3,17 @@
  */
 export default () => {
   Object.defineProperty(window, 'matchMedia', {
-    value: () => ({
+    writable: true,
+    value: jest.fn().mockImplementation((query) => ({
       matches: false,
-      addListener: () => {},
-      removeListener: () => {},
-    }),
+      media: query,
+      onchange: null,
+      addListener: jest.fn(), // Deprecated
+      removeListener: jest.fn(), // Deprecated
+      addEventListener: jest.fn(),
+      removeEventListener: jest.fn(),
+      dispatchEvent: jest.fn(),
+    })),
   });
 
   Object.defineProperty(window, 'getComputedStyle', {

package/lib/testing/vitest.config.ts

@@ -0,0 +1,8 @@
+/// <reference types="vitest" />
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  test: {
+    environment: 'jsdom',
+  },
+});

package/lib/webpack/webpack.dev.babel.js

@@ -72,6 +72,7 @@ const devConfig = {
 
   // Add development plugins
   plugins: [
+    new webpack.ProgressPlugin(),
     new webpack.HotModuleReplacementPlugin(), // Tell webpack we want hot reloading
     new ReactRefreshWebpackPlugin({
       overlay: {
@@ -79,6 +80,7 @@ const devConfig = {
       },
     }),
     new HtmlWebpackPlugin({
+      scriptLoading: 'module',
       inject: !isAppLoaderEnabled(), // Inject all files that are generated by webpack, e.g. bundle.js
       template: !isAppLoaderEnabled()
         ? 'app/index.html'

package/lib/webpack/webpack.lib.dev.babel.js

@@ -28,6 +28,7 @@ module.exports = require('./webpack.lib.base.babel')({
   // Add development plugins
   plugins: [
     new HtmlWebpackPlugin({
+      scriptLoading: 'module',
       inject: true, // Inject all files that are generated by webpack, e.g. bundle.js
       template: 'lib/index.pug',
       filename: 'index.html',

package/lib/webpack/webpack.lib.prod.babel.js

@@ -39,6 +39,7 @@ module.exports = require('./webpack.lib.base.babel')({
   plugins: [
     // Minify and optimize the index.html
     new HtmlWebpackPlugin({
+      scriptLoading: 'module',
       template: 'lib/index.pug',
       filename: 'index.html',
       libraryName,

package/lib/webpack/webpack.prod.babel.js

@@ -102,6 +102,7 @@ const {
   encwLoaderScriptPath,
 } = getPaths();
 const htmlWebpackPlugin = new HtmlWebpackPlugin({
+  scriptLoading: 'module',
   filename: '../index.html',
   inject: !isAppLoaderEnabled(),
   template: !isAppLoaderEnabled()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/pui-cli",
-  "version": "6.0.0-beta.35",
+  "version": "6.0.0-beta.39",
   "private": false,
   "description": "ICE MT UI Platform CLI",
   "sideEffects": false,
@@ -89,7 +89,7 @@
     "@testing-library/react": "~12.1.2",
     "@testing-library/react-hooks": "~7.0.2",
     "@types/jest": "~27.4.0",
-    "@types/node": "~17.0.7",
+    "@types/node": "~17.0.8",
     "@types/rimraf": "~3.0.2",
     "@types/testing-library__jest-dom": "~5.14.2",
     "@typescript-eslint/eslint-plugin": "~5.9.0",
@@ -156,10 +156,10 @@
     "eslint-plugin-storybook": "~0.5.5",
     "eslint-plugin-testing-library": "~5.0.1",
     "eslint-plugin-wdio": "~7.4.2",
-    "express-static-gzip": "~2.1.1",
     "execa": "~5.1.1",
     "express": "~4.17.2",
     "express-pino-logger": "~7.0.0",
+    "express-static-gzip": "~2.1.1",
     "favicons": "~6.2.2",
     "favicons-webpack-plugin": "~5.0.2",
     "file-loader": "~6.2.0",
@@ -173,7 +173,7 @@
     "imports-loader": "~3.1.1",
     "ip": "~1.1.5",
     "jest-axe": "~5.0.1",
-    "jest-cli": "~27.4.5",
+    "jest-cli": "~27.4.7",
     "jest-sonar-reporter": "~2.0.0",
     "jest-styled-components": "~7.0.8",
     "jscodeshift": "~0.13.0",
@@ -194,12 +194,12 @@
     "pinst": "~2.1.6",
     "plop": "~3.0.5",
     "postcss": "~8.4.5",
-    "postcss-jsx": "~0.36.4",
     "postcss-html": "~1.3.0",
-    "postcss-markdown": "~1.2.0",
-    "postcss-syntax": "~0.36.2",
+    "postcss-jsx": "~0.36.4",
     "postcss-loader": "~6.2.1",
+    "postcss-markdown": "~1.2.0",
     "postcss-preset-env": "~7.2.0",
+    "postcss-syntax": "~0.36.2",
     "prettier": "~2.5.1",
     "pug": "~3.0.2",
     "pug-loader": "~2.4.0",
@@ -216,8 +216,8 @@
     "semantic-release": "~18.0.1",
     "shelljs": "~0.8.4",
     "slackify-markdown": "~4.3.1",
-    "storybook-builder-vite": "~0.1.13",
     "storybook-addon-turbo-build": "~1.0.1",
+    "storybook-builder-vite": "~0.1.13",
     "storybook-react-router": "~1.0.8",
     "style-loader": "~3.3.1",
     "stylelint": "~14.2.0",
@@ -240,6 +240,7 @@
     "url-loader": "~4.1.1",
     "uuid": "~8.3.2",
     "vite": "~2.7.10",
+    "vitest": "~0.0.133",
     "webpack": "~5.65.0",
     "webpack-bundle-analyzer": "~4.5.0",
     "webpack-cli": "~4.9.1",