From cb10e490f8cfaa2a55f15ea1cc3bdce0ccd74191 Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@joost.at>
Date: Mon, 11 Jan 2021 10:52:32 +0100
Subject: [PATCH] fix(cfp): Issues with node-sass and version nr. See #778 &
 #779

---
 packages/create-freesewing-pattern/lib/cli.js            | 9 +++++----
 .../lib/prompt-library-params.js                         | 2 +-
 .../template/default/example/package.json                | 2 +-
 .../template/default/example/src/App.js                  | 1 -
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/create-freesewing-pattern/lib/cli.js b/packages/create-freesewing-pattern/lib/cli.js
index 5154a74824d..45065b26d81 100644
--- a/packages/create-freesewing-pattern/lib/cli.js
+++ b/packages/create-freesewing-pattern/lib/cli.js
@@ -5,6 +5,7 @@ const path = require('path')
 const chalk = require('chalk')
 const program = require('commander')
 const strings = require('@freesewing/i18n').strings
+const freesewing_version = require('@freesewing/pattern-info').versions.brian
 
 const getDefaultLibraryParams = require('./get-default-library-params')
 const createLibrary = require('./create-library')
@@ -12,8 +13,8 @@ const promptLibraryParams = require('./prompt-library-params')
 
 module.exports = async () => {
   // Check node version
-  const version = process.version.slice(1).split('.')[0]
-  if (parseInt(version) < 10 && process.argv.indexOf('--skip-version-check') === -1)
+  const node_version = process.version.slice(1).split('.')[0]
+  if (parseInt(node_version) < 10 && process.argv.indexOf('--skip-version-check') === -1)
     throw `
 ⚠️  FreeSewing requires Node v10 or newer.
 
@@ -29,7 +30,7 @@ module.exports = async () => {
 
   program
     .name('create-freesewing-pattern')
-    .version(version)
+    .version(node_version)
     .usage('[options] [package-name]')
     .option('-d, --desc <string>', 'package description')
     .option('-a, --author <string>', "author's github handle", defaults.author)
@@ -58,7 +59,7 @@ module.exports = async () => {
     templatePath: program.templatePath,
     skipPrompts: program.skipPrompts,
     git: program.git,
-    version
+    freesewing_version,
   }
 
   Object.keys(opts).forEach((key) => {
diff --git a/packages/create-freesewing-pattern/lib/prompt-library-params.js b/packages/create-freesewing-pattern/lib/prompt-library-params.js
index e8152ae1f36..656038a0f0d 100644
--- a/packages/create-freesewing-pattern/lib/prompt-library-params.js
+++ b/packages/create-freesewing-pattern/lib/prompt-library-params.js
@@ -141,7 +141,7 @@ module.exports = async opts => {
     return {
       ...info,
       git: opts.git,
-      version: opts.version
+      freesewing_version: opts.freesewing_version
     }
   }
 }
diff --git a/packages/create-freesewing-pattern/template/default/example/package.json b/packages/create-freesewing-pattern/template/default/example/package.json
index 80c886b38e0..6fc39081d52 100644
--- a/packages/create-freesewing-pattern/template/default/example/package.json
+++ b/packages/create-freesewing-pattern/template/default/example/package.json
@@ -1,7 +1,7 @@
 {
   "name": "{{name}}",
   "homepage": "https://{{name}}.freesewing.dev/",
-  "version": "{{version}}",
+  "version": "{{freesewing_version}}",
   "private": true,
   "dependencies": {
     "@fontsource/permanent-marker": "^4.1.0",
diff --git a/packages/create-freesewing-pattern/template/default/example/src/App.js b/packages/create-freesewing-pattern/template/default/example/src/App.js
index 3d1d9bcccfb..bff800ec505 100644
--- a/packages/create-freesewing-pattern/template/default/example/src/App.js
+++ b/packages/create-freesewing-pattern/template/default/example/src/App.js
@@ -2,7 +2,6 @@ import React from 'react'
 import freesewing from '@freesewing/core'
 import Workbench from '@freesewing/components/Workbench'
 import '@freesewing/css-theme'
-import './layout.scss'
 
 import Pattern from 'pattern'