Merge branch 'develop' into trunk

Author: jeffpaul

.gitattributes

@@ -0,0 +1,26 @@
+# Directories
+/.git export-ignore
+/.github export-ignore
+/.wordpress-org export-ignore
+
+# Files
+/.babelrc export-ignore
+/.browserslistrc export-ignore
+/.DS_Store export-ignore
+/.editorconfig export-ignore
+/.eslintignore export-ignore
+/.eslintrc export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/CHANGELOG.md export-ignore
+/CODE_OF_CONDUCT.md export-ignore
+/composer.json export-ignore
+/composer.lock export-ignore
+/CONTRIBUTING.md export-ignore
+/CREDITS.md export-ignore
+/LICENSE.md export-ignore
+/package-lock.json export-ignore
+/package.json export-ignore
+/phpcs.xml export-ignore
+/postcss.config.js export-ignore
+/README.md export-ignore

.github/workflows/lint.yml

@@ -0,0 +1,47 @@
+name: Linting
+
+on:
+  push:
+    branches:
+      - develop
+      - trunk
+  pull_request:
+    branches:
+      - develop
+
+jobs:
+  eslint:
+    name: eslint
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install node v12
+      uses: actions/setup-node@v1
+      with:
+        node-version: 12
+    - name: npm install
+      run: npm install
+    - name: eslint
+      uses: icrawl/action-eslint@v1
+      with:
+        custom-glob: assets/js
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  phpcs:
+    name: phpcs
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Set PHP version
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '7.2'
+        coverage: none
+        tools: composer:v1
+    - name: composer install
+      run: composer install
+    - name: PHPCS check
+      uses: chekalsky/phpcs-action@v1
+      with:
+        phpcs_bin_path: './vendor/bin/phpcs .'

.github/workflows/push-asset-readme-update.yml

@@ -0,0 +1,16 @@
+name: Plugin asset/readme update
+on:
+  push:
+    branches:
+    - trunk
+jobs:
+  trunk:
+    name: Push to trunk
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: WordPress.org plugin asset/readme update
+      uses: 10up/action-wordpress-plugin-asset-update@stable
+      env:
+        SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
+        SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

.github/workflows/push-deploy.yml

@@ -0,0 +1,32 @@
+name: Deploy to WordPress.org
+on:
+  release:
+    types: [published]
+jobs:
+  tag:
+    name: New release
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@master
+    - name: Build
+      run: |
+        npm install
+        npm run build
+    - name: WordPress Plugin Deploy
+      id: deploy
+      uses: 10up/action-wordpress-plugin-deploy@stable
+      with:
+        generate-zip: true
+      env:
+        SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
+        SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
+    - name: Upload release asset
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: ${{github.workspace}}/${{ github.event.repository.name }}.zip
+        asset_name: ${{ github.event.repository.name }}.zip
+        asset_content_type: application/zip

.gitignore

@@ -1,2 +1,3 @@
 vendor
-node_modules
+node_modules
+.DS_Store

.wordpress-org/banner-1544x500.png

@@ -0,0 +1,52 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, per [the Keep a Changelog standard](http://keepachangelog.com/), and will adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [1.0.5] - 2021-03-05
+- Initial public release 🎉.
+
+### Added
+- Plugin banner and icon assets (props [@McCallumDillon](https://github.com/McCallumDillon), [@cgoozen](https://profiles.wordpress.org/cgoozen/) via [#8](https://github.com/10up/secure-media/pull/8), [#14](https://github.com/10up/secure-media/pull/14)).
+- Documentation and GitHub Action updates (props [@jeffpaul](https://github.com/jeffpaul), [@dinhtungdu](https://github.com/dinhtungdu) via [#16](https://github.com/10up/secure-media/pull/16), [#17](https://github.com/10up/secure-media/pull/17)).
+
+### Changed
+- Code spacing, documentation, translated strings, formatting, and other code cleanup tasks (props [@dkotter](https://github.com/dkotter) via [#15](https://github.com/10up/secure-media/pull/15)).
+
+### Security
+- Bump `ini` from 1.3.5 to 1.3.8 (props [@dependabot](https://github.com/apps/dependabot) via [#10](https://github.com/10up/secure-media/pull/10), [#13](https://github.com/10up/secure-media/pull/13)).
+- Update NPM packages for `axios` and `socket.io` to fix vulnerabilities (props [@joshuaabenazer](https://github.com/joshuaabenazer) via [#18](https://github.com/10up/secure-media/pull/18)).
+
+## [1.0.4] - 2021-01-04
+### Fixed
+- Better S3 error logging (props [@tlovett1](https://github.com/tlovett1)).
+
+## [1.0.3] - 2021-01-04
+### Fixed
+- Don't break old media and ensure new media has the correct visibility (props [@tlovett1](https://github.com/tlovett1)).
+- Create upload sub dir if it doesn't exist (props [@tlovett1](https://github.com/tlovett1)).
+- Fix public srcset urls (props [@tlovett1](https://github.com/tlovett1)).
+- Fix missing setting; only delete file if it exists (props [@tlovett1](https://github.com/tlovett1)).
+- Check if file exists before doing mkdir (props [@tlovett1](https://github.com/tlovett1)).
+
+## [1.0.2] - 2020-12-22
+### Fixed
+- Set default bucket and make sure there's always an S3 bucket (props [@tlovett1](https://github.com/tlovett1)).
+- Assorted bugs (props [@tlovett1](https://github.com/tlovett1)).
+
+## [1.0.1] - 2020-12-10
+### Fixed
+- Redirect single attachment page for private media if not authorized (props [@tlovett1](https://github.com/tlovett1)).
+- Assorted errors (props [@tlovett1](https://github.com/tlovett1)).
+
+## [1.0.0] - 2020-10-26
+- Initial private release of Secure Media plugin.
+
+[Unreleased]: https://github.com/10up/secure-media/compare/trunk...develop
+[1.0.5]: https://github.com/10up/secure-media/compare/1.0.4...1.0.5
+[1.0.4]: https://github.com/10up/secure-media/compare/1.0.3...1.0.4
+[1.0.3]: https://github.com/10up/secure-media/compare/20f33fd...1.0.3
+[1.0.2]: https://github.com/10up/secure-media/compare/9336b98...20f33fd
+[1.0.1]: https://github.com/10up/secure-media/compare/99d7aae...9336b98
+[1.0.0]: https://github.com/10up/secure-media/tree/99d7aaeb7deb27a78874837474986ed011f49ab1

.wordpress-org/banner-772x250.png

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [email protected]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq