From e81be6c8c8bd96b20160e7922fd9f66af32da312 Mon Sep 17 00:00:00 2001 From: Kevin Chappell Date: Tue, 23 Apr 2019 13:32:04 -0700 Subject: [PATCH] chore: switch back to npm don't force devs to use yarn --- .travis.yml | 10 +- CONTRIBUTING.md | 4 +- docs/contributing.md | 4 +- docs/development.md | 18 +- docs/editing-fonts.md | 4 +- docs/getting-started.md | 10 +- package-lock.json | 20973 ++++++++++++++++++++++++++++++++++++++ package.json | 10 +- yarn.lock | 11599 --------------------- 9 files changed, 21003 insertions(+), 11629 deletions(-) create mode 100644 package-lock.json delete mode 100644 yarn.lock diff --git a/.travis.yml b/.travis.yml index 1fa17d37a..774440dcb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_install: jobs: include: - stage: lint - script: yarn lint + script: npm run lint skip_cleanup: true - stage: deploy if: branch = master @@ -35,17 +35,17 @@ jobs: - python3 -V - pip3 -V - mkdocs -V - - yarn build:all + - npm run build:all deploy: provider: script script: - - yarn travis-deploy-once "yarn semantic-release" + - npm run travis-deploy-once "npm run semantic-release" skip_cleanup: true after_deploy: - - yarn deploy + - npm run deploy - git clone --depth 1 "https://${GH_TOKEN}:@github.com/${SITE_REPO}" "$SITE_DIR" 2> /dev/null || (cd "$SITE_DIR" ; git pull; cd ../) - ls -l - - yarn deploy:site + - npm run deploy:site env: global: - secure: Fzq6BMwpDtUVH6ONSD5cg3gxDl/6bL9d4xoCnb1Ck3jhLen7GVSBCVs8dTPP0J1kMUbcPfywdG5CrdTMUXtuT3i7uVEqDxemkWYLyKwtvtqWPSFFTS9WvLnoxPvpTnDDoXvU9DhZoFP5U6nEELZIcqJceGwpDReROvJM1LKug72su7LHG40FWPj3w1X5XvMMKZlp6ClFwHZYDs7ybDcWlz6s2TsdunW0JW15+KMEDVuPTKw5VVk6ytnC3j3XXNus8ARRH/vG7DWCOtOai2ckYHchqz9c37oms5xA8nT4+J4Se/sgvkZo/jfa5tJSOljppUxMwyyNdkEu3QIEVNPgBtQf34KhWFN+FivuZHK4qG12lyQvRcJYlBJvUeSp29KABZv8oESIso5/HD8cIOEVCLUXjhOkcLF8S6cSRag0+/PT0u7Aj/L0ONKNsYhikOM773ilmbt8Vb7tjSOi7aoLJBmUlNVJcT4wJwJFjoe7bUppeqj1pC/+2+aX/IJDX6LfX6kpSxKGUH/DfJpEXq0xjCfsa8aap2gXfbn9Exsynx6KlIyAMRkmTU7S7iMiBts1fKMZvks3wA8rR4b44EZO+qgP5EbTGhCsvLYl3f5TiRsJf+w9LQrtP4Vl8mOU0XFgfrKArGMp6KDp1x1cyF/X4LAO9ySSDu9IEUj7Ft3WyOs= diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7d0d6155f..64d1e5d55 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,8 +28,8 @@ Navigate to the directory you'll be working from and run: ```bash $ git clone https://github.com/kevinchappell/formBuilder.git form-builder $ cd form-builder -$ yarn -$ yarn start +$ npm i +$ npm start ``` The above code will clone the repo, install the required `node_modules` and run the default `npm start` script. You should now have a locally running version of the [demo page](https://kevinchappell.github.io/formBuilder/). diff --git a/docs/contributing.md b/docs/contributing.md index 7d0d6155f..64d1e5d55 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -28,8 +28,8 @@ Navigate to the directory you'll be working from and run: ```bash $ git clone https://github.com/kevinchappell/formBuilder.git form-builder $ cd form-builder -$ yarn -$ yarn start +$ npm i +$ npm start ``` The above code will clone the repo, install the required `node_modules` and run the default `npm start` script. You should now have a locally running version of the [demo page](https://kevinchappell.github.io/formBuilder/). diff --git a/docs/development.md b/docs/development.md index 257a6686a..29c36ab97 100644 --- a/docs/development.md +++ b/docs/development.md @@ -3,33 +3,35 @@ Here we'll cover a few common tasks developers might face when setting up formBuilder. ## Clone the repo + ```bash $ git clone git@github.com:kevinchappell/formBuilder.git form-builder && cd form-builder ``` ## Install Dependencies -```bash -$ yarn install -``` -or + ```bash $ npm install ``` ## Local development + Once you've cloned the project and installed it's dependencies you can get a local version running by running: + ```bash -$ yarn start +$ npm start ``` This will run the default webpack config and open a new browser tab and that serves a demo of the plugin. This demo can be used to test features and bugs. ## Languages + At the time of writing this, formBuilder is available in dozens of languages thanks to generous contributors around the world. If you would like to contribute, formBuilder's language repo can be found [here](https://github.com/kevinchappell/formBuilder-languages). By default formBuilder will load languages from https://formbuilder.online/assets/lang unless the `i18n.location` option is set. ## Custom Controls + See the Control and Control Plugin Architecture Documentation to learn about how to create custom controls. - - [Overview](https://formbuilder.online/docs/formBuilder/overview/) - - [Control](https://formbuilder.online/docs/formBuilder/controls/) - - [Control Plugins](https://formbuilder.online/docs/formBuilder/control-plugins/) +- [Overview](https://formbuilder.online/docs/formBuilder/overview/) +- [Control](https://formbuilder.online/docs/formBuilder/controls/) +- [Control Plugins](https://formbuilder.online/docs/formBuilder/control-plugins/) diff --git a/docs/editing-fonts.md b/docs/editing-fonts.md index 98c6f2003..cba6c05de 100644 --- a/docs/editing-fonts.md +++ b/docs/editing-fonts.md @@ -4,7 +4,7 @@ formBuilder uses an icon font generated with Fontello. Fontello makes it easy fo ### Editing To edit the current icon font, open terminal and run: ```bash -yarn font edit +npm run font edit ``` This will open and create a new session on fontello.com where you can choose new icons or upload your own. @@ -12,7 +12,7 @@ This will open and create a new session on fontello.com where you can choose new ### Saving When finished, click the Save Session button and return to the terminal and type: ```bash -yarn font save +npm run font save ``` * Note * diff --git a/docs/getting-started.md b/docs/getting-started.md index 6234e853b..6a66d34ff 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -1,13 +1,11 @@ # Getting Started ## Download and install -formBuilder and formRender are available directly from [GitHub](https://github.com/kevinchappell/formBuilder/tree/master/dist) and through yarn/npm. + +formBuilder and formRender are available directly from [GitHub](https://github.com/kevinchappell/formBuilder/tree/master/dist) and through npm. Install module from package manager: -```bash -$ yarn add formBuilder -``` -or + ```bash $ npm i --save formBuilder ``` @@ -15,6 +13,7 @@ $ npm i --save formBuilder Once you have the module/plugin installed, include it in your build process for vendor dependencies, add to html via `