@startupjs/cli 0.55.0-alpha.12 → 0.55.0-alpha.14

package/index.js

@@ -2,7 +2,6 @@ const commander = require('commander')
 const execa = require('execa')
 const path = require('path')
 const fs = require('fs')
-const Font = require('fonteditor-core').Font
 const template = require('lodash/template')
 const CLI_VERSION = require('./package.json').version
 
@@ -144,12 +143,8 @@ SCRIPTS_ORIG.patchGestureHandler = () => PATCHES_GESTURE_HANDLER_DIR
     `)
   : 'true'
 
-SCRIPTS_ORIG.fonts = () => oneLine(`
-  npx react-native-asset
-`)
-
 SCRIPTS_ORIG.postinstall = () => oneLine(`
-  ${SCRIPTS_ORIG.patchPackage()} && ${SCRIPTS_ORIG.fonts()}
+  ${SCRIPTS_ORIG.patchPackage()}}
 `)
 
 const SCRIPTS = {
@@ -166,8 +161,7 @@ const SCRIPTS = {
   ios: 'react-native run-ios',
   'ios-release': 'react-native run-ios --configuration Release',
   build: 'startupjs build --async',
-  'start-production': 'startupjs start-production',
-  fonts: 'startupjs fonts'
+  'start-production': 'startupjs start-production'
 }
 
 const DEFAULT_TEMPLATE = 'ui'
@@ -319,8 +313,8 @@ commander
     console.log('> Update config.json')
     updateConfigJson(projectPath, { projectName })
 
-    console.log('> Patch package.json with additional scripts')
-    patchScriptsInPackageJson(projectPath)
+    console.log('> Patch package.json')
+    patchPackageJson(projectPath)
 
     console.log('> Add additional things to .gitignore')
     appendGitignore(projectPath)
@@ -442,18 +436,6 @@ commander
     )
   })
 
-commander
-  .command('fonts')
-  .description('Rename fonts and react-native smart linking for assets')
-  .action(async (options) => {
-    renameFonts()
-
-    await execa.command(
-      SCRIPTS_ORIG.fonts(options),
-      { stdio: 'inherit', shell: true }
-    )
-  })
-
 // ----- project management commands
 
 commander
@@ -505,40 +487,7 @@ async function recursivelyCopyFiles (sourcePath, targetPath) {
   }
 }
 
-function renameFonts () {
-  const FONTS_PATH = process.cwd() + '/public/fonts'
-  const EXT_WISHLIST = ['eot', 'otf', 'ttf', 'woff', 'woff2']
-  const IGNORE = ['.gitignore', '.DS_Store', '.gitallowed']
-
-  if (fs.existsSync(FONTS_PATH)) {
-    const files = fs.readdirSync(FONTS_PATH)
-
-    files.forEach(file => {
-      if (IGNORE.includes(file)) return
-
-      const [fileName, fileExt] = file.split('.')
-      if (EXT_WISHLIST.indexOf(fileExt) === -1) {
-        return console.error(`Font format error: ${fileExt} is not supported`)
-      }
-
-      const buffer = fs.readFileSync(`${FONTS_PATH}/${file}`)
-      const font = Font.create(buffer, { type: fileExt })
-
-      if (font.get().name.fontFamily === fileName) return
-      font.get().name.fontFamily = fileName
-      font.get().name.fontSubFamily = fileName
-      font.get().name.preferredFamily = fileName
-
-      const bufferUpdate = font.write({ type: fileExt })
-      fs.writeFile(`${FONTS_PATH}/${file}`, bufferUpdate, (err) => {
-        if (err) return console.log(err)
-        console.log(`${file} rename font-family`)
-      })
-    })
-  }
-}
-
-function patchScriptsInPackageJson (projectPath) {
+function patchPackageJson (projectPath) {
   const packageJSONPath = path.join(projectPath, 'package.json')
   const packageJSON = JSON.parse(fs.readFileSync(packageJSONPath).toString())
 
@@ -547,6 +496,8 @@ function patchScriptsInPackageJson (projectPath) {
   delete packageJSON.devDependencies['react-test-renderer']
   delete packageJSON.devDependencies.jest
 
+  packageJSON.type = 'module'
+
   packageJSON.scripts = {
     ...packageJSON.scripts,
     ...SCRIPTS

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@startupjs/cli",
-  "version": "0.55.0-alpha.12",
+  "version": "0.55.0-alpha.14",
   "description": "start, watch and build startupjs project",
   "main": "index.js",
   "license": "MIT",
@@ -13,12 +13,10 @@
     "concurrently": "^6.4.0",
     "cross-env": "^7.0.3",
     "execa": "^2.0.4",
-    "fonteditor-core": "2.1.11",
     "glob": "^7.1.6",
     "just-wait": "^1.0.11",
     "lodash": "^4.17.20",
     "nodemon": "2.0.22",
-    "react-native-asset": "2.0.1",
     "rimraf": "^3.0.2",
     "source-map-support": "^0.5.19",
     "wait-on": "^5.2.1",
@@ -26,5 +24,5 @@
     "webpack-cli": "^4.9.1",
     "webpack-dev-server": "^4.4.0"
   },
-  "gitHead": "d9fdf45341ca733978cdc4fa2562055922e0c2ed"
+  "gitHead": "a23711261cd41ea04ea3ad92ba5f714dba514682"
 }