From b3600dce85b2c27fd18ab093e8aad53fd8e0bd06 Mon Sep 17 00:00:00 2001 From: jejacks0n Date: Fri, 4 Jun 2021 16:26:51 -0600 Subject: [PATCH] Adds eslint to dependencies and resolves code to match rules --- .../template/freesewing/config/index.js | 8 ++++---- .../template/freesewing/package.json | 7 ++++++- .../template/freesewing/rollup.config.js | 14 +++++--------- .../template/freesewing/src/box.js | 10 +++++----- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/packages/create-freesewing-pattern/template/freesewing/config/index.js b/packages/create-freesewing-pattern/template/freesewing/config/index.js index 04cf93b401a..644dc51cbbb 100644 --- a/packages/create-freesewing-pattern/template/freesewing/config/index.js +++ b/packages/create-freesewing-pattern/template/freesewing/config/index.js @@ -19,10 +19,10 @@ export default { 'parametric design', '{{type}}', 'sewing', - 'sewing pattern', + 'sewing pattern' ], optionGroups: { - fit: ['size'], + fit: ['size'] }, measurements: [], dependencies: {}, @@ -30,6 +30,6 @@ export default { hide: [], parts: ['box'], options: { - size: { pct: 50, min: 10, max: 100 }, - }, + size: { pct: 50, min: 10, max: 100 } + } } diff --git a/packages/create-freesewing-pattern/template/freesewing/package.json b/packages/create-freesewing-pattern/template/freesewing/package.json index ea695b317f6..0e14e97e636 100644 --- a/packages/create-freesewing-pattern/template/freesewing/package.json +++ b/packages/create-freesewing-pattern/template/freesewing/package.json @@ -49,6 +49,11 @@ "axios": "0.21.1", "react-intl": "5.17.6", "prop-types": "15.7.2", - "file-saver": "^2.0.5" + "file-saver": "^2.0.5", + "eslint": "^7.27.0", + "eslint-config-standard": "^16.0.3", + "eslint-config-standard-react": "^11.0.1", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^5.1.0" } } diff --git a/packages/create-freesewing-pattern/template/freesewing/rollup.config.js b/packages/create-freesewing-pattern/template/freesewing/rollup.config.js index 95f81f0a005..6ae87bfc4ff 100644 --- a/packages/create-freesewing-pattern/template/freesewing/rollup.config.js +++ b/packages/create-freesewing-pattern/template/freesewing/rollup.config.js @@ -5,22 +5,20 @@ import commonjs from '@rollup/plugin-commonjs' import json from '@rollup/plugin-json' import { terser } from 'rollup-plugin-terser' import peerDepsExternal from 'rollup-plugin-peer-deps-external' -//import postcss from 'rollup-plugin-postcss' -import { name, version, description, author, license } from './package.json' - -import pkg from './package.json' +// import postcss from 'rollup-plugin-postcss' +import { main, module, name, version, description, author, license } from './package.json' export default { input: 'src/index.js', output: [ { - file: pkg.main, + file: main, format: 'cjs', sourcemap: true, exports: 'default' }, { - file: pkg.module, + file: module, format: 'es', sourcemap: true, exports: 'default' @@ -28,9 +26,7 @@ export default { ], plugins: [ peerDepsExternal(), - //postcss({ - // modules: true - //}), + // postcss({ modules: true }), url({ exclude: ['**/*.svg'] }), babel({ exclude: 'node_modules/**' diff --git a/packages/create-freesewing-pattern/template/freesewing/src/box.js b/packages/create-freesewing-pattern/template/freesewing/src/box.js index c125e539df4..c8c6f4b07d8 100644 --- a/packages/create-freesewing-pattern/template/freesewing/src/box.js +++ b/packages/create-freesewing-pattern/template/freesewing/src/box.js @@ -1,5 +1,5 @@ export default function (part) { - let { + const { options, Point, Path, @@ -10,10 +10,10 @@ export default function (part) { complete, sa, paperless, - macro, + macro } = part.shorthand() - let w = 500 * options.size + const w = 500 * options.size points.topLeft = new Point(0, 0) points.topRight = new Point(w, 0) points.bottomLeft = new Point(0, w / 2) @@ -47,12 +47,12 @@ export default function (part) { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + sa + 15, + y: points.bottomLeft.y + sa + 15 }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 15, + x: points.topRight.x + sa + 15 }) }