Skip to content

Commit

Permalink
Updated build process
Browse files Browse the repository at this point in the history
Signed-off-by: Andrew Welch <[email protected]>
  • Loading branch information
khalwat committed Oct 4, 2018
1 parent a582b59 commit fdede7b
Show file tree
Hide file tree
Showing 19 changed files with 2,894 additions and 3,315 deletions.
93 changes: 43 additions & 50 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
"copyright": "nystudio107",
"main": "index.js",
"scripts": {
"dev": "webpack --config webpack.dev.js --progress --hide-modules",
"watch": "webpack --config webpack.dev.js --progress --watch --hide-modules",
"dev": "webpack-dev-server --config webpack.dev.js --progress --hide-modules",
"build": "webpack --config webpack.prod.js"
},
"repository": {
Expand All @@ -28,6 +27,7 @@
"dist": {
"base": "./src/assetbundles/transcoder/dist/",
"public": "/cpresources/transcoder/",
"devPublic": "http://192.168.10.10:8080",
"clean": [
"./js",
"./css"
Expand All @@ -36,17 +36,7 @@
"copyFiles": [
],
"manifest": {
"basePath": "",
"template": {
"twigCss": "./src/templates/_src/include-css-module.twig",
"twigModern": "./src/templates/_src/include-modern-module.twig",
"twigLegacy": "./src/templates/_src/include-legacy-module.twig"
},
"filename": {
"twigCss": "./src/templates/_includes/include-css-module.twig",
"twigModern": "./src/templates/_includes/include-modern-module.twig",
"twigLegacy": "./src/templates/_includes/include-legacy-module.twig"
}
"basePath": ""
},
"templates": "./src/templates/"
},
Expand Down Expand Up @@ -90,53 +80,56 @@
},
"urls": {},
"vars": {
"cssName": "transcoder.css",
"jsName": "transcoder.js"
"cssName": "styles",
"jsName": "transcoder"
},
"devDependencies": {
"autoprefixer": "^8.1.0",
"babel-core": "^6.26.0",
"babel-loader": "^7.1.4",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-polyfill": "^6.26.0",
"babel-preset-env": "^1.7.0",
"@babel/core": "^7.1.0",
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
"@babel/plugin-transform-runtime": "^7.1.0",
"@babel/preset-env": "^7.1.0",
"@babel/register": "^7.0.0",
"@babel/runtime": "^7.0.0",
"autoprefixer": "^9.1.5",
"babel-loader": "^8.0.2",
"clean-webpack-plugin": "^0.1.19",
"copy-webpack-plugin": "^4.5.1",
"css-loader": "^0.28.10",
"cssnano": "^3.10.0",
"extract-text-webpack-plugin": "^4.0.0-beta.0",
"file-loader": "^1.1.11",
"git-rev-sync": "^1.10.0",
"copy-webpack-plugin": "^4.5.2",
"css-loader": "^1.0.0",
"cssnano": "^4.1.0",
"file-loader": "^2.0.0",
"git-rev-sync": "^1.12.0",
"glob-all": "^3.1.0",
"html-webpack-plugin": "^3.2.0",
"ignore-loader": "^0.1.2",
"mini-css-extract-plugin": "^0.4.0",
"moment": "^2.21.0",
"optimize-css-assets-webpack-plugin": "^4.0.3",
"postcss": "^6.0.19",
"mini-css-extract-plugin": "^0.4.3",
"moment": "^2.22.2",
"optimize-css-assets-webpack-plugin": "^5.0.1",
"postcss": "^7.0.2",
"postcss-extend": "^1.0.5",
"postcss-hexrgba": "^1.0.0",
"postcss-import": "^11.1.0",
"postcss-loader": "^2.1.1",
"postcss-nested": "^3.0.0",
"postcss-nested-ancestors": "^1.0.0",
"postcss-simple-vars": "^4.1.0",
"purgecss-webpack-plugin": "^1.2.0",
"purgecss-whitelister": "^2.1.0",
"resolve-url-loader": "^2.3.0",
"tailwindcss": "^0.6.4",
"uglifyjs-webpack-plugin": "^1.2.7",
"vue-loader": "^15.3.0",
"postcss-hexrgba": "^1.0.1",
"postcss-import": "^12.0.0",
"postcss-loader": "^3.0.0",
"postcss-nested": "^4.1.0",
"postcss-nested-ancestors": "^2.0.0",
"postcss-simple-vars": "^5.0.1",
"purgecss-webpack-plugin": "^1.3.0",
"purgecss-whitelister": "^2.2.0",
"resolve-url-loader": "^3.0.0",
"style-loader": "^0.23.0",
"terser-webpack-plugin": "^1.1.0",
"vue-loader": "^15.4.2",
"vue-style-loader": "^4.1.2",
"vue-template-compiler": "^2.5.17",
"webpack": "^4.1.1",
"webpack-bundle-analyzer": "^2.13.1",
"webpack-cli": "^2.0.11",
"webpack-manifest-plugin": "^2.0.3",
"webpack-merge": "^4.1.2"
"webpack": "^4.19.1",
"webpack-bundle-analyzer": "^3.0.2",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.9",
"webpack-manifest-plugin": "^2.0.4",
"webpack-merge": "^4.1.4",
"webpack-notifier": "^1.6.0"
},
"dependencies": {
"@babel/polyfill": "^7.0.0",
"tailwindcss": "^0.6.6",
"vue": "^2.5.17",
"vue-confetti": "^0.4.1"
}
Expand Down
2 changes: 1 addition & 1 deletion src/Transcoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ protected function customFrontendRoutes(): array
{
return [
// Make webpack async bundle loading work out of published AssetBundles
'/cpresources/transcoder/<resourceType:{handle}>/<fileName>' => 'transcoder/cp-nav/resource',
'/cpresources/transcoder/<resourceType:{handle}>/<fileName>' => 'transcoder/manifest/resource',
];
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* @package Transcode
* @since 1.0.0
*/
class CpNavController extends Controller
class ManifestController extends Controller
{
// Constants
// =========================================================================
Expand Down
Loading

0 comments on commit fdede7b

Please sign in to comment.