diff --git a/packages/create-freesewing-pattern/lib/cli.js b/packages/create-freesewing-pattern/lib/cli.js index 5f160c922f1..330688cbaa8 100755 --- a/packages/create-freesewing-pattern/lib/cli.js +++ b/packages/create-freesewing-pattern/lib/cli.js @@ -4,6 +4,7 @@ const path = require("path"); const chalk = require("chalk"); const program = require("commander"); +const strings = require("@freesewing/i18n").strings; const { version } = require("../package"); const getDefaultLibraryParams = require("./get-default-library-params"); @@ -50,7 +51,8 @@ module.exports = async () => { template: program.template, templatePath: program.templatePath, skipPrompts: program.skipPrompts, - git: program.git + git: program.git, + version }; Object.keys(opts).forEach(key => { @@ -71,18 +73,27 @@ module.exports = async () => { const dest = await createLibrary(params); console.log(` +🎉 ${strings[params.language]["cfp.patternCreated"]} ${chalk.bold(dest)} -Your pattern skeleton has been created at ${dest}. +${strings[params.language]["cfp.runTheseCommands"]}: -Before you start hacking, run these two commands, each in their own terminal: + - ${strings[params.language]["cfp.startRollup"]} -In one terminal, start the rollup bundler in watch mode: -$ ${chalk.cyan(`cd ${params.shortName} && ${params.manager} start`)} + 👉 ${chalk.cyan(`cd ${params.shortName} && ${params.manager} start`)} -And in another terminal, run the dev server: -$ ${chalk.cyan( + - ${strings[params.language]["cfp.startWebpack"]} + + 👉 ${chalk.cyan( `cd ${path.join(params.shortName, "example")} && ${params.manager} start` )} + + +${strings[params.language]["cfp.devDocsAvailableAt"]} + ${chalk.bold("https://" + params.language + ".freesewing.dev/")} + +${strings[params.language]["cfp.talkToUs"]} + ${chalk.bold("https://gitter.im/freesewing/freesewing")} + `); return dest; diff --git a/packages/create-freesewing-pattern/lib/prompt-library-params.js b/packages/create-freesewing-pattern/lib/prompt-library-params.js index 17168fa6cac..ffb65ec2988 100644 --- a/packages/create-freesewing-pattern/lib/prompt-library-params.js +++ b/packages/create-freesewing-pattern/lib/prompt-library-params.js @@ -123,7 +123,8 @@ module.exports = async opts => { return { ...info, - git: opts.git + git: opts.git, + version: opts.version }; } }; diff --git a/packages/create-freesewing-pattern/template/default/example/package.json b/packages/create-freesewing-pattern/template/default/example/package.json index f60b63a7d65..c9137f7540d 100644 --- a/packages/create-freesewing-pattern/template/default/example/package.json +++ b/packages/create-freesewing-pattern/template/default/example/package.json @@ -7,8 +7,20 @@ "react": "^16.5.2", "react-dom": "^16.5.2", "react-scripts": "2.0.4", - "freesewing": "^0.30.6", - "{{name}}": "{{#if yarn}}link:..{{else}}file:..{{/if}}" + "@freesewing/core": "^{{version}}", + "@freesewing/plugin-bundle": "^{{version}}", + "@freesewing/plugin-bust": "^{{version}}", + "@freesewing/plugin-buttons": "^{{version}}", + "@freesewing/plugin-flip": "^{{version}}", + "@freesewing/plugin-debug": "^{{version}}", + "@freesewing/plugin-theme": "^{{version}}", + "@freesewing/plugin-designer": "^{{version}}", + "@freesewing/i18n": "^{{version}}", + "@freesewing/components": "^{{version}}", + "@freesewing/css-theme": "^{{version}}", + "@freesewing/mui-theme": "^{{version}}", + "typeface-roboto-condensed": "^0.0.54", + "pattern": "{{#if yarn}}link:..{{else}}file:..{{/if}}" }, "scripts": { "start": "react-scripts start", 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 328f684daff..ade52c791bc 100644 --- a/packages/create-freesewing-pattern/template/default/example/src/App.js +++ b/packages/create-freesewing-pattern/template/default/example/src/App.js @@ -1,14 +1,18 @@ import React, { Component } from "react"; -import freesewing from "freesewing"; +import freesewing from "@freesewing/core"; +import { Workbench } from "@freesewing/components"; + +import "typeface-roboto-condensed"; +import "@freesewing/css-theme"; import "./App.css"; -import ExampleComponent from "{{name}}"; +import Pattern from "pattern"; class App extends Component { render() { console.log(freesewing); - console.log({ ExampleComponent }); - return

hi there

; + console.log({ Pattern }); + return ; } } diff --git a/packages/create-freesewing-pattern/template/default/package.json b/packages/create-freesewing-pattern/template/default/package.json index b86c19394db..f08d48e1a91 100644 --- a/packages/create-freesewing-pattern/template/default/package.json +++ b/packages/create-freesewing-pattern/template/default/package.json @@ -47,19 +47,19 @@ "@babel/plugin-syntax-import-meta": "^7.0.0", "@babel/preset-env": "^7.0.0", "@babel/preset-react": "^7.0.0", - "@freesewing/core": "2.0.0-alpha.3", - "@freesewing/plugin-bundle": "2.0.0-alpha.3", - "@freesewing/components": "2.0.0-alpha.3", - "@freesewing/css-theme": "2.0.0-alpha.3", - "@freesewing/i18n": "2.0.0-alpha.3", - "@freesewing/mui-theme": "2.0.0-alpha.3", - "@freesewing/patterns": "2.0.0-alpha.3", - "@freesewing/plugin-bust": "2.0.0-alpha.3", - "@freesewing/plugin-buttons": "2.0.0-alpha.3", - "@freesewing/plugin-debug": "2.0.0-alpha.3", - "@freesewing/plugin-designer": "2.0.0-alpha.3", - "@freesewing/plugin-flip": "2.0.0-alpha.3", - "@freesewing/utils": "2.0.0-alpha.3", + "@freesewing/core": "^2.0.0-alpha.3", + "@freesewing/plugin-bundle": "^2.0.0-alpha.3", + "@freesewing/components": "^2.0.0-alpha.3", + "@freesewing/css-theme": "^2.0.0-alpha.3", + "@freesewing/i18n": "^2.0.0-alpha.3", + "@freesewing/mui-theme": "^2.0.0-alpha.3", + "@freesewing/patterns": "^2.0.0-alpha.3", + "@freesewing/plugin-bust": "^2.0.0-alpha.3", + "@freesewing/plugin-buttons": "^2.0.0-alpha.3", + "@freesewing/plugin-debug": "^2.0.0-alpha.3", + "@freesewing/plugin-designer": "^2.0.0-alpha.3", + "@freesewing/plugin-flip": "^2.0.0-alpha.3", + "@freesewing/utils": "^2.0.0-alpha.3", "@svgr/rollup": "^2.4.1", "babel-eslint": "^10.0.1", "cross-env": "^5.1.4", diff --git a/packages/create-freesewing-pattern/template/default/src/index.js b/packages/create-freesewing-pattern/template/default/src/index.js index 93fc49b6132..de76f773dc2 100644 --- a/packages/create-freesewing-pattern/template/default/src/index.js +++ b/packages/create-freesewing-pattern/template/default/src/index.js @@ -1,69 +1,12 @@ -/* - * This file was created by create-freesewing-pattern - * -> https://github.com/freesewing/create-freesewing-pattern - * - * Freesewing documentation: - * -> https://beta.freesewing.org/en/docs/developer - * - * Freesewing help & advice: - * -> https://gitter.im/freesewing/freesewing - */ -import freesewing from "freesewing"; +import freesewing from "@freesewing/core"; +import plugins from "@freesewing/plugins"; import config from "../config"; - -/* - * Our most popular plugins are part of the plugin bundle - * which is already installed and imported. - * If you need additional plugins, you should install and - * import them. - * - * A list of all plugins is available at: - * -> https://beta.freesewing.org/en/docs/developer/plugins - */ -import plugins from "@freesewing/plugin-bundle"; -// import buttons from "@freesewing/plugin-buttons"; - -/* - * If you want to extend an existing pattern, you should - * install it as a dev-dependency, and then import it. - * - * A list of all patterns is available at: - * -> https://beta.freesewing.org/en/patterns - */ -//import Brian from "@freesewing/brian"; - -/* - * It's a best practice to put each pattern part in its own file: - * -> https://beta.freesewing.org/en/docs/developer/do - */ import draftBox from "./box"; -/* Create new design*/ -const {{name}} = new freesewing.Design(config, [ - plugins, - //buttons -]); +// Create new design +const Pattern = new freesewing.Design(config, plugins); -/* - * If you want to extend an existing pattern, you should - * attach those draft methods you need to the design prototype - * as such: - */ -//{{name}}.prototype.draftBrianBase = function(part) { -// return new Brian(this.settings).draftBase(part); -//}; -//{{name}}.prototype.draftBrianBack = function(part) { -// return new Brian(this.settings).draftBack(part); -//}; -//{{name}}.prototype.draftBrianFront = function(part) { -// return new Brian(this.settings).draftFront(part); -//}; +// Attach the draft methods to the prototype +Pattern.prototype.draftBox = draftBox; -/* - * Attach the draft methods of your own parts to the - * design prototype as such: - */ -{{name}}.prototype.draftBox = draftBox; - -// Export your design -export default {{name}}; +export default Pattern; diff --git a/packages/i18n/rollup.config.js b/packages/i18n/rollup.config.js index f822e093103..dbee92ea2c2 100644 --- a/packages/i18n/rollup.config.js +++ b/packages/i18n/rollup.config.js @@ -38,11 +38,11 @@ export default { babel({ exclude: "node_modules/**", plugins: ["@babel/plugin-proposal-object-rest-spread"] + }), + minify({ + comments: false, + sourceMap: true, + banner: `/**\n * ${name} | v${version}\n * ${description}\n * (c) ${new Date().getFullYear()} ${author}\n * @license ${license}\n */` }) - //minify({ - // comments: false, - // sourceMap: true, - // banner: `/**\n * ${name} | v${version}\n * ${description}\n * (c) ${new Date().getFullYear()} ${author}\n * @license ${license}\n */` - //}) ] }; diff --git a/packages/i18n/src/locales/de/cfp.yaml b/packages/i18n/src/locales/de/cfp.yaml index 698a93322ac..c5cb8e4c563 100644 --- a/packages/i18n/src/locales/de/cfp.yaml +++ b/packages/i18n/src/locales/de/cfp.yaml @@ -4,3 +4,10 @@ packageManager: Paket-Manager patternDescription: Schnittmusterbeschreibung patternName: Schnittmustername patternType: Schnittmustertyp +patternCreated: Das Skelett Ihres Schnittmusters wurde um erstellt +runTheseCommands: Führen Sie diese beiden Befehle aus, um zu beginnen +startRollup: Starten Sie den Rollup-Bündler in einem Terminal im Überwachungsmodus +startWebpack: Führen Sie in einem anderen Terminal den Webpack-Dev-Server aus +devDocsAvailableAt: Entwicklerdokumentation ist verfügbar unter +talkToUs: Für Fragen, Feedback oder Anregungen sprechen Sie mit uns in unserem Chatroom + diff --git a/packages/i18n/src/locales/en/cfp.yaml b/packages/i18n/src/locales/en/cfp.yaml index 3e07aea2705..53b84869188 100644 --- a/packages/i18n/src/locales/en/cfp.yaml +++ b/packages/i18n/src/locales/en/cfp.yaml @@ -3,3 +3,9 @@ githubRepo: GitHub repository packageManager: Package manager patternName: Pattern name patternType: Pattern type +patternCreated: Your pattern skeleton has been created at +runTheseCommands: To get started, run these two commands +startRollup: In one terminal, start the rollup bundler in watch mode +startWebpack: And in another terminal, run the webpack dev server +devDocsAvailableAt: Developer documentation is available at +talkToUs: For questions, feedback or suggestions, come talk to us in our chat room diff --git a/packages/i18n/src/locales/es/cfp.yaml b/packages/i18n/src/locales/es/cfp.yaml index e8871099e14..18877841dbc 100644 --- a/packages/i18n/src/locales/es/cfp.yaml +++ b/packages/i18n/src/locales/es/cfp.yaml @@ -4,3 +4,9 @@ packageManager: Gerente de empaquetación patternDescription: Descripción del patrón patternName: Nombre del patrón patternType: Tipo del patrón +patternCreated: El esqueleto de tu patrón ha sido creado en +runTheseCommands: Para empezar, ejecute estos dos comandos +startRollup: En un terminal, inicie rollup en modo de reloj +startWebpack: Y en otro terminal, ejecuta el servidor webpack dev +devDocsAvailableAt: La documentación del desarrollador está disponible en +talkToUs: Para preguntas, comentarios o sugerencias, venga a hablar con nosotros en nuestra sala de chat diff --git a/packages/i18n/src/locales/fr/cfp.yaml b/packages/i18n/src/locales/fr/cfp.yaml index 8a5b86b4759..88d9391fbd9 100644 --- a/packages/i18n/src/locales/fr/cfp.yaml +++ b/packages/i18n/src/locales/fr/cfp.yaml @@ -4,3 +4,9 @@ packageManager: Gestionnaire de paquets patternName: Nom du patron patternDescription: Description du patron patternType: Type de patron +patternCreated: Le squelette de votre patron a été créé à +runTheseCommands: Pour commencer, lancez ces deux commandes +startRollup: Dans un terminal, démarrez rollup en mode veille +startWebpack: Et dans un autre terminal, exécutez le serveur de développement webpack +devDocsAvailableAt: La documentation du développeur est disponible à l'adresse +talkToUs: Pour des questions, des commentaires ou des suggestions, venez nous parler dans notre salle de chat diff --git a/packages/i18n/src/locales/nl/cfp.yaml b/packages/i18n/src/locales/nl/cfp.yaml index 9565e37344c..82a1a37fb31 100644 --- a/packages/i18n/src/locales/nl/cfp.yaml +++ b/packages/i18n/src/locales/nl/cfp.yaml @@ -4,3 +4,10 @@ packageManager: Pakket manager patternName: Patroonnaam patternDescription: Patroon beschrijving patternType: Patroon type +patternCreated: Het skelet van je patroon is aangemaakt in +runTheseCommands: Voer deze twee opdrachten uit om aan de slag te gaan +startRollup: Start in één terminal rollup in watch-modus +startWebpack: En in een andere terminal start je de webpack dev-server +devDocsAvailableAt: Documentatie voor ontwikkelaars is beschikbaar op +talkToUs: Voor vragen, feedback of suggesties, kan je terecht in onze chatroom +