Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Update to videojs-generate-rollup-config ~5.0.0, use env options, and @babel/runtime #289

Merged
merged 8 commits into from
Aug 16, 2019
Merged

feat: Update to videojs-generate-rollup-config ~5.0.0, use env options, and @babel/runtime #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
54dfed0
feat: Update to videojs-generate-rollup-config ~4.0.0 and use new env…
brandonocasey Jul 15, 2019
aa290bf
security and bug
brandonocasey Aug 4, 2019
802452c
use cross-env
brandonocasey Aug 15, 2019
70b6996
use videojs-generator-helpers branch
brandonocasey Aug 16, 2019
bb48b6c
use videojs-generator-helpers branch
brandonocasey Aug 16, 2019
f4b72f4
use ~5.0.0
brandonocasey Aug 16, 2019
6b202b7
lint fix
brandonocasey Aug 16, 2019
e95f344
use ~1.2.0 of helpers
brandonocasey Aug 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions generators/app/package-json.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const getGeneratorVersions = (pkgList) => pkgList.reduce((acc, pkgName) => {
const DEFAULTS = {
dependencies: getGeneratorVersions(['global', 'video.js']),
devDependencies: getGeneratorVersions([
'@babel/runtime',
'@videojs/generator-helpers',
'karma',
'rollup',
Expand Down Expand Up @@ -124,19 +125,16 @@ const packageJSON = (current, context) => {
'ie 11'
],
'scripts': _.assign({}, current.scripts, {
'prebuild': 'npm run clean',
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Previously we used to do this prebuild, but since we have multiple different types of "build" now, it doesn't make sense.

'build': 'npm-run-all -p build:*',
'build-test': "cross-env-shell TEST_BUNDLE_ONLY=1 'npm run build'",
'build-prod': "cross-env-shell NO_TEST_BUNDLE=1 'npm run build'",
'build': 'npm-run-all -s clean -p build:*',
'build:js': 'rollup -c scripts/rollup.config.js',
'clean': 'shx rm -rf ./dist ./test/dist',
'postclean': 'shx mkdir -p ./dist ./test/dist',
'clean': 'shx rm -rf ./dist ./test/dist && shx mkdir -p ./dist ./test/dist',
Copy link
Contributor Author

Choose a reason for hiding this comment

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

May as well do it in one command

Copy link
Member

Choose a reason for hiding this comment

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

Although, I don't think&& will work on Windows, will it?

'lint': 'vjsstandard',
'prepublishOnly': 'npm-run-all build test:verify',
'prepublishOnly': 'npm-run-all build-prod && vjsverify --verbose',
Copy link
Contributor Author

Choose a reason for hiding this comment

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

verify can no longer be run on test so it only makes sense in pre-publish.

'start': 'npm-run-all -p server watch',
'server': 'karma start scripts/karma.conf.js --singleRun=false --auto-watch',
'pretest': 'npm-run-all lint build',
'test': 'npm-run-all test:*',
'test:verify': 'vjsverify --verbose',
'test:unit': 'karma start scripts/karma.conf.js',
'test': 'npm-run-all lint build-test && karma start scripts/karma.conf.js',
'posttest': 'shx cat test/dist/coverage/text.txt',
'preversion': 'npm test',
'version': 'is-prerelease || npm run update-changelog && git add CHANGELOG.md',
Expand Down
Loading