Skip to content
This repository has been archived by the owner on Jun 16, 2018. It is now read-only.

Adding changes to push package to npm #264

Open
wants to merge 8 commits into
base: master
Choose a base branch
from

Conversation

2roy999
Copy link
Member

@2roy999 2roy999 commented Aug 23, 2017

No description provided.

@Jheronymus
Copy link
Member

why the name change from fllscoring to scoring? Isn't it better to stay consistent with the repository name?

.travis.yml Outdated
@@ -1,11 +1,20 @@
language: node_js
node_js:
- 0.10
- 0.1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure this is correct, maybe rather change to a recent version of node? Like 6 or 8

.travis.yml Outdated
before_install:
- "npm i -g bower karma-cli"
- npm i -g bower karma-cli
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removal of spaces is not correct yaml (although it may work)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in this case the "-" is perceived as part of the indentation, so it will work. But I don't think it improves on readability. http://yaml.org/spec/1.2/spec.html#id2777534

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used the travis-cli to add the upload to the npm it might have changed the formatting (i didn't removed them manually). I don't have any preference but i think it's better to go along with the travis cli on this

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, no problem.

@rikkertkoppes
Copy link
Member

@poelstra what do you think about the npmignore? Feels a bit too much, not sure everything is needed here. The other files seem ok to me.

The yaml changes should not be a problem (checked with a yaml parser) agree with @2roy999 to better stick to what the travis cli creates.

Package.json changes are ok, with me

Copy link
Collaborator

@poelstra poelstra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the proposed .npmignore, the following files are included:

./challenges
./challenges/xsl
./challenges/xsl/challenges.xsl
./challenges/xsl/challenge.xsl
./challenges/js
./challenges/js/2012.js
./challenges/js/2014_nl_NL.js
./challenges/js/2014.js
./challenges/js/2015_nl_NL.js
./challenges/js/2014_nl_NL-no-enum.js
./challenges/js/2015_en_US.js
./challenges/js/2016_nl_NL.js
./challenges/js/2016_en_US_ref_optimised.js
./challenges/js/2017_en_US.js
./challenges/js/2016_en_US_ref.js
./challenges/js/2016_en_US.js
./challenges/html
./challenges/html/2015_nl_NL.html
./challenges/html/2014_nl_NL.html
./challenges/html/2015_en_US.html
./challenges/html/2016_en_US_ref.html
./challenges/html/2014.html
./challenges/html/2016_nl_NL.html
./challenges/html/2016_en_US.html
./challenges/html/2017_en_US.html
./challenges/html/2016_en_US_ref_optimised.html
./challenges/html/2014_nl_NL-no-enum.html
./challenges/html/2012.html
./challenges/pdf
./challenges/pdf/2016_en_US.pdf
./challenges/pdf/2014_nl_NL.pdf
./challenges/pdf/2015_en_US.pdf
./challenges/pdf/2016_nl_NL.pdf
./challenges/pdf/2016_en_US_ref_optimised.pdf
./challenges/pdf/2016_en_US_ref.pdf
./challenges/pdf/2017_en_US.pdf
./challenges/pdf/2014.pdf
./challenges/pdf/2015_nl_NL.pdf
./challenges/pdf/2014_nl_NL-no-enum.pdf
./challenges/pdf/2012.pdf
./challenges/xsd
./challenges/xsd/challenge.xsd
./challenges/xml
./challenges/xml/2014_nl_NL-no-enum.xml
./challenges/xml/2014_nl_NL.xml
./challenges/xml/2016_nl_NL.xml
./challenges/xml/2017_en_US.xml
./challenges/xml/2014.xml
./challenges/xml/2012.xml
./challenges/xml/2015_en_US.xml
./challenges/xml/2016_en_US.xml
./challenges/xml/2015_nl_NL.xml
./challenges/xml/2016_en_US_ref_optimised.xml
./src
./src/css
./src/css/teams.css
./src/css/dialog.css
./src/css/materialIcons.css
./src/css/elements.css
./src/css/scoresheet.css
./src/css/spinner.css
./src/css/main.css
./src/css/material.css
./src/fonts
./src/fonts/lato-reg-webfont.eot
./src/fonts/materialIcons.woff2
./src/fonts/lato.css
./src/fonts/lato-lig-webfont.woff
./src/fonts/lato-lig-webfont.eot
./src/fonts/lato-lig-webfont.ttf
./src/fonts/lato-reg-webfont.woff
./src/fonts/lato-lig-webfont.svg
./src/fonts/lato-reg-webfont.ttf
./src/fonts/lato-reg-webfont.svg
./src/res
./src/res/screen
./src/res/screen/bada
./src/res/screen/bada/screen-portrait.png
./src/res/screen/android
./src/res/screen/android/screen-ldpi-landscape.png
./src/res/screen/android/screen-mdpi-portrait.png
./src/res/screen/android/screen-ldpi-portrait.png
./src/res/screen/android/screen-mdpi-landscape.png
./src/res/screen/android/screen-xhdpi-portrait.png
./src/res/screen/android/screen-xhdpi-landscape.png
./src/res/screen/android/screen-hdpi-landscape.png
./src/res/screen/android/screen-hdpi-portrait.png
./src/res/screen/tizen
./src/res/screen/tizen/README.md
./src/res/screen/bada-wac
./src/res/screen/bada-wac/screen-type5.png
./src/res/screen/bada-wac/screen-type3.png
./src/res/screen/bada-wac/screen-type4.png
./src/res/screen/windows-phone
./src/res/screen/windows-phone/screen-portrait.jpg
./src/res/screen/ios
./src/res/screen/ios/screen-ipad-landscape.png
./src/res/screen/ios/screen-iphone-landscape.png
./src/res/screen/ios/screen-ipad-portrait.png
./src/res/screen/ios/screen-iphone-portrait.png
./src/res/screen/ios/screen-iphone-portrait-568h-2x.png
./src/res/screen/ios/screen-iphone-portrait-2x.png
./src/res/screen/ios/screen-ipad-portrait-2x.png
./src/res/screen/ios/screen-iphone-landscape-2x.png
./src/res/screen/ios/screen-ipad-landscape-2x.png
./src/res/screen/blackberry
./src/res/screen/blackberry/screen-225.png
./src/res/screen/webos
./src/res/screen/webos/screen-64.png
./src/res/icon
./src/res/icon/bada
./src/res/icon/bada/icon-128.png
./src/res/icon/android
./src/res/icon/android/icon-96-xhdpi.png
./src/res/icon/android/icon-72-hdpi.png
./src/res/icon/android/icon-36-ldpi.png
./src/res/icon/android/icon-48-mdpi.png
./src/res/icon/tizen
./src/res/icon/tizen/icon-128.png
./src/res/icon/bada-wac
./src/res/icon/bada-wac/icon-48-type5.png
./src/res/icon/bada-wac/icon-50-type3.png
./src/res/icon/bada-wac/icon-80-type4.png
./src/res/icon/windows-phone
./src/res/icon/windows-phone/icon-173-tile.png
./src/res/icon/windows-phone/icon-48.png
./src/res/icon/windows-phone/icon-62-tile.png
./src/res/icon/ios
./src/res/icon/ios/icon-57.png
./src/res/icon/ios/icon-72.png
./src/res/icon/ios/icon-57-2x.png
./src/res/icon/ios/icon-72-2x.png
./src/res/icon/blackberry
./src/res/icon/blackberry/icon-80.png
./src/res/icon/webos
./src/res/icon/webos/icon-64.png
./src/js
./src/js/directives
./src/js/directives/size.js
./src/js/directives/ng-directives.js
./src/js/directives/really.js
./src/js/directives/spinner.js
./src/js/directives/sigpad.js
./src/js/main.js
./src/js/tests
./src/js/tests/indexedDBTest.js
./src/js/tests/fsTest.js
./src/js/config.js
./src/js/filters
./src/js/filters/index.js
./src/js/filters/ng-filters.js
./src/js/views
./src/js/views/scoresheet.js
./src/js/views/settings.js
./src/js/views/teams.js
./src/js/views/scores.js
./src/js/views/ranking.js
./src/js/controllers
./src/js/controllers/TeamImportDialogController.js
./src/js/controllers/ExportRankingDialogController.js
./src/js/controllers/DescriptionDialogController.js
./src/js/controllers/NewStageDialogController.js
./src/js/controllers/TeamDialogController.js
./src/js/controllers/RoundDialogController.js
./src/js/services
./src/js/services/ng-challenge.js
./src/js/services/ng-services.js
./src/js/services/ng-throttle.js
./src/js/services/log.js
./src/js/services/ng-handshake.js
./src/js/services/ng-message.js
./src/js/services/fs-pg.js
./src/js/services/fs-xhr.js
./src/js/services/ng-scores.js
./src/js/services/ng-stages.js
./src/js/services/fs-nw.js
./src/js/services/session.js
./src/js/services/ng-settings.js
./src/js/services/ng-fs.js
./src/js/services/ng-teams.js
./src/config.xml
./src/img
./src/img/colors3.png
./src/img/colors4.png
./src/img/colors.png
./src/img/colors2.png
./src/img/tank-bot-model-lego-mindstorms-education-ev3-45560.PNG
./src/views
./src/views/dialogs.html
./src/views/pages
./src/views/pages/settings.html
./src/views/pages/scoresheet.html
./src/views/pages/teams.html
./src/views/pages/ranking.html
./src/views/pages/scores.html
./src/views/drawer.html
./src/components
./src/components/q
./src/components/q/q.js
./src/components/signature-pad
./src/components/signature-pad/jquery.signaturepad.min.js
./src/components/signature-pad/jquery.signaturepad.js
./src/components/angular-mocks
./src/components/angular-mocks/angular-mocks.js
./src/components/jquery
./src/components/jquery/jquery.min.js
./src/components/jquery/jquery.js
./src/components/jquery/jquery-migrate.min.js
./src/components/jquery/jquery-migrate.js
./src/components/idbwrapper
./src/components/idbwrapper/idbstore.min.js
./src/components/idbwrapper/idbstore.js
./src/components/angular-touch
./src/components/angular-touch/angular-touch.min.js.map
./src/components/angular-touch/angular-touch.min.js
./src/components/angular-touch/angular-touch.js
./src/components/angular
./src/components/angular/angular.min.js
./src/components/angular/angular.min.js.map
./src/components/angular/angular.js
./src/components/angular-sanitize
./src/components/angular-sanitize/angular-sanitize.min.js
./src/components/angular-sanitize/angular-sanitize.js
./src/components/requirejs
./src/components/requirejs/require.js
./src/components/bootstrap-css
./src/components/bootstrap-css/css
./src/components/bootstrap-css/css/bootstrap.css
./src/components/bootstrap-css/css/bootstrap-responsive.min.css
./src/components/bootstrap-css/css/bootstrap.min.css
./src/components/bootstrap-css/css/bootstrap-responsive.css
./src/components/bootstrap-css/js
./src/components/bootstrap-css/js/bootstrap.js
./src/components/bootstrap-css/js/bootstrap.min.js
./src/components/bootstrap-css/img
./src/components/bootstrap-css/img/glyphicons-halflings-white.png
./src/components/bootstrap-css/img/glyphicons-halflings.png
./src/components/angular-bootstrap
./src/components/angular-bootstrap/ui-bootstrap-tpls.js
./src/components/angular-bootstrap/ui-bootstrap-tpls.min.js
./src/components/angular-bootstrap/ui-bootstrap.min.js
./src/components/angular-bootstrap/ui-bootstrap.js
./src/icon.png
./src/gpl-2.0.txt
./src/fllscoring.appcache
./src/package.json
./readme.md
./yarn.lock
./package.json
./LICENSE.txt

These files/dirs are now excluded from the package:

./fgindex.html
./nocache.html
./.editorconfig
./npm-shrinkwrap.json
./.bowerrc
./Gruntfile.js
./tools
./tools/saxon9-xqj.jar
./tools/saxon9-unpack.jar
./tools/saxon9he.jar
./tools/buildchallenge.js
./tools/saxon9-test.jar
./tools/rasterize.js
./encloseConfig.js
./.npmignore
./pgbuildconfig.example.json
./bower.json
./.coveralls.yml
./spec
./spec/directives
./spec/directives/sigpadSpec.js
./spec/directives/sizeSpec.js
./spec/directives/spinnerSpec.js
./spec/directives/reallySpec.js
./spec/helpers
./spec/helpers/multiline.js
./spec/helpers/defineShim.js
./spec/helpers/asyncJasmine.js
./spec/filters
./spec/filters/indexSpec.js
./spec/views
./spec/views/teamsSpec.js
./spec/views/scoresheetSpec.js
./spec/views/rankingSpec.js
./spec/views/settingsSpec.js
./spec/views/scoresSpec.js
./spec/controllers
./spec/controllers/DescriptionDialogControllerSpec.js
./spec/controllers/TeamDialogControllerSpec.js
./spec/controllers/NewStageDialogControllerSpec.js
./spec/controllers/RoundDialogControllerSpec.js
./spec/controllers/ExportRankingDialiogControllerSpec.js
./spec/controllers/TeamImportDialogControllerSpec.js
./spec/services
./spec/services/fs-xhrSpec.js
./spec/services/fs-nwSpec.js
./spec/services/ng-fsSpec.js
./spec/services/ng-stagesSpec.js
./spec/services/ng-teamsSpec.js
./spec/services/asyncSpec.js
./spec/services/ng-scoresSpec.js
./spec/services/fs-pgSpec.js
./spec/services/ng-throttleSpec.js
./spec/services/ng-settingsSpec.js
./spec/services/ng-challengeSpec.js
./spec/services/logSpec.js
./spec/mocks
./spec/mocks/settingsMock.js
./spec/mocks/logMock.js
./spec/mocks/scoresMock.js
./spec/mocks/handshakeMock.js
./spec/mocks/stagesMock.js
./spec/mocks/teamsMock.js
./spec/mocks/challengeMock.js
./spec/mocks/fsMock.js
./spec/mocks/messageMock.js
./dist
./dist/.npmignore
./karma.conf.js
./.cordova
./.cordova/config.example.json
./server_modules
./server_modules/utils.js
./server_modules/slave_mode.js
./server_modules/log.js
./server_modules/challenges.js
./server_modules/body_builder.js
./server_modules/cache.js
./server_modules/views.js
./server_modules/file_system.js
./server_modules/teams.js
./server_modules/scores.js
./server_modules/cors.js
./server_modules/args.js
./server_modules/auth.js
./server_modules/sessions.js
./index.html
./docs
./docs/FLL Docs 2014
./docs/FLL Docs 2014/WC_Scoresheet_NL.pdf
./docs/FLL Docs 2014/FLL 2014 World Class Graphical Score Sheet.pdf
./docs/FLL Docs 2014/FLL 2014 World Class Graphical Score Sheet_NL.pdf
./docs/FLL Docs 2014/FLL 2014 World Class Accessible Score Sheet.pdf
./docs/architecture
./docs/architecture/administration.xml
./docs/architecture/administration.png
./docs/architecture/readme.md
./docs/architecture/readme.pdf
./docs/architecture/referees.png
./docs/architecture/referees.xml
./docs/user_interface
./docs/user_interface/sketches.md
./docs/user_interface/screenshots
./docs/user_interface/screenshots/20-3-2015_124117.png
./docs/user_interface/screenshots/20-3-2015_124048.png
./docs/user_interface/screenshots/26-8-2015_75711.png
./docs/user_interface/screenshots/20-3-2015_123924.png
./docs/user_interface/screenshots/20-3-2015_123949.png
./docs/user_interface/screenshots/20-3-2015_123855.png
./docs/user_interface/screenshots/20-3-2015_123833.png
./docs/user_interface/screenshots/20-3-2015_124212.png
./docs/user_interface/screenshots/20-3-2015_124145.png
./docs/user_interface/screenshots/20-3-2015_123742.png
./docs/user_interface/interaction.md
./docs/user_interface/readme.md
./docs/user_interface/mockups
./docs/user_interface/mockups/03. Wizard - Teams.bmml
./docs/user_interface/mockups/14. Scorekeeper - Ranking.bmml
./docs/user_interface/mockups/12. Referee - Local-Network - Confirm.bmml
./docs/user_interface/mockups/04. Wizard - Rounds.bmml
./docs/user_interface/mockups/05. Wizard - Tables.bmml
./docs/user_interface/mockups/08. Client - Select connect type.bmml
./docs/user_interface/mockups/09. Client - Connect authentication.bmml
./docs/user_interface/mockups/15. Scorekeeper - Output.bmml
./docs/user_interface/mockups/PNGs
./docs/user_interface/mockups/PNGs/11. Referee - Local-Network - Score.png
./docs/user_interface/mockups/PNGs/08. Client - Select connect type.png
./docs/user_interface/mockups/PNGs/16. Scorekeeper - Logs.png
./docs/user_interface/mockups/PNGs/02. Wizard - Tournament.png
./docs/user_interface/mockups/PNGs/12. Referee - Local-Network - Confirm.png
./docs/user_interface/mockups/PNGs/05. Wizard - Tables.png
./docs/user_interface/mockups/PNGs/06. Wizard - Referees.png
./docs/user_interface/mockups/PNGs/09. Client - Connect authentication.png
./docs/user_interface/mockups/PNGs/03. Wizard - Teams.png
./docs/user_interface/mockups/PNGs/15. Scorekeeper - Output.png
./docs/user_interface/mockups/PNGs/04. Wizard - Rounds.png
./docs/user_interface/mockups/PNGs/07. Wizard - Completed.png
./docs/user_interface/mockups/PNGs/14. Scorekeeper - Ranking.png
./docs/user_interface/mockups/PNGs/01. Apptype choice.png
./docs/user_interface/mockups/PNGs/10. Just calculate.png
./docs/user_interface/mockups/PNGs/13. Scorekeeper - Scores.png
./docs/user_interface/mockups/02. Wizard - Tournament.bmml
./docs/user_interface/mockups/01. Apptype choice.bmml
./docs/user_interface/mockups/16. Scorekeeper - Logs.bmml
./docs/user_interface/mockups/13. Scorekeeper - Scores.bmml
./docs/user_interface/mockups/11. Referee - Local-Network - Score.bmml
./docs/user_interface/mockups/10. Just calculate.bmml
./docs/user_interface/mockups/06. Wizard - Referees.bmml
./docs/user_interface/mockups/07. Wizard - Completed.bmml
./docs/user_interface/currentStatus.md
./docs/i18n
./docs/i18n/readme.md
./docs/templating
./docs/templating/readme.md
./docs/proposal
./docs/proposal/Scoring System project proposal-v2.pdf
./docs/proposal/Existing Systems
./docs/proposal/Existing Systems/Excel - SeniorSolutionJudgingv1.xlsx
./docs/proposal/Existing Systems/Danny - ScoringSoftwareTrainingSlides.pdf
./.travis.yml
./localserver.js

This seems a bit strange to me: docs are included, some client-side files are included (e.g. src/), but some aren't (index.html). Also, all server-side code is gone from the package.

To reproduce: I ran something like:

# given e.g. src/fllscoring checkout
mkdir src/tmp
cd src/tmp
npm install ../fllscoring

This will create a src/tmp/node_modules/fllscoring folder with only the stuff that will end up in the package.

@2roy999
Copy link
Member Author

2roy999 commented Sep 18, 2017

Change the npmignore file so it will ignore files by name and not by exclusion.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants