@nlabs/lex 1.39.0 → 1.41.0

package/package.json

@@ -1,12 +1,10 @@
 {
   "name": "@nlabs/lex",
-  "version": "1.39.0",
+  "version": "1.41.0",
   "description": "Lex",
   "license": "MIT",
   "type": "module",
-  "bin": {
-    "lex": "./dist/lex.js"
-  },
+  "bin": "./dist/lex.js",
   "keywords": [
     "arkhamjs",
     "lex",
@@ -27,128 +25,135 @@
     "url": "https://github.com/nitrogenlabs/lex/issues"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=20"
   },
-  "browserslist": [
-    "last 5 version",
-    "ie 11"
-  ],
   "scripts": {
-    "build": "NODE_ENV=production && rm -rf dist && esbuild src/**/**.ts* src/**.ts* --platform=node --outdir=./dist --sourcemap=inline --target=esnext --format=esm",
+    "build": "NODE_ENV=production && rm -rf dist && esbuild ./src/**/**.ts* ./src/**.ts* --platform=node --outdir=./dist --sourcemap=inline --target=esnext --format=esm --packages=external",
     "clean": "rm -rf dist node_modules package-lock.json *.log coverage",
     "compile": "tsc -p tsconfig.build.json",
     "env": "LEX_CONFIG='{\"useTypescript\":true}'",
     "lint": "eslint ./src --ext .ts,.tsx",
-    "prepublishOnly": "yarn build",
+    "prepublishOnly": "npm run build",
     "publish:major": "npm version major && npm publish",
     "publish:minor": "npm version minor && npm publish",
     "publish:patch": "npm version patch && npm publish",
     "reset": "rm -rf node_modules packages-lock.json",
-    "test": "yarn lint && NODE_ENV=test && yarn env && jest",
-    "update": "yarn upgradeInteractive --latest",
-    "watch": "NODE_ENV=development rm -rf dist && yarn compile -w"
+    "test": "NODE_ENV=test && npm run lint && npm run env && jest",
+    "update": "npm-check-updates -i",
+    "watch": "NODE_ENV=development rm -rf dist && npm run compile -w"
   },
   "dependencies": {
+    "@babel/core": "^7.23.6",
+    "@babel/preset-env": "^7.23.6",
+    "@babel/preset-typescript": "7.23.3",
     "@luckycatfactory/esbuild-graphql-loader": "^3.8.1",
-    "@nlabs/esbuild-jest": "^1.37.8",
+    "@nlabs/execa-mock": "^1.39.1",
     "@nlabs/gothamjs": "^0.8.2",
     "@nlabs/webpack-plugin-static-site": "^0.1.1",
-    "acorn": "^8.8.2",
+    "acorn": "^8.11.2",
     "acorn-dynamic-import": "^4.0.0",
-    "assert": "^2.0.0",
-    "boxen": "7.0.2",
-    "caniuse-lite": "1.0.30001469",
-    "chalk": "^5.2.0",
-    "commander": "^10.0.0",
-    "compare-versions": "^6.0.0-rc.1",
+    "assert": "^2.1.0",
+    "autoprefixer": "^10.4.16",
+    "babel-jest": "^29.7.0",
+    "boxen": "7.1.1",
+    "caniuse-lite": "1.0.30001572",
+    "chalk": "^5.3.0",
+    "commander": "^11.1.0",
+    "compare-versions": "^6.1.0",
     "compression-webpack-plugin": "^10.0.0",
     "config-webpack-plugin": "^1.1.0",
     "copy-webpack-plugin": "^11.0.0",
-    "core-js": "^3.29.1",
+    "core-js": "^3.34.0",
     "crypto-browserify": "^3.12.0",
-    "css-loader": "^6.7.3",
-    "cssnano": "^5.1.15",
+    "css-loader": "^6.8.1",
+    "cssnano": "^6.0.2",
     "dotenv-webpack": "^8.0.1",
     "download-npm-package": "^3.1.12",
-    "esbuild": "^0.17.12",
-    "esbuild-loader": "^3.0.1",
-    "execa": "7.1.1",
+    "esbuild": "0.19.10",
+    "esbuild-loader": "4.0.2",
+    "execa": "8.0.1",
     "exports-loader": "^4.0.0",
-    "favicons-webpack-plugin": "^6.0.0",
+    "favicons-webpack-plugin": "^6.0.1",
     "file-loader": "^6.2.0",
     "find-file-up": "^2.0.1",
-    "glob": "^9.3.1",
-    "graphql": "^16.6.0",
+    "glob": "^10.3.10",
+    "graphql": "^16.8.1",
     "graphql-tag": "^2.12.6",
     "html-loader": "^4.2.0",
-    "html-webpack-plugin": "^5.5.0",
+    "html-webpack-plugin": "^5.6.0",
     "https-browserify": "^1.0.0",
     "imports-loader": "^4.0.1",
-    "jest": "^29.5.0",
-    "jest-circus": "^29.5.0",
-    "jest-cli": "^29.5.0",
-    "jest-environment-jsdom": "^29.5.0",
-    "jest-transform-graphql": "^2.1.0",
-    "json-d-ts": "^1.0.1",
+    "jest": "29.7.0",
+    "jest-circus": "29.7.0",
+    "jest-cli": "29.7.0",
+    "jest-environment-jsdom": "29.7.0",
+    "jest-transform-graphql": "2.1.0",
+    "json-d-ts": "1.0.1",
     "latest-version": "7.0.0",
     "lodash": "^4.17.21",
-    "luxon": "^3.3.0",
+    "luxon": "^3.4.4",
     "net": "^1.0.2",
-    "npm-check-updates": "^16.7.13",
-    "ora": "6.2.0",
+    "ora": "8.0.1",
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.1",
-    "postcss-browser-reporter": "^0.6.0",
-    "postcss-cli": "^10.1.0",
-    "postcss-custom-properties": "^13.1.4",
+    "postcss-browser-reporter": "^0.7.0",
+    "postcss-cli": "^11.0.0",
+    "postcss-custom-properties": "^13.3.3",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-for": "^2.1.1",
     "postcss-hash": "^3.0.0",
     "postcss-import": "15.1.0",
-    "postcss-loader": "^7.1.0",
-    "postcss-nesting": "^11.2.1",
+    "postcss-loader": "^7.3.4",
+    "postcss-nesting": "^12.0.2",
     "postcss-percentage": "^0.0.0",
-    "postcss-preset-env": "^8.0.1",
+    "postcss-preset-env": "^9.3.0",
     "postcss-simple-vars": "^7.0.1",
-    "postcss-svgo": "5.1.0",
+    "postcss-svgo": "6.0.1",
     "postcss-url": "10.1.3",
     "process": "^0.11.10",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "regenerator-runtime": "^0.13.11",
-    "resolve": "^1.22.0",
-    "rimraf": "^4.4.0",
-    "semver": "^7.3.8",
-    "source-map-loader": "^4.0.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "regenerator-runtime": "^0.14.1",
+    "resolve": "^1.22.8",
+    "rimraf": "^5.0.5",
+    "semver": "^7.5.4",
+    "source-map-loader": "^4.0.2",
     "source-map-support": "^0.5.21",
     "speed-measure-webpack-plugin": "^1.5.0",
     "static-site-generator-webpack-plugin": "^3.4.2",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.2.0",
-    "style-loader": "^3.3.2",
-    "svg-spritemap-webpack-plugin": "^4.4.0",
-    "svgo": "3.0.2",
+    "style-loader": "^3.3.3",
+    "svg-spritemap-webpack-plugin": "^4.5.0",
+    "svgo": "3.1.0",
     "tls": "^0.0.1",
-    "typescript": "^5.0.2",
+    "ts-jest": "29.1.1",
+    "ts-node": "^10.9.2",
+    "typescript": "5.3.3",
     "url-loader": "^4.1.1",
     "util": "^0.12.5",
-    "webpack": "5.76.3",
-    "webpack-bundle-analyzer": "^4.8.0",
-    "webpack-cli": "^5.0.1",
-    "webpack-merge": "^5.8.0",
+    "webpack": "5.89.0",
+    "webpack-bundle-analyzer": "^4.10.1",
+    "webpack-cli": "^5.1.4",
+    "webpack-merge": "^5.10.0",
     "webpack-nano": "^1.1.1",
     "webpack-plugin-serve": "^1.6.0"
   },
   "devDependencies": {
-    "@nlabs/execa-mock": "^1.37.8",
-    "@types/jest": "^29.5.0",
-    "@types/luxon": "^3.2.0",
-    "@types/node": "^18.15.5",
+    "@babel/plugin-transform-runtime": "^7.23.6",
+    "@babel/preset-react": "^7.23.3",
+    "@nlabs/execa-mock": "^1.39.1",
+    "@types/jest": "^29.5.11",
+    "@types/luxon": "^3.3.7",
+    "@types/node": "^20.10.5",
     "@types/ora": "^3.2.0",
-    "@types/react": "^18.0.28",
-    "@types/webpack": "^5.28.0",
-    "eslint": "^8.36.0",
-    "eslint-config-styleguidejs": "^3.2.1"
+    "@types/react": "^18.2.45",
+    "@types/webpack": "^5.28.5",
+    "babel-plugin-transform-import-meta": "^2.2.1",
+    "babel-plugin-transform-vite-meta-env": "^1.0.3",
+    "eslint": "^8.56.0",
+    "eslint-config-styleguidejs": "^3.2.1",
+    "npm-check-updates": "^16.14.12"
   },
   "gitHead": "0f5fb22fc0f0ab1abab5adf62afed24c7c87e4a8"
 }

package/resolver.cjs

@@ -0,0 +1,86 @@
+/**
+ * Copyright (c) 2018-Present, Nitrogen Labs, Inc.
+ * Copyrights licensed under the MIT License. See the accompanying LICENSE file for terms.
+ */
+const {existsSync} = require('fs');
+const {extname: pathExtname, resolve: pathResolve} = require('path');
+const resolveSync = require('resolve/sync');
+
+const getFullPath = (basedir, name, extensions) => {
+  let fileName = name;
+
+  extensions.some((ext) => {
+    if(fileName !== '..') {
+      const fullPath = pathResolve(`${basedir}/${fileName}${ext}`);
+
+      if(existsSync(fullPath)) {
+        fileName = fullPath;
+        return true;
+      }
+    }
+
+    if(fileName !== 'index') {
+      const indexFile = pathResolve(`${basedir}/${fileName}/index${ext}`);
+
+      if(existsSync(indexFile)) {
+        fileName = indexFile;
+        return true;
+      }
+    }
+
+    return false;
+  });
+
+  return fileName;
+};
+
+module.exports = (value, options) => {
+  let fileName = value;
+
+  if(fileName === '') {
+    return null;
+  }
+
+  const isSequencer = fileName.startsWith('jest-sequencer-');
+
+  if(isSequencer) {
+    fileName = fileName.replace('jest-sequencer-', '');
+  }
+
+  const {basedir, extensions = ['.js', '.ts']} = options;
+  const existingExt = pathExtname(fileName) || '';
+  const hasExtension = existingExt !== '' && extensions.includes(existingExt);
+  const isAbsolute = fileName.indexOf('/') === 0;
+
+  if(isAbsolute) {
+    if(hasExtension) {
+      return existsSync(fileName) ? fileName : null;
+    }
+
+    return getFullPath(fileName, 'index', extensions);
+  }
+
+  if(fileName === '..') {
+    return getFullPath(basedir, '..', extensions);
+  }
+
+  const hasBase = fileName.indexOf('./') >= 0 || fileName.indexOf('../') >= 0;
+
+  if(hasBase) {
+    if(hasExtension) {
+      return pathResolve(`${basedir}/${fileName}`);
+    }
+
+    return getFullPath(basedir, fileName, extensions);
+  }
+
+  try {
+    return resolveSync(fileName, {basedir: `${__dirname}/../`, extensions});
+  } catch(error) {
+    try {
+      return resolveSync(fileName, {basedir: process.cwd(), extensions});
+    } catch(error) {
+      return null;
+    }
+  }
+};

package/test/javascript.js

@@ -0,0 +1,6 @@
+const fnc =  () => {
+  const now = new Date();
+  return now.getFullYear();
+};
+
+export default fnc;

package/test/typescript.ts

@@ -0,0 +1,6 @@
+const fnc =  (): number => {
+  const now: Date = new Date();
+  return now.getFullYear();
+};
+
+export default fnc;

package/tsconfig.build.json

@@ -6,7 +6,7 @@
     "lib": [
       "es2020"
     ],
-    "module": "commonjs",
+    "module": "esnext",
     "outDir": "./dist",
     "skipLibCheck": true,
     "target": "es2020"

package/tsconfig.json

@@ -4,7 +4,7 @@
     "./dist",
     "./node_modules"
   ],
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "include": [
     "./src"
   ]

package/tsconfig.template.json

@@ -2,18 +2,18 @@
   "compilerOptions": {
     "allowJs": false,
     "allowSyntheticDefaultImports": true,
-    "declaration": true,
+    "emitDeclarationOnly": true,
     "esModuleInterop": true,
     "inlineSourceMap": true,
     "jsx": "react-jsx",
     "lib": [
       "es6",
       "es7",
-      "esnext",
+      "ESNext",
       "dom"
     ],
-    "module": "commonjs",
-    "moduleResolution": "node",
+    "module": "ESNext",
+    "moduleResolution": "Node",
     "noFallthroughCasesInSwitch": true,
     "noImplicitReturns": true,
     "noImplicitThis": true,
@@ -21,7 +21,7 @@
     "pretty": true,
     "removeComments": true,
     "skipLibCheck": true,
-    "target": "es5",
+    "target": "ESNext",
     "types": [
       "jest",
       "node"

package/webpack.config.js

@@ -2,28 +2,41 @@
  * Copyright (c) 2018-Present, Nitrogen Labs, Inc.
  * Copyrights licensed under the MIT License. See the accompanying LICENSE file for terms.
  */
-const {StaticSitePlugin} = require('@nlabs/webpack-plugin-static-site');
-const CompressionWebpackPlugin = require('compression-webpack-plugin');
-const CopyWebpackPlugin = require('copy-webpack-plugin');
-const DotenvPlugin = require('dotenv-webpack');
-const {ESBuildMinifyPlugin} = require('esbuild-loader');
-const FaviconsWebpackPlugin = require('favicons-webpack-plugin');
-const fs = require('fs');
-const glob = require('glob');
-const HtmlWebPackPlugin = require('html-webpack-plugin');
-const isEmpty = require('lodash/isEmpty');
-const path = require('path');
-const SVGSpritemapPlugin = require('svg-spritemap-webpack-plugin');
-const webpack = require('webpack');
-const {BundleAnalyzerPlugin} = require('webpack-bundle-analyzer');
-const {merge} = require('webpack-merge');
-const {WebpackPluginServe} = require('webpack-plugin-serve');
+import {StaticSitePlugin} from '@nlabs/webpack-plugin-static-site';
+import autoprefixer from 'autoprefixer';
+import CompressionWebpackPlugin from 'compression-webpack-plugin';
+import CopyWebpackPlugin from 'copy-webpack-plugin';
+import cssnano from 'cssnano';
+import DotenvPlugin from 'dotenv-webpack';
+import {EsbuildPlugin} from 'esbuild-loader';
+import FaviconsWebpackPlugin from 'favicons-webpack-plugin';
+import {existsSync} from 'fs';
+import {sync as globSync} from 'glob';
+import HtmlWebPackPlugin from 'html-webpack-plugin';
+import isEmpty from 'lodash/isEmpty.js';
+import {resolve as pathResolve} from 'path';
+import postcssBrowserReporter from 'postcss-browser-reporter';
+import postcssCustomProperties from 'postcss-custom-properties';
+import postcssFlexbugsFixes from 'postcss-flexbugs-fixes';
+import postcssFor from 'postcss-for';
+import postcssImport from 'postcss-import';
+import postcssNesting from 'postcss-nesting';
+import postcssPercentage from 'postcss-percentage';
+import postcssPresetEnv from 'postcss-preset-env';
+import postcssUrl from 'postcss-url';
+import SVGSpritemapPlugin from 'svg-spritemap-webpack-plugin';
+import {URL} from 'url';
+import {default as webpack} from 'webpack';
+import {BundleAnalyzerPlugin} from 'webpack-bundle-analyzer';
+import {merge} from 'webpack-merge';
+import {WebpackPluginServe} from 'webpack-plugin-serve';
 
-const {getNodePath, relativeFilePath} = require('./dist/utils/file');
+import {relativeFilePath, relativeNodePath} from './dist/utils/file.js';
 
 const {ProgressPlugin, ProvidePlugin} = webpack;
 const isProduction = process.env.NODE_ENV === 'production';
 const lexConfig = JSON.parse(process.env.LEX_CONFIG) || {};
+const dirName = new URL('.', import.meta.url).pathname;
 
 const {
   isStatic,
@@ -47,7 +60,7 @@ const plugins = [
     dependencies: true,
     percentBy: null
   }),
-  new DotenvPlugin({path: path.resolve(process.cwd(), '.env'), systemvars: false})
+  new DotenvPlugin({path: pathResolve(process.cwd(), '.env'), systemvars: false})
 ];
 
 const isWeb = (preset || targetEnvironment) === 'web';
@@ -58,7 +71,7 @@ if(isWeb) {
     new CompressionWebpackPlugin({algorithm: 'gzip'}),
     new ProvidePlugin({
       process: 'process/browser',
-      React: path.resolve(__dirname, './node_modules/react')
+      React: pathResolve(dirName, './node_modules/react')
     })
   );
 }
@@ -73,7 +86,7 @@ const globOptions = {
 
 const svgPaths = `${sourceFullPath}/icons/**/**.svg`;
 
-if(glob.sync(svgPaths, globOptions).length) {
+if(globSync(svgPaths, globOptions).length) {
   plugins.push(new SVGSpritemapPlugin(svgPaths, {
     input: {
       allowDuplicates: false
@@ -95,17 +108,17 @@ const imagePath = `${sourceFullPath}/images/`;
 const fontPath = `${sourceFullPath}/fonts/`;
 const docPath = `${sourceFullPath}/docs/`;
 
-if(fs.existsSync(imagePath)) {
+if(existsSync(imagePath)) {
   staticPaths.push({from: imagePath, to: './images/'});
   watchIgnorePaths.push(imagePath);
 }
 
-if(fs.existsSync(fontPath)) {
+if(existsSync(fontPath)) {
   staticPaths.push({from: fontPath, to: './fonts/'});
   watchIgnorePaths.push(fontPath);
 }
 
-if(fs.existsSync(docPath)) {
+if(existsSync(docPath)) {
   staticPaths.push({from: docPath, to: './docs/'});
 }
 
@@ -113,7 +126,7 @@ if(staticPaths.length) {
   plugins.push(new CopyWebpackPlugin({patterns: staticPaths}));
 }
 
-if(fs.existsSync(`${sourceFullPath}/${lexConfig.entryHTML}`)) {
+if(existsSync(`${sourceFullPath}/${lexConfig.entryHTML}`)) {
   plugins.push(new HtmlWebPackPlugin({
     filename: './index.html',
     minify: isProduction,
@@ -134,26 +147,26 @@ if(outputFile) {
 }
 
 // Loader paths
-const esbuildLoaderPath = relativeFilePath('node_modules/esbuild-loader', __dirname);
-const cssLoaderPath = relativeFilePath('node_modules/css-loader', __dirname);
-const fileLoaderPath = relativeFilePath('node_modules/file-loader', __dirname);
-const graphqlLoaderPath = relativeFilePath('node_modules/graphql-tag/loader', __dirname);
-const htmlLoaderPath = relativeFilePath('node_modules/html-loader', __dirname);
-const jsonLoaderPath = relativeFilePath('node_modules/json-loader', __dirname);
-const postcssLoaderPath = relativeFilePath('node_modules/postcss-loader', __dirname);
-const sourceMapLoaderPath = relativeFilePath('node_modules/source-map-loader', __dirname);
-const styleLoaderPath = relativeFilePath('node_modules/style-loader', __dirname);
-const webpackPath = relativeFilePath('node_modules/webpack', __dirname);
+const esbuildLoaderPath = relativeNodePath('esbuild-loader', dirName);
+const cssLoaderPath = relativeNodePath('css-loader', dirName);
+const fileLoaderPath = relativeNodePath('file-loader', dirName);
+const graphqlLoaderPath = relativeNodePath('graphql-tag/loader', dirName);
+const htmlLoaderPath = relativeNodePath('html-loader', dirName);
+const jsonLoaderPath = relativeNodePath('json-loader', dirName);
+const postcssLoaderPath = relativeNodePath('postcss-loader', dirName);
+const sourceMapLoaderPath = relativeNodePath('source-map-loader', dirName);
+const styleLoaderPath = relativeNodePath('style-loader', dirName);
+const webpackPath = relativeNodePath('webpack', dirName);
 
 // Aliases
 const aliasPaths = {
-  '@nlabs/arkhamjs': relativeFilePath('node_modules/@nlabs/arkhamjs', process.cwd()),
-  '@nlabs/arkhamjs-utils-react': relativeFilePath('node_modules/@nlabs/arkhamjs-utils-react', process.cwd()),
-  'core-js': getNodePath('core-js'),
-  process: relativeFilePath('node_modules/process', process.cwd()),
-  react: relativeFilePath('node_modules/react', process.cwd()),
-  'react-dom': relativeFilePath('node_modules/react-dom', process.cwd()),
-  'regenerator-runtime': getNodePath('regenerator-runtime')
+  '@nlabs/arkhamjs': relativeNodePath('@nlabs/arkhamjs', process.cwd()),
+  '@nlabs/arkhamjs-utils-react': relativeNodePath('@nlabs/arkhamjs-utils-react', process.cwd()),
+  'core-js': relativeNodePath('core-js', dirName),
+  process: relativeNodePath('process', dirName),
+  react: relativeNodePath('react', process.cwd()),
+  'react-dom': relativeNodePath('react-dom', process.cwd()),
+  'regenerator-runtime': relativeNodePath('regenerator-runtime', dirName)
 };
 const aliasKeys = Object.keys(aliasPaths);
 const alias = aliasKeys.reduce((aliases, key) => {
@@ -165,7 +178,7 @@ const alias = aliasKeys.reduce((aliases, key) => {
 }, {});
 
 // Webpack config
-module.exports = (webpackEnv, webpackOptions) => {
+export default (webpackEnv, webpackOptions) => {
   const {bundleAnalyzer, watch} = webpackOptions;
   const webpackConfig = {
     bail: true,
@@ -235,27 +248,27 @@ module.exports = (webpackEnv, webpackOptions) => {
               options: {
                 postcssOptions: {
                   plugins: [
-                    require(relativeFilePath('node_modules/postcss-import', __dirname))({addDependencyTo: webpack}),
-                    require(relativeFilePath('node_modules/postcss-url', __dirname)),
-                    require(relativeFilePath('node_modules/postcss-for', __dirname)),
-                    require(relativeFilePath('node_modules/postcss-percentage', __dirname))({
+                    postcssImport({addDependencyTo: webpack}),
+                    postcssUrl,
+                    postcssFor,
+                    postcssPercentage({
                       floor: true,
                       precision: 9,
                       trimTrailingZero: true
                     }),
-                    require(relativeFilePath('node_modules/postcss-custom-properties', __dirname))({
+                    postcssCustomProperties({
                       preserve: false,
                       strict: false,
                       warnings: false
                     }),
-                    require(relativeFilePath('node_modules/autoprefixer', __dirname)),
-                    require(relativeFilePath('node_modules/postcss-nesting', __dirname)),
-                    require(relativeFilePath('node_modules/postcss-flexbugs-fixes', __dirname)),
-                    require(relativeFilePath('node_modules/postcss-preset-env', __dirname))({
+                    autoprefixer,
+                    postcssNesting,
+                    postcssFlexbugsFixes,
+                    postcssPresetEnv({
                       stage: 0
                     }),
-                    require(relativeFilePath('node_modules/cssnano', __dirname))({autoprefixer: false}),
-                    require(relativeFilePath('node_modules/postcss-browser-reporter', __dirname))
+                    cssnano({autoprefixer: false}),
+                    postcssBrowserReporter
                   ]
                 }
               }
@@ -291,7 +304,7 @@ module.exports = (webpackEnv, webpackOptions) => {
     },
     optimization: (isProduction && isWeb) ? {
       minimizer: [
-        new ESBuildMinifyPlugin({
+        new EsbuildPlugin({
           css: true,
           target: targetEnvironment
         })
@@ -322,15 +335,15 @@ module.exports = (webpackEnv, webpackOptions) => {
       alias,
       extensions: ['*', '.mjs', '.js', '.ts', '.tsx', '.jsx', '.json', '.gql', '.graphql'],
       fallback: {
-        assert: require.resolve('assert/'),
-        crypto: require.resolve('crypto-browserify'),
-        http: require.resolve('stream-http'),
-        https: require.resolve('https-browserify'),
-        os: require.resolve('os-browserify/browser'),
-        path: require.resolve('path-browserify'),
-        process: require.resolve('process/browser'),
-        stream: require.resolve('stream-browserify'),
-        util: require.resolve('util/')
+        assert: relativeNodePath('assert', dirName),
+        crypto: relativeNodePath('crypto-browserify', dirName),
+        http: relativeNodePath('stream-http', dirName),
+        https: relativeNodePath('https-browserify', dirName),
+        os: relativeNodePath('os-browserify/browser.js', dirName),
+        path: relativeNodePath('path-browserify', dirName),
+        process: relativeNodePath('process/browser.js', dirName),
+        stream: relativeNodePath('stream-browserify', dirName),
+        util: relativeNodePath('util', dirName)
       },
       mainFiles: ['index'],
       modules: [sourceFullPath, 'node_modules'],
@@ -348,7 +361,7 @@ module.exports = (webpackEnv, webpackOptions) => {
       webpack: webpackPath
     };
     webpackConfig.optimization = {minimize: false};
-    webpackConfig.entry.wps = relativeFilePath('node_modules/webpack-plugin-serve/client.js', __dirname);
+    webpackConfig.entry.wps = relativeNodePath('webpack-plugin-serve/client.js', dirName);
     webpackConfig.stats = {errorDetails: true};
     webpackConfig.plugins.push(
       new WebpackPluginServe({
@@ -418,7 +431,7 @@ module.exports = (webpackEnv, webpackOptions) => {
   // Create site ico files
     const siteLogo = `${sourceFullPath}/images/logo.png`;
 
-    if(fs.existsSync(siteLogo)) {
+    if(existsSync(siteLogo)) {
       plugins.push(new FaviconsWebpackPlugin({
         icons: {
           android: true,