@softlimit/theme-envy 0.1.7-alpha → 0.1.10-alpha

package/build/functions/liquid/functions/flatten-shopify-directory-structure.js

@@ -19,6 +19,9 @@ module.exports = function(path) {
   if (path.includes('templates/customers')) {
     return `templates/customers/${filename}`
   }
+  if (path.includes('templates/metaobject')) {
+    return `templates/metaobject/${filename}`
+  }
   if (path.includes('templates/') && !path.includes('customers/')) {
     return `templates/${filename}`
   }

package/build/functions/theme-envy.js

@@ -72,8 +72,7 @@ function watch({ mode, verbose }) {
   const chokidar = require('chokidar')
   console.log('watching for changes...')
   chokidar.watch(ThemeEnvy.themePath).on('change', (path) => {
-    // pass path to the event so we can use to update files separately
-    ThemeEnvy.events.emit('watch:change', path)
+    ThemeEnvy.events.emit('watch:start')
     const isJSONTemplate = path.includes('templates/') && path.extname(path) === '.json'
     if (!isJSONTemplate) {
       console.log(`updated: ${path.split(ThemeEnvy.themePath + '/')[1]}`)

package/build/requires/assets.js

@@ -17,7 +17,5 @@ assets.forEach(asset => {
     ThemeEnvy.progress.increment('assets', 1)
   } catch (err) {
     console.error(err)
-  } finally {
-    // use chokidar to watch for changes and copy to dist again
   }
 })

package/build/requires/config.js

@@ -34,7 +34,7 @@ const writeSettingsSchema = () => {
 
 writeSettingsSchema()
 
-ThemeEnvy.events.on('watch:change', () => {
+ThemeEnvy.events.on('watch:start', () => {
   // clear node cache of ThemeRequired modules
   requiredModules.forEach(module => {
     delete require.cache[require.resolve(module)]

package/build/requires/globals/theme-require.js

@@ -23,7 +23,7 @@ const setPreGlobs = () => {
 }
 
 // uncache all required files after a build is complete so changes can be made to partials and schemas in between watch events
-ThemeEnvy.events.on('watch:change', () => {
+ThemeEnvy.events.on('watch:start', () => {
   // clear node cache of ThemeRequired modules
   requiredModules.forEach(module => {
     delete require.cache[require.resolve(module)]

package/build/requires/templates.js

@@ -14,6 +14,14 @@ const templateOutputPath = path.resolve(ThemeEnvy.outputPath, 'templates')
 fs.ensureDirSync(templateOutputPath)
 globbedTemplates.forEach(file => {
   // write each file to dist
+  // if the file path includes customers, output into a customers directory in templates
+  if (file.includes('customers')) {
+    const customerOutputPath = path.resolve(templateOutputPath, 'customers')
+    fs.ensureDirSync(customerOutputPath)
+    fs.copyFileSync(file, path.resolve(customerOutputPath, path.basename(file)))
+    ThemeEnvy.progress.increment('templates', 1)
+    return
+  }
   fs.copyFileSync(file, path.resolve(templateOutputPath, path.basename(file)))
   // update progress bar
   ThemeEnvy.progress.increment('templates', 1)

package/helpers/functions/pull-json.js

@@ -12,7 +12,7 @@ const { spawn } = require('child_process')
 
 module.exports = function() {
   const relativeDistPath = path.relative(process.cwd(), ThemeEnvy.outputPath)
-  const themePull = ['theme', 'pull', `--store=${ThemeEnvy.store}`, `--path=${relativeDistPath}`, '--only=settings_data.json', '--only=templates/*.json']
+  const themePull = ['theme', 'pull', `--store=${ThemeEnvy.store}`, `--path=${relativeDistPath}`, '--only=settings_data.json', '--only=templates/*.json', '--only=sections/*.json']
   const shopify = spawn('shopify', themePull, { cwd: path.resolve(process.cwd()), stdio: 'inherit' })
 
   shopify.on('exit', function() {

package/ignore/index.js

@@ -0,0 +1,24 @@
+/**
+  * @file Creates a .shopifyignore file in the outputPath directory based on the type of push specified in the argument.
+  * @param {string} type - The type of ignore pattern to use: 'none', 'locales', 'push'
+  */
+
+const path = require('path')
+const fs = require('fs')
+
+const patterns = {
+  none: '',
+  locales: 'locales/*',
+  push: `locales/*
+templates/*.json
+sections/*.json
+config/settings_data.json
+`,
+}
+
+module.exports = function(type) {
+  if (!fs.existsSync(path.resolve(process.cwd(), 'dist'))) {
+    fs.mkdirSync(path.resolve(process.cwd(), 'dist'))
+  }
+  fs.writeFileSync(path.resolve(process.cwd(), 'dist/.shopifyignore'), patterns[type])
+}

package/index.js

@@ -21,6 +21,7 @@ const themeEnvyCommands = {
   convert: require('#Convert'),
   dev: require('#Helpers/functions/dev.js'),
   init: require('#Init'),
+  ignore: require('#Ignore'),
   new: require('#Helpers/functions/scaffold-new/index.js'),
   orphans: require('#Helpers/functions/find-orphans.js'),
   'pull-json': require('#Helpers/functions/pull-json.js'),
@@ -188,4 +189,15 @@ program
     scriptMessage(command.name())
     themeEnvyCommands.convert(source)
   })
+
+program
+  .command('ignore')
+  .description('Create a .shopifyignore file in the output directory based on the type of ignore patter specified in the argument')
+  .usage(['[none|locales|push]'])
+  .addArgument(new commander.Argument('[type]', 'The type of ignore pattern to use').choices(['none', 'locales', 'push']))
+  .action((type, options, command) => {
+    scriptMessage(command.name())
+    themeEnvyCommands.ignore(type)
+  })
+
 program.parse()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softlimit/theme-envy",
-  "version": "0.1.7-alpha",
+  "version": "0.1.10-alpha",
   "description": "Softlimit Shopify Theme Development Environment",
   "bin": {
     "theme-envy": "./index.js"
@@ -27,6 +27,7 @@
     "#Init/*": "./init/*",
     "#Init/functions": "./init/functions/index.js",
     "#Init/functions/*": "./init/functions/*",
+    "#Ignore": "./ignore/index.js",
     "#LogSymbols": "./helpers/functions/log-symbols.js",
     "#Root/*": "./*"
   },