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

CA: move webpacked files to build subdirectory #3042

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CA: move webpacked files to build subdirectory #3042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 5 additions & 23 deletions sourcecode/apis/contentauthor/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,17 @@ Homestead.json
.idea/

/public/*
!/public/vendor
!/public/favicon.ico
!/public/index.php
!/public/robots.txt
!/public/.htaccess
!/public/css
!/public/graphical
!public/js

/public/js/*
!/public/js/presave
!/public/js/article-xapi.js
!/public/js/cerpus.js
!/public/js/editor-setup.js
!/public/js/h5p
/public/js/h5p/*
!/public/js/h5p-editor.js
!/public/js/jsrequestintercept.js
!/public/js/listener.js
!/public/js/mathquillEditor
!/public/js/question-editor.js
!/public/js/videos/brightcove.js
!/public/js/videos/streamps.js
!/public/js/h5p/ndlah5p-youtube.js
!/public/js/h5p/h5peditor-pre-save.js
!public/css
/public/css/*
!/public/css/ndlah5p-youtube.css
!/public/js
/public/js/ckeditor
/public/js/cropperjs
!/public/vendor

mix-manifest.json
app/Libraries/oauth-php/example/server/cache/
ca1.sql
cerpus_export_log*
Expand Down
1 change: 0 additions & 1 deletion sourcecode/apis/contentauthor/app/Libraries/H5P/H5PConfigAbstract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ protected function addCoreAssets(): void

protected function addDefaultEditorAssets(): void
{
$this->addAsset("scripts", $this->getAssetUrl(null, "/js/cerpus.js"));
$this->addAsset("scripts", $this->getAssetUrl("editor", "scripts/h5peditor-editor.js"));
$this->addAsset("scripts", $this->getAssetUrl("editor", "scripts/h5peditor-init.js"));
$this->addAsset("scripts", $this->getAssetUrl("editor", $this->getLanguage()));
Expand Down
3 changes: 3 additions & 0 deletions sourcecode/apis/contentauthor/app/Providers/AppServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use App\Observers\H5POptionObserver;
use Cerpus\EdlibResourceKit\Oauth1\Credentials;
use Cerpus\EdlibResourceKit\Oauth1\CredentialStoreInterface;
use Illuminate\Foundation\Mix;
use Illuminate\Http\Request;
use Illuminate\Log\Logger;
use Illuminate\Pagination\Paginator;
Expand Down Expand Up @@ -42,6 +43,8 @@ public function boot()
*/
public function register()
{
$this->app->singleton(Mix::class, \App\Support\Mix::class);

$this->app->singleton(CredentialStoreInterface::class, fn() => new Credentials(
config('app.consumer-key'),
config('app.consumer-secret'),
Expand Down
14 changes: 14 additions & 0 deletions sourcecode/apis/contentauthor/app/Support/Mix.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

declare(strict_types=1);

namespace App\Support;

class Mix extends \Illuminate\Foundation\Mix
{
public function __invoke($path, $manifestDirectory = ''): string
{
// Using a manifest directory is broken, see webpack.mix.js
return (string) parent::__invoke('build/' . $path, $manifestDirectory);
}
}
22 changes: 0 additions & 22 deletions sourcecode/apis/contentauthor/public/js/cerpus.js
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions sourcecode/apis/contentauthor/public/js/question-editor.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion sourcecode/apis/contentauthor/public/js/videos/brightcove.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ H5P.VideoBrightcove = (function ($) {
} else {
// Load the API our self
var tag = document.createElement('script');
tag.src = "/js/videos/brightcove-player-loader.min.js";
tag.src = "/build/js/videos/brightcove-player-loader.min.js";
var firstScriptTag = document.getElementsByTagName('script')[0];
firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
Brightcove.loaderInterval = setInterval(function () {
Expand Down
1 change: 0 additions & 1 deletion sourcecode/apis/contentauthor/resources/views/games/create.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@
<script src="/js/ckeditor/ckeditor.js"></script>
<script src="{{mix('js/react-questionset.js')}}"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<script src="/js/question-editor.js"></script>
@endpush
1 change: 0 additions & 1 deletion sourcecode/apis/contentauthor/resources/views/games/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@
<script src="/js/ckeditor/ckeditor.js"></script>
<script src="{{mix('js/react-questionset.js')}}"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<script src="/js/question-editor.js"></script>
@endpush

1 change: 0 additions & 1 deletion sourcecode/apis/contentauthor/resources/views/question/create.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@
<script src="/js/ckeditor/ckeditor.js"></script>
<script src="{{mix('js/react-questionset.js')}}"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<script src="/js/question-editor.js"></script>
@endpush
1 change: 0 additions & 1 deletion sourcecode/apis/contentauthor/resources/views/question/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@
<script src="/js/ckeditor/ckeditor.js"></script>
<script src="{{mix('js/react-questionset.js')}}"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<script src="/js/question-editor.js"></script>
@endpush
69 changes: 36 additions & 33 deletions sourcecode/apis/contentauthor/webpack.mix.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,40 +7,43 @@ mix
.copyDirectory('vendor/ckeditor/ckeditor', 'public/js/ckeditor')
.copyDirectory('resources/assets/ckeditor/plugins', 'public/js/ckeditor/plugins')
.copy('resources/assets/ckeditor/*.js', 'public/js/ckeditor')
.copy('node_modules/@brightcove/player-loader/dist/brightcove-player-loader.min.js', 'public/js/videos')
.copy('node_modules/@brightcove/player-loader/dist/brightcove-player-loader.min.js', 'public/build/js/videos')
.copyDirectory('node_modules/cropperjs/dist', 'public/js/cropperjs')
.sass('resources/assets/entrypoints/admin.scss', 'css/admin.css')
.js('resources/assets/entrypoints/admin.js', 'js/admin.js')
.js('resources/assets/entrypoints/article.js', 'js/article.js')
.sass('resources/assets/entrypoints/article.scss', 'css/article.css')
.sass('resources/assets/entrypoints/article-plugin.scss', 'css/article-plugin.css')
.js('resources/assets/entrypoints/bootstrap.js', 'js/bootstrap.js')
.sass('resources/assets/entrypoints/ckeditor_popup.scss', 'css/ckeditor_popup.css')
.sass('resources/assets/entrypoints/content_explorer_bootstrap.scss', 'css/content_explorer_bootstrap.css')
.sass('resources/assets/entrypoints/error-page.scss', 'css/error-page.css')
.sass('resources/assets/entrypoints/font-awesome.scss', 'css/font-awesome.css')
.sass('resources/assets/entrypoints/h5p-admin.scss', 'css/h5p-admin.css')
.sass('resources/assets/entrypoints/h5p-core.scss', 'css/h5p-core.css')
.js('resources/assets/entrypoints/h5p-core-bundle.js', 'js/h5p-core-bundle.js')
.sass('resources/assets/entrypoints/h5pcss.scss', 'css/h5pcss.css')
.js('resources/assets/entrypoints/h5peditor-custom.js', 'js/h5peditor-custom.js')
.js('resources/assets/entrypoints/h5peditor-image-popup.js', 'js/h5peditor-image-popup.js')
.sass('resources/assets/entrypoints/h5picons.scss', 'css/h5picons.css')
.js('resources/assets/entrypoints/h5pmetadata.js', 'js/h5pmetadata.js')
.js('resources/assets/entrypoints/ndla-h5peditor-html.js', 'js/ndla-h5peditor-html.js')
.sass('resources/assets/entrypoints/link.scss', 'css/link.css')
.js('resources/assets/entrypoints/maxscore.js', 'js/maxscore.js')
.js('resources/assets/entrypoints/metadata.js', 'js/metadata.js')
.sass('resources/assets/entrypoints/ndlah5p-edit.scss', 'css/ndlah5p-edit.css')
.sass('resources/assets/entrypoints/ndlah5p-editor.scss', 'css/ndlah5p-editor.css')
.sass('resources/assets/entrypoints/ndlah5p-iframe.scss', 'css/ndlah5p-iframe.css')
.sass('resources/assets/entrypoints/ndlah5p-iframe-legacy.scss', 'css/ndlah5p-iframe-legacy.css')
.js('resources/assets/entrypoints/ndla-audio.js', 'js/ndla-audio.js')
.js('resources/assets/entrypoints/ndla-image.js', 'js/ndla-image.js')
.js('resources/assets/entrypoints/ndla-video.js', 'js/ndla-video.js')
.js('resources/assets/entrypoints/react-article.js', 'js/react-article.js')
.js('resources/assets/entrypoints/react-h5p.js', 'js/react-h5p.js')
.js('resources/assets/entrypoints/react-questionset.js', 'js/react-questionset.js')

// Using a different public path + setResourceRoot breaks copyDirectory.
// Each output is prefixed with 'build/' instead.
.sass('resources/assets/entrypoints/admin.scss', 'build/css/admin.css')
.js('resources/assets/entrypoints/admin.js', 'build/js/admin.js')
.js('resources/assets/entrypoints/article.js', 'build/js/article.js')
.sass('resources/assets/entrypoints/article.scss', 'build/css/article.css')
.sass('resources/assets/entrypoints/article-plugin.scss', 'build/css/article-plugin.css')
.js('resources/assets/entrypoints/bootstrap.js', 'build/js/bootstrap.js')
.sass('resources/assets/entrypoints/ckeditor_popup.scss', 'build/css/ckeditor_popup.css')
.sass('resources/assets/entrypoints/content_explorer_bootstrap.scss', 'build/css/content_explorer_bootstrap.css')
.sass('resources/assets/entrypoints/error-page.scss', 'build/css/error-page.css')
.sass('resources/assets/entrypoints/font-awesome.scss', 'build/css/font-awesome.css')
.sass('resources/assets/entrypoints/h5p-admin.scss', 'build/css/h5p-admin.css')
.sass('resources/assets/entrypoints/h5p-core.scss', 'build/css/h5p-core.css')
.js('resources/assets/entrypoints/h5p-core-bundle.js', 'build/js/h5p-core-bundle.js')
.sass('resources/assets/entrypoints/h5pcss.scss', 'build/css/h5pcss.css')
.js('resources/assets/entrypoints/h5peditor-custom.js', 'build/js/h5peditor-custom.js')
.js('resources/assets/entrypoints/h5peditor-image-popup.js', 'build/js/h5peditor-image-popup.js')
.sass('resources/assets/entrypoints/h5picons.scss', 'build/css/h5picons.css')
.js('resources/assets/entrypoints/h5pmetadata.js', 'build/js/h5pmetadata.js')
.js('resources/assets/entrypoints/ndla-h5peditor-html.js', 'build/js/ndla-h5peditor-html.js')
.sass('resources/assets/entrypoints/link.scss', 'build/css/link.css')
.js('resources/assets/entrypoints/maxscore.js', 'build/js/maxscore.js')
.js('resources/assets/entrypoints/metadata.js', 'build/js/metadata.js')
.sass('resources/assets/entrypoints/ndlah5p-edit.scss', 'build/css/ndlah5p-edit.css')
.sass('resources/assets/entrypoints/ndlah5p-editor.scss', 'build/css/ndlah5p-editor.css')
.sass('resources/assets/entrypoints/ndlah5p-iframe.scss', 'build/css/ndlah5p-iframe.css')
.sass('resources/assets/entrypoints/ndlah5p-iframe-legacy.scss', 'build/css/ndlah5p-iframe-legacy.css')
.js('resources/assets/entrypoints/ndla-audio.js', 'build/js/ndla-audio.js')
.js('resources/assets/entrypoints/ndla-image.js', 'build/js/ndla-image.js')
.js('resources/assets/entrypoints/ndla-video.js', 'build/js/ndla-video.js')
.js('resources/assets/entrypoints/react-article.js', 'build/js/react-article.js')
.js('resources/assets/entrypoints/react-h5p.js', 'build/js/react-h5p.js')
.js('resources/assets/entrypoints/react-questionset.js', 'build/js/react-questionset.js')
.webpackConfig({
resolve: {
fallback: {
Expand Down