@elliemae/pui-cli 6.0.0-beta.33 → 6.0.0-beta.37

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/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 = [
   {
@@ -105,6 +107,10 @@ const reactRules = {
     1,
     { extensions: ['.js', '.jsx', '.tsx', '.mdx'] },
   ],
+  'react/function-component-definition': [
+    2,
+    { namedComponents: 'arrow-function' },
+  ],
   'redux-saga/no-yield-in-race': 2,
   'redux-saga/yield-effects': 2,
 };

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/typescript/tsc-files/index.js

@@ -1,7 +1,8 @@
-const { spawnSync } = require('child_process');
+const execa = require('execa');
 const fs = require('fs');
+const path = require('path');
 
-const { randomChars, resolveFromModule, resolveFromRoot } = require('./utils');
+const { randomChars, resolveFromRoot } = require('./utils');
 
 const args = process.argv.slice(2);
 const argsProjectIndex = args.findIndex((arg) =>
@@ -46,16 +47,20 @@ const tmpTsconfig = {
 fs.writeFileSync(tmpTsconfigPath, JSON.stringify(tmpTsconfig, null, 2));
 
 // Type-check our files
-const { status } = spawnSync(
-  resolveFromModule(
-    'typescript',
-    `../.bin/tsc${process.platform === 'win32' ? '.cmd' : ''}`,
-  ),
-  ['-p', tmpTsconfigPath, ...remainingArgsToForward],
-  { stdio: 'inherit' },
-);
+let status = 0;
+try {
+  execa.sync(
+    path.resolve(
+      process.cwd(),
+      `./node_modules/.bin/tsc${process.platform === 'win32' ? '.cmd' : ''}`,
+    ),
+    ['-p', tmpTsconfigPath, ...remainingArgsToForward],
+    { stdio: 'inherit' },
+  );
+} catch (ex) {
+  status = ex.exitCode;
+}
 
 // Delete temp config file
 fs.unlinkSync(tmpTsconfigPath);
-
 process.exit(status);

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.33",
+  "version": "6.0.0-beta.37",
   "private": false,
   "description": "ICE MT UI Platform CLI",
   "sideEffects": false,
@@ -83,17 +83,17 @@
     "@stylelint/postcss-css-in-js": "~0.37.2",
     "@svgr/webpack": "~6.1.2",
     "@swc/cli": "~0.1.55",
-    "@swc/core": "~1.2.125",
+    "@swc/core": "~1.2.126",
     "@swc/jest": "~0.2.15",
     "@testing-library/jest-dom": "~5.16.1",
     "@testing-library/react": "~12.1.2",
     "@testing-library/react-hooks": "~7.0.2",
     "@types/jest": "~27.4.0",
-    "@types/node": "~17.0.6",
+    "@types/node": "~17.0.7",
     "@types/rimraf": "~3.0.2",
     "@types/testing-library__jest-dom": "~5.14.2",
-    "@typescript-eslint/eslint-plugin": "~5.8.1",
-    "@typescript-eslint/parser": "~5.8.1",
+    "@typescript-eslint/eslint-plugin": "~5.9.0",
+    "@typescript-eslint/parser": "~5.9.0",
     "autoprefixer": "~10.4.1",
     "axe-core": "~4.3.5",
     "babel-loader": "~8.2.3",
@@ -146,7 +146,7 @@
     "eslint-plugin-eslint-comments": "~3.2.0",
     "eslint-plugin-import": "~2.25.4",
     "eslint-plugin-jest": "~25.3.4",
-    "eslint-plugin-jsdoc": "~37.5.0",
+    "eslint-plugin-jsdoc": "~37.5.1",
     "eslint-plugin-jsx-a11y": "~6.5.1",
     "eslint-plugin-mdx": "~1.16.0",
     "eslint-plugin-prettier": "~4.0.0",