Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
56 changes: 29 additions & 27 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,47 +1,49 @@
name: deploy
on:
push:
pull_request:
branches:
- main
types:
- closed
Comment on lines 2 to +7
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changed so that PR must be merged to kick off deployment.

permissions:
id-token: write
contents: read
pages: write
concurrency:
group: pages
cancel-in-progress: false
jobs:
build:
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: yarn
- id: yarn-cache-path
run: echo "::set-output name=dir::$(yarn cache dir)"
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
- uses: actions/cache@v4
with:
path: ${{ steps.yarn-cache-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- run: yarn install --immutable
- run: yarn demo
- id: deployment
uses: actions/upload-pages-artifact@v3 # or specific "vX.X.X" version tag for this action
- name: Build demo page
run: |
yarn install --immutable
yarn demo
- name: Upload demo page
uses: actions/upload-pages-artifact@v3
with:
path: demo/dist/

# Deploy job
deploy:
# Add a dependency to the build job
needs: build

# Grant GITHUB_TOKEN the permissions required to make a Pages deployment
permissions:
pages: write # to deploy to Pages
id-token: write # to verify the deployment originates from an appropriate source
Comment on lines -34 to -37
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Combined into a single job to simplify troubleshooting and moved permissions to the top


# Specify runner + deployment step
runs-on: ubuntu-latest
steps:
path: './demo/public'
Comment on lines +39 to +42
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fix missing Github Pages

- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4 # or specific "vX.X.X" version tag for this action
env:
name: preview
url: ${{ steps.deployment.outputs.page_url }}
uses: actions/deploy-pages@v4
# - name: Publish to NPMJS
# uses: JS-DevTools/npm-publish@v3
# with:
# token: ${{ secrets.NPM_TOKEN }}
Comment on lines +46 to +49
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think this is ready but want to limit the amount of change if there is trouble

3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,5 @@ dist
.tern-port
lib

.DS_Store
.DS_Store
.secrets
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 Flowplayer
Copyright (c) 2025 Flowplayer

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions demo/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ module.exports = {
},
output: {
filename: "[name].js",
path: path.resolve(__dirname, "dist")
path: path.resolve(__dirname, "public")
},
devServer: {
static: {
directory: path.resolve(__dirname)
directory: path.resolve(__dirname, "public")
}
}
}
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"author": "Flowplayer AB <info@flowplayer.com>",
"license": "MIT",
"private": false,
"types": "index.d.ts",
"scripts": {
"build": "tsc -d",
"dev": "webpack serve -c demo/webpack.config.js",
Expand Down Expand Up @@ -38,4 +39,4 @@
"lib/*.js",
"lib/*.d.ts"
]
}
}
9 changes: 5 additions & 4 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
"test/**/*.test-d.tsx" // we have a separate task where types are tested
],
"compilerOptions": {
"target": "es2015",
"allowSyntheticDefaultImports": true,
"declaration": false,
"jsx": "react",
"moduleResolution": "node",
"outDir": "./lib",
"skipLibCheck": true,
"allowSyntheticDefaultImports": true,
"strict": true,
"outDir": "./lib",
"moduleResolution": "node"
"target": "es2015",
Copy link
Contributor

Choose a reason for hiding this comment

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

if you want to, I think we could bump this up to something more modern.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i figured it was better to change as little as possible in case there was user impact. i don't want to wreck some IE9 user's day without at least a deprecation warning

Copy link
Contributor

Choose a reason for hiding this comment

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

I guess that is fair, but flowplayer doesn't support IE, though we do support some very old iOS versions

Copy link
Contributor Author

@rj-wowza rj-wowza Feb 13, 2025

Choose a reason for hiding this comment

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

ah i see then it doesn't matter what my output target is, it will be chained to the "native" player's target 👍 we should sync those targets then

Copy link
Contributor

Choose a reason for hiding this comment

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

we use es2017 there for now.

}
}
Loading