@startupjs/cli 0.45.0 → 0.46.0

package/index.js

@@ -28,6 +28,19 @@ try {
   PATCHES_DIR = './patches'
 }
 
+let PATCHES_GESTURE_HANDLER_DIR
+try {
+  PATCHES_GESTURE_HANDLER_DIR = path.join(
+    path.dirname(require.resolve('@startupjs/patches')),
+    'patches_gestureHandler'
+  )
+  // patch-package requires the path to be relative
+  PATCHES_GESTURE_HANDLER_DIR = path.relative(process.cwd(), PATCHES_GESTURE_HANDLER_DIR)
+} catch (err) {
+  console.error(err)
+  console.error('ERROR!!! Gesture handler patches not found.')
+}
+
 const LINK = !!process.env.LINK
 const LOCAL_DIR = process.env.LOCAL_DIR || '.'
 
@@ -48,7 +61,7 @@ const DEV_DEPENDENCIES = [
   'eslint-config-standard-react',
   'eslint-plugin-import',
   'eslint-plugin-import-helpers',
-  'eslint-plugin-node',
+  'eslint-plugin-n',
   'eslint-plugin-promise',
   'eslint-plugin-react',
   'eslint-plugin-react-pug',
@@ -86,13 +99,13 @@ SCRIPTS_ORIG.web = ({ reset, vite, webpack } = {}) => {
 }
 
 SCRIPTS_ORIG.webVite = ({ reset } = {}) => oneLine(`
-  ${reset ? 'rm -rf node_modules/.vite_opt_cache &&' : ''}
-  VITE_WEB=1
+  ${reset ? 'rimraf node_modules/.vite_opt_cache &&' : ''}
+  cross-env VITE_WEB=1
   vite
 `)
 
 SCRIPTS_ORIG.webWebpack = oneLine(`
-  WEBPACK_DEV=1
+  cross-env WEBPACK_DEV=1
   webpack-dev-server --config webpack.web.config.cjs
 `)
 
@@ -148,12 +161,12 @@ SCRIPTS_ORIG.testBuild = appName => oneLine(`
 `)
 
 SCRIPTS_ORIG.testIos = (appName, artifacts, updateScreenshot) => oneLine(`
-  ${updateScreenshot ? `rm -rf \`find ${ROOT_PATH} -name "__image_snapshots__" -type d\` &&` : ''}
+  ${updateScreenshot ? `rimraf \`find ${ROOT_PATH} -name "__image_snapshots__" -type d\` &&` : ''}
   concurrently
     -s first -k -n "S,T"
     -c white,cyan.bgBlue
     "mongo ${appName}_test --eval 'db.dropDatabase();'
-    && ASYNC=1 startupjs build
+    && cross-env ASYNC=1 startupjs build
     && PORT=3001 MONGO_URL=mongodb://localhost:27017/${appName}_test startupjs start-production"
     "${SCRIPTS_ORIG.testJsBundle(appName)}
     && wait-on http://localhost:3001
@@ -164,7 +177,7 @@ SCRIPTS_ORIG.testIos = (appName, artifacts, updateScreenshot) => oneLine(`
 
 SCRIPTS_ORIG.testJsBundle = appName => oneLine(`
   mkdir -p ios/build/Build/Products/Release-iphonesimulator/${appName}.app/
-  && APP_ENV=detox react-native bundle
+  && cross-env APP_ENV=detox react-native bundle
   --entry-file="index.js"
   --bundle-output="./ios/build/Build/Products/Release-iphonesimulator/${appName}.app/main.jsbundle"
   --reset-cache --dev=false
@@ -181,7 +194,7 @@ SCRIPTS_ORIG.server = ({ inspect, vite, webpack, pure } = {}) => {
 }
 
 SCRIPTS_ORIG.serverPure = ({ inspect, vite } = {}) => oneLine(`
-  ${vite ? 'VITE=1' : ''}
+  ${vite ? 'cross-env VITE=1' : ''}
   nodemon
     --experimental-specifier-resolution=node
     ${inspect ? '--inspect' : ''}
@@ -207,14 +220,14 @@ SCRIPTS_ORIG.serverWebpack = (options) => oneLine(`
 `)
 
 SCRIPTS_ORIG.serverWebpackBuild = oneLine(`
-  WEBPACK_DEV=1
+  cross-env WEBPACK_DEV=1
   webpack --watch --config webpack.server.config.cjs
 `)
 
 SCRIPTS_ORIG.serverWebpackRun = ({ inspect, vite }) => oneLine(`
-  rm -f ./build/server.dev.cjs &&
+  rimraf ./build/server.dev.cjs &&
   just-wait -t 1000 --pattern ./build/server.dev.cjs &&
-  ${vite ? 'VITE=1' : ''}
+  ${vite ? 'cross-env VITE=1' : ''}
   nodemon
     --experimental-specifier-resolution=node
     ${inspect ? '--inspect' : ''}
@@ -236,7 +249,7 @@ SCRIPTS_ORIG.start = (options = {}) => {
 
 SCRIPTS_ORIG.startPure = (...args) => oneLine(`
   concurrently
-    -s first -k -n 'Server,compile Web'
+    -s first -k -n 'Server,Web'
     -c cyan.bgBlue,gray
     "${SCRIPTS_ORIG.server(...args)}"
     "${SCRIPTS_ORIG.web(...args)}"
@@ -245,7 +258,7 @@ SCRIPTS_ORIG.startPure = (...args) => oneLine(`
 SCRIPTS_ORIG.startWebpack = (options) => oneLine(`
   concurrently
     -p "{name}:"
-    -s first -k -n 'Server,compile Server,compile Web'
+    -s first -k -n 'Server,ServerBuild,Web'
     -c cyan.bgBlue.bold,gray,gray
     "${SCRIPTS_ORIG.serverWebpackRun(options)}"
     "${SCRIPTS_ORIG.serverWebpackBuild}"
@@ -255,9 +268,9 @@ SCRIPTS_ORIG.startWebpack = (options) => oneLine(`
 // Production build
 
 SCRIPTS_ORIG.build = ({ async, pure } = {}) => oneLine(`
-  rm -rf ./build &&
+  rimraf ./build &&
   ${pure ? '' : 'webpack --config webpack.server.config.cjs &&'}
-  ${async ? 'ASYNC=1' : ''}
+  ${async ? 'cross-env ASYNC=1' : ''}
   webpack --config webpack.web.config.cjs
 `)
 
@@ -270,14 +283,14 @@ SCRIPTS_ORIG.startProduction = ({ pure }) => {
 }
 
 SCRIPTS_ORIG.startProductionPure = oneLine(`
-  NODE_ENV=production
+  cross-env NODE_ENV=production
   node
     --experimental-specifier-resolution=node
     server.js
 `)
 
 SCRIPTS_ORIG.startProductionWebpack = oneLine(`
-  NODE_ENV=production
+  cross-env NODE_ENV=production
   node
     --experimental-specifier-resolution=node
     -r source-map-support/register
@@ -288,12 +301,18 @@ SCRIPTS_ORIG.patchPackage = () => oneLine(`
   npx patch-package --patch-dir ${PATCHES_DIR}
 `)
 
+SCRIPTS_ORIG.patchGestureHandler = () => PATCHES_GESTURE_HANDLER_DIR
+  ? oneLine(`
+      (cat package.json | grep -q react-native-gesture-handler && npx patch-package --patch-dir ${PATCHES_GESTURE_HANDLER_DIR} || true)
+    `)
+  : 'true'
+
 SCRIPTS_ORIG.fonts = () => oneLine(`
   react-native-asset
 `)
 
 SCRIPTS_ORIG.postinstall = () => oneLine(`
-  ${SCRIPTS_ORIG.patchPackage()} && ${SCRIPTS_ORIG.fonts()}
+  ${SCRIPTS_ORIG.patchPackage()} && ${SCRIPTS_ORIG.fonts()} && ${SCRIPTS_ORIG.patchGestureHandler()}
 `)
 
 const SCRIPTS = {
@@ -339,7 +358,7 @@ const TEMPLATES = {
       '@react-native-picker/picker@^1.16.1',
       'react-native-collapsible@^1.6.0',
       'react-native-color-picker@^0.6.0',
-      'react-native-gesture-handler@^1.10.3',
+      'react-native-gesture-handler@1.10.3',
       'react-native-pager-view@^5.1.2',
       'react-native-tab-view@^3.0.0'
       // === END UI PEER DEPS ===

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@startupjs/cli",
-  "version": "0.45.0",
+  "version": "0.46.0",
   "description": "start, watch and build startupjs project",
   "main": "index.js",
   "scripts": {},
@@ -11,6 +11,7 @@
   "dependencies": {
     "commander": "^3.0.1",
     "concurrently": "^6.4.0",
+    "cross-env": "^7.0.3",
     "execa": "^2.0.4",
     "fonteditor-core": "2.1.3",
     "glob": "^7.1.6",
@@ -18,11 +19,12 @@
     "lodash": "^4.17.20",
     "nodemon": "^1.19.2",
     "react-native-asset": "2.0.1",
+    "rimraf": "^3.0.2",
     "source-map-support": "^0.5.19",
     "wait-on": "^5.2.1",
     "webpack": "^5.60.0",
     "webpack-cli": "^4.9.1",
     "webpack-dev-server": "^4.4.0"
   },
-  "gitHead": "37272e27715f70b8d221b2e98ffccb39fda7a35d"
+  "gitHead": "ed6ce68f7d673bb2dbcc986d49eb7eebcf6f3180"
 }