Skip to content

Commit

Permalink
Use .min.js as js path to prevent ocs asset pipeline from breaking th…
Browse files Browse the repository at this point in the history
…e code
  • Loading branch information
icewind1991 committed Nov 28, 2015
1 parent 64ed535 commit e8627cf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions templates/index.php
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?php script($_['appId'], ['../build/main']); ?>
<?php style($_['appId'], ['../build/main']); ?>
<?php script($_['appId'], ['../build/main.min']); ?>
<?php style($_['appId'], ['../build/main.min']); ?>
4 changes: 2 additions & 2 deletions webpack/prod.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module.exports = {
},
output: {
path: assetsPath,
filename: '[name].js',
filename: '[name].min.js',
chunkFilename: '[name]-[chunkhash].js',
publicPath: '/dist/'
},
Expand Down Expand Up @@ -54,7 +54,7 @@ module.exports = {
},
plugins: [
new CleanPlugin([relativeAssetsPath]),
new ExtractTextPlugin("[name].css"),
new ExtractTextPlugin("[name].min.css"),
new webpack.DefinePlugin({
__CLIENT__: true,
__SERVER__: false,
Expand Down

3 comments on commit e8627cf

@bcutter
Copy link

Choose a reason for hiding this comment

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

Error logreader Could not find resource file "/owncloud/apps/logreader/js/../build/main.min.js"

@bcutter
Copy link

Choose a reason for hiding this comment

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

Did a sudo cp /var/www/owncloud/apps/logreader/build/main.css /var/www/owncloud/apps/logreader/build/main.min.css; sudo cp /var/www/owncloud/apps/logreader/build/main.js /var/www/owncloud/apps/logreader/build/main.min.js

Then: OC-Log error-free, but: again logreader is not loading when having the "asset-pipeline.enabled" = true

Did I miss something?

@bcutter
Copy link

Choose a reason for hiding this comment

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

I think I will try to update using the OC appstore. Do you know how long it will take until the update is available?

Please sign in to comment.