generator-jscad 2.1.2 → 3.0.0

package/README.md

@@ -17,6 +17,14 @@ Then generate your new project:
 yo jscad
 ```
 
+You can select the type of project you want to build. A single object project is the default. You can create a multi object project with selection via a dropdown list or a set of check boxes. These are more complex, but allow you to organize and view a much larger project.
+
+![yo jscad cli example](./yo-jscad.gif)
+
+You can also create a VitePress site with a live viewer.
+
+![example vuepress site](./example.gif)
+
 ## Running
 
 The jscad project uses gulp to create a `dist` directory and watch for changes. You can drag the `dist` directory into the drop area on [openjscad.org](http://openjscad.org). Make sure you check `Auto Reload` and any time you save, glup will recreate the `dist` directory files and your model should refresh.
@@ -27,7 +35,7 @@ The example project uses [jscad-utils](https://www.npmjs.com/package/jscad-utils
 
 ## License
 
-MIT © [John Cole](https://johnwebbcole.gitlab.io/)
+MIT © [John Cole](https://jwc.dev/)
 
 [npm-image]: https://badge.fury.io/js/generator-jscad.svg
 [npm-url]: https://npmjs.org/package/generator-jscad

package/generators/app/index.js

@@ -35,6 +35,20 @@ module.exports = class extends Generator {
         message: 'Description',
         default: this.config.get('description')
       },
+      {
+        name: 'projectType',
+        message: 'What type of project?',
+        default: this.config.get('projectType'),
+        type: 'list',
+        choices: [
+          { name: 'single part', value: 'single' },
+          { name: 'multiple parts choose with a list', value: 'multi-list' },
+          {
+            name: 'multiple parts choose with a checkbox',
+            value: 'multi-checkbox'
+          }
+        ]
+      },
       {
         name: 'author',
         message: 'Author',
@@ -47,12 +61,13 @@ module.exports = class extends Generator {
       }
     ];
 
-    return this.prompt(prompts).then(props => {
+    return this.prompt(prompts).then((props) => {
       // To access props later use this.props.someAnswer;
       this.props = props;
 
       this.config.set('name', this.props.name);
       this.config.set('description', this.props.description);
+      this.config.set('projectType', this.props.projectType);
       this.config.set('author', this.props.author);
       this.config.set('homepage', this.props.homepage);
     });
@@ -108,8 +123,14 @@ module.exports = class extends Generator {
      * Do not overwrite the main code file.
      */
     if (!this.fs.exists(this.props.name + '.jscad')) {
+      var template =
+        this.props.projectType == 'single'
+          ? 'main.jscad'
+          : this.props.projectType == 'multi-list'
+          ? 'main-list.jscad'
+          : 'main-checkbox.jscad';
       this.fs.copyTpl(
-        this.templatePath('main.jscad'),
+        this.templatePath(template),
         this.destinationPath(this.props.name + '.jscad'),
         {
           name: this.props.name,
@@ -135,6 +156,11 @@ module.exports = class extends Generator {
       this.templatePath('_gitlab-ci.yml'),
       this.destinationPath('.gitlab-ci.yml')
     );
+
+    this.fs.copy(
+      this.templatePath('prettier.config.js'),
+      this.destinationPath('prettier.config.js')
+    );
   }
 
   install() {
@@ -144,4 +170,23 @@ module.exports = class extends Generator {
       this.composeWith(require.resolve('generator-git-init'), {});
     }
   }
+
+  end() {
+    this.log(`
+
+jscad generator is finished.
+
+Available scripts:
+
+Bundle the '${this.props.name + '.jscad'}' file into the 'dist' directory.
+npm start
+
+Run the development VuePress site.
+npm run serve
+
+Build the 'dist' directory and the VuePress site.
+npm run build
+
+`);
+  }
 };

package/generators/app/templates/_gitignore

@@ -19,4 +19,7 @@ coverage
 
 # Dependency directories
 node_modules/
-public
+public
+
+.vitepress/dist
+.vitepress/cache

package/generators/app/templates/_gitlab-ci.yml

@@ -4,6 +4,9 @@ pages:
   script:
     - npm install
     - npm run build
+    - npm run docs:build
+    - mv .vitepress/dist public
+    - cp dist/PiPiece.jscad public/
     - ls -al -R public
   artifacts:
     paths:

package/generators/app/templates/_vitepress/config.mjs

@@ -0,0 +1,26 @@
+import { defineConfig } from 'vitepress'
+
+// https://vitepress.dev/reference/site-config
+export default defineConfig({
+  title: "<%= name %>",
+  description: "<%= description %>",
+  srcDir: '.',
+  rewrites: {
+    'README.md': 'index.md'
+  },
+  themeConfig: {
+    // https://vitepress.dev/reference/default-theme-config
+    nav: [
+      { text: 'Home', link: '/' }
+    ],
+
+    socialLinks: [
+      { icon: 'gitlab', link: 'https://gitlab.com/johnwebbcole/<%= name %>' }
+    ]
+  },
+  vite: {
+    ssr: {
+      noExternal: ['@jwc/vue-openjscad', 'debug']
+    }
+  }
+})

package/generators/app/templates/_vitepress/theme/components/VuepressOpenJscad.vue

@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <ClientOnly>
+      <OpenJscad v-bind="$attrs"></OpenJscad>
+    </ClientOnly>
+  </div>
+</template>
+
+<script setup>
+import { defineClientComponent } from 'vitepress';
+
+const OpenJscad = defineClientComponent(() => {
+  return import('@jwc/vue-openjscad/')
+})
+</script>
+
+

package/generators/app/templates/_vitepress/theme/custom.css

@@ -0,0 +1,6 @@
+/* Custom styles for your VitePress site */
+
+/* Add your custom CSS here */
+.custom-component {
+  /* Example styles */
+}

package/generators/app/templates/_vitepress/theme/index.js

@@ -0,0 +1,13 @@
+import DefaultTheme from 'vitepress/theme'
+import './custom.css'
+
+// Import your custom components
+import VuepressOpenJscad from './components/VuepressOpenJscad.vue'
+
+export default {
+  extends: DefaultTheme,
+  enhanceApp({ app }) {
+    // Register global components
+    app.component('VuepressOpenJscad', VuepressOpenJscad)
+  }
+}

package/generators/app/templates/gulpfile.js

@@ -1,28 +1,33 @@
-/* globals require */
-var gulp = require('gulp');
-var del = require('del');
-var jscadFiles = require('gulp-jscad-files');
-var merge2 = require('merge2');
-var debug = require('gulp-debug');
-var inject = require('gulp-inject');
-var plumber = require('gulp-plumber');
-var terser = require('gulp-terser');
+/* globals import */
+import { deleteSync } from 'del';
+import { readFileSync } from 'fs';
+import gulp from 'gulp';
+import debug from 'gulp-debug';
+import inject from 'gulp-inject';
+import jscadFiles from 'gulp-jscad-files';
+import { getInjected } from 'gulp-jscad-files/getPackage.js';
+import plumber from 'gulp-plumber';
+import terser from 'gulp-terser';
+import merge2 from 'merge2';
 
-gulp.task('clean', function(done) {
-  del(['dist/*']).then(paths => {
-    console.log('Deleted files and folders:\n', paths.join('\n')); // eslint-disable-line no-console, no-undef
-    done();
-  });
+const pkg = JSON.parse(readFileSync('./package.json', 'utf8'));
+
+
+gulp.task('clean', function (done) {
+  const paths = deleteSync(['dist/*'])
+  console.log('Deleted files and folders:\n', paths.join('\n')); // eslint-disable-line no-console, no-undef
+  done();
 });
 
-gulp.task('inject', function() {
+gulp.task('inject', function () {
   return gulp
     .src('<%= name %>.jscad')
     .pipe(plumber())
+    .pipe(debug({ title: 'start:' }))
     .pipe(
       inject(
         merge2(
-          gulp.src(['*.jscad'], { ignore: ['<%= name %>.jscad'] }),
+          gulp.src(['*.jscad'], { ignore: ['<%= name %>.jscad'] }).pipe(debug({ title: 'src:' })),
           gulp
             .src('package.json')
             .pipe(jscadFiles())
@@ -37,13 +42,13 @@ gulp.task('inject', function() {
                   max_line_len: 80
                 }
               })
-            )
+            ).pipe(debug({ title: 'package.json:' }))
         ).pipe(debug({ title: 'injecting:' })),
         {
           relative: true,
           starttag: '// include:js',
           endtag: '// endinject',
-          transform: function(filepath, file) {
+          transform: function (filepath, file) {
             return '// ' + filepath + '\n' + file.contents.toString('utf8');
           }
         }
@@ -52,30 +57,30 @@ gulp.task('inject', function() {
     .pipe(gulp.dest('dist'));
 });
 
+
 gulp.task(
-  'vuepress',
-  gulp.series(['inject'], function() {
+  'vitepress',
+  gulp.series('inject', function () {
     return gulp
       .src('dist/<%= name %>.jscad')
-      .pipe(debug({ title: 'vuepress:' }))
-      .pipe(gulp.dest('.vuepress/public/'));
+      .pipe(debug({ title: 'vitepress:' }))
+      .pipe(gulp.dest('.vitepress/public/'));
   })
 );
 
 gulp.task(
   'default',
-  gulp.series(['clean', 'inject'], function() {
+  gulp.series('clean', 'inject', function () {
     gulp.watch(
-      ['**/*.jscad', 'node_modules/'],
+      ['**/*.jscad', ...getInjected(pkg)],
       {
-        verbose: true,
         followSymlinks: true,
         delay: 500,
         queue: false,
         ignoreInitial: false,
-        ignored: ['**/*.*~', 'dist/*', '.vuepress/*']
+        ignored: ['**/*.*~', 'dist/*', '.vuepress/*', 'public', 'node_modules']
       },
-      gulp.series(['inject'])
+      gulp.series('inject')
     );
   })
 );

package/generators/app/templates/main-checkbox.jscad

@@ -0,0 +1,181 @@
+// title      : <%= nameslug %>
+// author     : <%= author %>
+// license    : ISC License
+// file       : <%= nameslug %>.jscad
+
+/* exported main, getParameterDefinitions */
+
+/** @type {import('@jwc/jscad-utils')} JscadUtils */
+var util;
+
+function getParameterDefinitions() {
+  /**
+   * Add the keys to the `Parts` object
+   * here and they will be listed in the
+   * parameters.
+   * @type {Record<string, boolean>}
+   */
+  var ENABLED = {
+    example1: true,
+    example2: false
+  };
+
+  return [
+    { type: 'group', name: 'Parts' },
+    ...Object.keys(ENABLED).map((name) => {
+      return {
+        name,
+        type: 'checkbox',
+        checked: ENABLED[name]
+      };
+    }),
+    {
+      name: 'resolution',
+      type: 'choice',
+      values: [0, 1, 2, 3, 4],
+      captions: [
+        'low (8,24)',
+        'normal (12,32)',
+        'high (24,64)',
+        'very high (48,128)',
+        'ultra high (96,256)'
+      ],
+      default: 0,
+      initial: 0,
+      caption: 'Resolution:'
+    },
+    { type: 'group', name: 'View' },
+    {
+      name: 'center',
+      type: 'checkbox',
+      checked: false
+    },
+    { type: 'group', name: 'Cutaway' },
+    {
+      name: 'cutawayEnable',
+      caption: 'Enable:',
+      type: 'checkbox',
+      checked: false
+    },
+    {
+      name: 'cutawayAxis',
+      type: 'choice',
+      values: ['x', 'y', 'z'],
+      initial: 'y',
+      caption: 'Axis:'
+    }
+  ];
+}
+
+/**
+ *
+ * @param {object} params
+ * @param {boolean} params.example1
+ * @param {boolean} params.example2
+ * @param {"0"|"1"|"2"|"3"|"4"} params.resolution
+ * @param {boolean} params.center
+ * @param {boolean} params.cutawayEnable
+ * @param {'x'|'y'|'z'} params.cutawayAxis
+ * @returns {CSG[]}
+ */
+function main(params) {
+  var start = performance.now();
+  var resolutions = [
+    [6, 16],
+    [8, 24],
+    [12, 32],
+    [24, 64],
+    [48, 128]
+  ];
+  var [defaultResolution3D, defaultResolution2D] = resolutions[
+    parseInt(params.resolution)
+  ];
+  CSG.defaultResolution3D = defaultResolution3D;
+  CSG.defaultResolution2D = defaultResolution2D;
+  util.init(CSG);
+
+  /**
+   * The `Parts` object needs to contain
+   * the values from the `ENABLED` object.
+   */
+  var Parts = {
+    example1: () => example1(),
+    example2: () => example2()
+  };
+
+  var selectedParts = Object.entries(Parts)
+    .filter(([key, value]) => {
+      return params[key];
+    })
+    .reduce((parts, [key, value]) => {
+      var part = value();
+      if (Array.isArray(part)) parts = parts.concat(part);
+      else parts.push(part);
+      return parts;
+    }, []);
+
+  console.log('selectedParts', selectedParts);
+  var parts = selectedParts.length ? selectedParts : [util.unitAxis(20)];
+
+  if (params.center) parts = [union(parts).Center()];
+  if (params.cutawayEnable)
+    parts = [util.bisect(union(parts), params.cutawayAxis).parts.positive];
+
+  console.log('timer', performance.now() - start);
+
+  /**
+   * If you are using @jwc/jscad-hardware and want
+   * a Bill Of Materials (BOM), uncomment this and
+   * open the DevTools console to see the BOM
+   * list.
+   */
+  // console.log(
+  //   'BOM\n',
+  //   Object.entries(Hardware.BOM)
+  //     .map(([key, value]) => `${key}: ${value}`)
+  //     .join('\n')
+  // );
+
+  console.log('parts', ...parts);
+
+  return [...parts];
+}
+
+function example1() {
+  var box1 = Parts.Cube([10, 10, 10]).fillet(1, 'z+').color('orange');
+
+  var box2 = Parts.Cube([5, 5, 5])
+    .snap(box1, 'z', 'outside-')
+    .align(box1, 'xy');
+
+  var cyl1 = Parts.Cylinder(5, 10)
+    .chamfer(2, 'z+')
+    .rotateX(90)
+    .snap(box2, 'y', 'outside+')
+    .align(box2, 'xz')
+    .color('green');
+  return box1
+    .union([box2.fillet(-1, 'z-').color('blue'), cyl1])
+    .translate([0, 10, 0]);
+}
+
+function example2() {
+  var box1 = Parts.Cube([10, 10, 10]).fillet(1, 'z+').color('orange');
+
+  return box1
+    .center()
+    .wedge(30, -30, 'x')
+    .map((part, name) => {
+      if (name == 'wedge') return part.translate([0, 5, 0]);
+      return part;
+    })
+    .combine()
+    .translate([0, -10, 0]);
+}
+
+// ********************************************************
+// Other jscad libraries are injected here.  Do not remove.
+// Install jscad libraries using NPM
+// ********************************************************
+// include:js
+// endinject

package/generators/app/templates/main-list.jscad

@@ -0,0 +1,154 @@
+// title      : <%= nameslug %>
+// author     : <%= author %>
+// license    : ISC License
+// file       : <%= nameslug %>.jscad
+
+/* exported main, getParameterDefinitions */
+
+function getParameterDefinitions() {
+  /**
+   * Add the keys to the `Parts` object
+   * here and they will be listed in the
+   * parameters.
+   */
+  var ENABLED = {
+    example1: true,
+    example2: false
+  };
+
+  return [
+    {
+      name: 'Parts',
+      type: 'choice',
+      values: Object.keys(ENABLED),
+      captions: Object.keys(ENABLED),
+      default: Object.keys(ENABLED)[0],
+      initial: Object.entries(ENABLED).find(([name, value]) => value)[0],
+      caption: 'Part:'
+    },
+    {
+      name: 'resolution',
+      type: 'choice',
+      values: [0, 1, 2, 3, 4],
+      captions: [
+        'low (8,24)',
+        'normal (12,32)',
+        'high (24,64)',
+        'very high (48,128)',
+        'ultra high (96,256)'
+      ],
+      default: 0,
+      initial: 0,
+      caption: 'Resolution:'
+    },
+    { type: 'group', name: 'View' },
+    {
+      name: 'center',
+      type: 'checkbox',
+      checked: false
+    },
+    { type: 'group', name: 'Cutaway' },
+    {
+      name: 'cutawayEnable',
+      caption: 'Enable:',
+      type: 'checkbox',
+      checked: false
+    },
+    {
+      name: 'cutawayAxis',
+      type: 'choice',
+      values: ['x', 'y', 'z'],
+      initial: 'y',
+      caption: 'Axis:'
+    }
+  ];
+}
+function main(params) {
+  var start = performance.now();
+  var resolutions = [
+    [6, 16],
+    [8, 24],
+    [12, 32],
+    [24, 64],
+    [48, 128]
+  ];
+  var [defaultResolution3D, defaultResolution2D] = resolutions[
+    parseInt(params.resolution)
+  ];
+  CSG.defaultResolution3D = defaultResolution3D;
+  CSG.defaultResolution2D = defaultResolution2D;
+  util.init(CSG);
+
+  /**
+   * The `Parts` object needs to contain
+   * the values from the `ENALBED` object.
+   */
+  var Parts = {
+    example1: () => example1(),
+    example2: () => example2()
+  };
+
+  var selectedParts = [Parts[params.Parts]()];
+
+  console.log('selectedParts', selectedParts);
+  var parts = selectedParts.length ? selectedParts : [util.unitAxis(20)];
+
+  if (params.center) parts = [union(parts).Center()];
+  if (params.cutawayEnable)
+    parts = [util.bisect(union(parts), params.cutawayAxis).parts.positive];
+
+  console.log('timer', performance.now() - start);
+
+  /**
+   * If you are using @jwc/jscad-hardware and want
+   * a Bill Of Materials (BOM), uncomment this and
+   * open the DevTools console to see the BOM
+   * list.
+   */
+  // console.log(
+  //   'BOM\n',
+  //   Object.entries(Hardware.BOM)
+  //     .map(([key, value]) => `${key}: ${value}`)
+  //     .join('\n')
+  // );
+
+  console.log('parts', ...parts);
+
+  return [...parts];
+}
+
+function example1() {
+  var box1 = Parts.Cube([10, 10, 10]).fillet(1, 'z+').color('orange');
+
+  var box2 = Parts.Cube([5, 5, 5])
+    .snap(box1, 'z', 'outside-')
+    .align(box1, 'xy');
+
+  var cyl1 = Parts.Cylinder(5, 10)
+    .chamfer(2, 'z+')
+    .rotateX(90)
+    .snap(box2, 'y', 'outside+')
+    .align(box2, 'xz')
+    .color('green');
+  return box1.union([box2.fillet(-1, 'z-').color('blue'), cyl1]);
+}
+
+function example2() {
+  var box1 = Parts.Cube([10, 10, 10]).fillet(1, 'z+').color('orange');
+
+  return box1
+    .center()
+    .wedge(30, -30, 'x')
+    .map((part, name) => {
+      if (name == 'wedge') return part.translate([0, 5, 0]);
+      return part;
+    })
+    .combine();
+}
+
+// ********************************************************
+// Other jscad libraries are injected here.  Do not remove.
+// Install jscad libraries using NPM
+// ********************************************************
+// include:js
+// endinject

package/generators/app/templates/main.jscad

@@ -18,6 +18,7 @@ function getParameterDefinitions() {
         'high (24,64)',
         'very high (48,128)'
       ],
+      default: 2,
       initial: 2,
       caption: 'Resolution:'
     }
@@ -25,14 +26,21 @@ function getParameterDefinitions() {
 }
 
 function main(params) {
-  var resolutions = [[6, 16], [8, 24], [12, 32], [24, 64], [48, 128]];
-  CSG.defaultResolution3D = resolutions[params.resolution][0];
-  CSG.defaultResolution2D = resolutions[params.resolution][1];
+  var resolutions = [
+    [6, 16],
+    [8, 24],
+    [12, 32],
+    [24, 64],
+    [48, 128]
+  ];
+  var [defaultResolution3D, defaultResolution2D] = resolutions[
+    parseInt(params.resolution)
+  ];
+  CSG.defaultResolution3D = defaultResolution3D;
+  CSG.defaultResolution2D = defaultResolution2D;
   util.init(CSG);
 
-  var box1 = Parts.Cube([10, 10, 10])
-    .fillet(1, 'z+')
-    .color('orange');
+  var box1 = Parts.Cube([10, 10, 10]).fillet(1, 'z+').color('orange');
 
   var box2 = Parts.Cube([5, 5, 5])
     .snap(box1, 'z', 'outside-')

package/generators/app/templates/package.json

@@ -6,30 +6,35 @@
   "scripts": {
     "start": "gulp",
     "clean": "gulp clean",
-    "inject": "gulp inject",
+    "build": "gulp inject",
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "gulp vuepress && cross-env BASEPATH=/<%= name %>/ vuepress build",
-    "serve": "gulp vuepress && vuepress dev"
+    "docs:dev": "vitepress dev",
+    "docs:build": "vitepress build",
+    "docs:preview": "vitepress preview"
   },
   "author": "<%= author %>",
   "license": "ISC",
-  "dependencies": {
-    "jscad-utils": "^3.0.0"
-  },
   "devDependencies": {
     "@jscad/web": "^1.10.0",
-    "@jwc/vue-openjscad": "^1.0.3",
-    "cross-env": "^5.2.0",
-    "del": "^3.0.0",
-    "gulp": "^4.0.0",
-    "gulp-cli": "^2.0.1",
-    "gulp-debug": "^4.0.0",
-    "gulp-inject": "^5.0.0",
-    "gulp-jscad-files": "^3.0.0",
+    "@jwc/vue-openjscad": "2.0.4",
+    "copy-dir": "0.3.0",
+    "cross-env": "10.0.0",
+    "del": "8.0.1",
+    "gulp": "5.0.1",
+    "gulp-cli": "3.1.0",
+    "gulp-debug": "5.0.1",
+    "gulp-inject": "^5.0.4",
+    "gulp-jscad-files": "^4.0.0",
     "gulp-plumber": "^1.1.0",
-    "gulp-terser": "^1.1.6",
+    "gulp-terser": "^2.0.1",
     "gulp-watch": "^5.0.1",
-    "merge2": "^1.2.3",
-    "vuepress": "^0.14.8"
+    "merge2": "^1.3.0",
+    "vitepress": "2.0.0-alpha.12"
+  },
+  "dependencies": {
+    "@jscad/scad-api": "0.5.1",
+    "@jwc/jscad-hardware": "3.3.0",
+    "@jwc/jscad-raspberrypi": "3.2.1",
+    "@jwc/jscad-utils": "4.9.0"
   }
 }

package/generators/app/templates/prettier.config.js

@@ -0,0 +1,7 @@
+// prettier.config.js or .prettierrc.js
+module.exports = {
+    trailingComma: 'none',
+    tabWidth: 2,
+    semi: true,
+    singleQuote: true
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-jscad",
-  "version": "2.1.2",
+  "version": "3.0.0",
   "description": "Create a jscad project",
   "homepage": "https://gitlab.com/johnwebbcole/generator-jscad",
   "author": {
@@ -17,29 +17,29 @@
     "yeoman-generator"
   ],
   "devDependencies": {
-    "conventional-changelog-cli": "^2.0.11",
-    "coveralls": "^3.0.2",
-    "eslint": "^5.9.0",
-    "eslint-config-prettier": "^3.3.0",
-    "eslint-config-xo": "^0.25.0",
-    "eslint-plugin-prettier": "^3.0.0",
-    "husky": "^1.2.0",
-    "jest": "^23.5.0",
-    "lint-staged": "^8.1.0",
-    "np": "^3.1.0",
-    "prettier": "^1.15.2",
+    "conventional-changelog-cli": "^2.0.34",
+    "coveralls": "^3.1.0",
+    "eslint": "^7.3.0",
+    "eslint-config-prettier": "^6.11.0",
+    "eslint-config-xo": "^0.31.0",
+    "eslint-plugin-prettier": "^3.1.4",
+    "husky": "^4.2.5",
+    "jest": "^26.0.1",
+    "lint-staged": "^10.2.11",
+    "np": "^6.2.4",
+    "prettier": "^2.0.5",
     "yeoman-assert": "^3.1.0",
-    "yeoman-test": "^1.7.0"
+    "yeoman-test": "^2.6.0"
   },
   "engines": {
     "npm": ">= 4.0.0"
   },
   "dependencies": {
-    "chalk": "^2.1.0",
-    "command-exists": "^1.2.8",
+    "chalk": "^4.1.0",
+    "command-exists": "^1.2.9",
     "generator-git-init": "^1.1.3",
-    "lodash": "^4.17.11",
-    "yeoman-generator": "^2.0.1",
+    "lodash": "^4.17.15",
+    "yeoman-generator": "^4.10.1",
     "yosay": "^2.0.1"
   },
   "jest": {

package/CHANGELOG.md

@@ -1,60 +0,0 @@
-## <small>2.1.2 (2019-01-12)</small>
-
-* cicd changes ([decc610](https://gitlab.com/johnwebbcole/generator-jscad/commit/decc610))
-
-
-
-## <small>2.1.1 (2019-01-12)</small>
-
-* 2.1.1 ([0461e7c](https://gitlab.com/johnwebbcole/generator-jscad/commit/0461e7c))
-* update watch to match v4 ([05d96f1](https://gitlab.com/johnwebbcole/generator-jscad/commit/05d96f1))
-
-
-
-## 2.1.0 (2019-01-06)
-
-* 2.1.0 ([d06e677](https://gitlab.com/johnwebbcole/generator-jscad/commit/d06e677))
-* add vuepress and vue-openjscad ([5204f44](https://gitlab.com/johnwebbcole/generator-jscad/commit/5204f44))
-* add vuepress and vue-openjscad ([dac022b](https://gitlab.com/johnwebbcole/generator-jscad/commit/dac022b))
-
-
-
-## <small>2.0.2 (2018-12-24)</small>
-
-* 2.0.2 ([7203c0e](https://gitlab.com/johnwebbcole/generator-jscad/commit/7203c0e))
-* renamed dot template files ([d23e7a0](https://gitlab.com/johnwebbcole/generator-jscad/commit/d23e7a0))
-
-
-
-## <small>2.0.1 (2018-12-24)</small>
-
-* 2.0.1 ([5208a2b](https://gitlab.com/johnwebbcole/generator-jscad/commit/5208a2b))
-* add lodash ([e53a8f0](https://gitlab.com/johnwebbcole/generator-jscad/commit/e53a8f0))
-
-
-
-## 2.0.0 (2018-12-24)
-
-* 2.0.0 ([a805277](https://gitlab.com/johnwebbcole/generator-jscad/commit/a805277))
-* add cicd ([d341b77](https://gitlab.com/johnwebbcole/generator-jscad/commit/d341b77))
-* add release script ([e90810a](https://gitlab.com/johnwebbcole/generator-jscad/commit/e90810a))
-* Added `node_modules` to watch list ([20d72d0](https://gitlab.com/johnwebbcole/generator-jscad/commit/20d72d0))
-* Added readme to generator and moved one into the project.  Camel cased the name to make it a valid o ([66880e6](https://gitlab.com/johnwebbcole/generator-jscad/commit/66880e6))
-* added yarn files ([8c96cff](https://gitlab.com/johnwebbcole/generator-jscad/commit/8c96cff))
-* changed to use new gulp-jscadfiles plugin ([567183f](https://gitlab.com/johnwebbcole/generator-jscad/commit/567183f))
-* Fix gulp file, it needed to be a template. ([ccab77e](https://gitlab.com/johnwebbcole/generator-jscad/commit/ccab77e))
-* Initial commit ([e43fb5b](https://gitlab.com/johnwebbcole/generator-jscad/commit/e43fb5b))
-* no message ([857331c](https://gitlab.com/johnwebbcole/generator-jscad/commit/857331c))
-* no message ([bb05b43](https://gitlab.com/johnwebbcole/generator-jscad/commit/bb05b43))
-* no message ([9572114](https://gitlab.com/johnwebbcole/generator-jscad/commit/9572114))
-* publish 1.0.1 ([8c26637](https://gitlab.com/johnwebbcole/generator-jscad/commit/8c26637))
-* Rebuit using `generator-generator`. ([d7ea44e](https://gitlab.com/johnwebbcole/generator-jscad/commit/d7ea44e))
-* removed fileExists dependency ([a239839](https://gitlab.com/johnwebbcole/generator-jscad/commit/a239839))
-* reset version ([0932c0e](https://gitlab.com/johnwebbcole/generator-jscad/commit/0932c0e))
-* updated dependencies ([93c19df](https://gitlab.com/johnwebbcole/generator-jscad/commit/93c19df))
-* updated example, added readme from generator. ([b0df213](https://gitlab.com/johnwebbcole/generator-jscad/commit/b0df213))
-* updated to use newer utils ([17b81ea](https://gitlab.com/johnwebbcole/generator-jscad/commit/17b81ea))
-* Updating to use `jscad-utils` 2.0 ([7ca7621](https://gitlab.com/johnwebbcole/generator-jscad/commit/7ca7621))
-
-
-

package/generators/app/templates/_vuepress/components/VuepressOpenJscad.vue

@@ -1,14 +0,0 @@
-<template>
-  <div>
-    <open-jscad v-bind="$attrs"></open-jscad>
-  </div>
-</template>
-<script>
-import OpenJscad from "@jwc/vue-openjscad";
-
-export default {
-  name: "VuepressOpenJscad",
-  components: { OpenJscad },
-  inheritAttrs: false
-};
-</script>

package/generators/app/templates/_vuepress/config.js

@@ -1,10 +0,0 @@
-const pkg = require('../package.json');
-module.exports = {
-  title: pkg.name,
-  description: pkg.description,
-  dest: 'public',
-  themeConfig: {
-    navbar: false
-  },
-  base: process.env.BASEPATH || '/'
-};