Refactor build routine and switch to airbnb style (#1703)
- Relocate webpack stuff to assets/build
- Switch all js to airbnb code style
- Update webpack to v2.0 (beta)
- Update all other dependencies
- Assets manifest uses relative path as key [1]
- Code should be compatible with Node 4.5.0
- All dependencies have been updated
[1]: Previously the assets manifest would use the basename of a file path as
its key when looking up a cachebusted file. This was to be consistent with
Sage 8. This change makes it so that the relative path is used instead.
To clarify, review the following example.
Before:
```
{
"main.js": "scripts/main_5f4bfc9a9f82291c6dea.js",
"main.css": "styles/main_5f4bfc9a9f82291c6dea.css",
"customizer.js": "scripts/customizer_5f4bfc9a9f82291c6dea.js"
}
```
After:
```
{
"scripts/main.js":"scripts/main_5f4bfc9a9f82291c6dea.js",
"styles/main.css":"styles/main_5f4bfc9a9f82291c6dea.css",
"scripts/customizer.js":"scripts/customizer_5f4bfc9a9f82291c6dea.js"
}
```
This commit is contained in:
11
.eslintrc
11
.eslintrc
@@ -1,17 +1,14 @@
|
|||||||
{
|
{
|
||||||
"root": true,
|
"root": true,
|
||||||
"extends": "eslint:recommended",
|
"extends": "airbnb",
|
||||||
"globals": {
|
"globals": {
|
||||||
"wp": true
|
"wp": true
|
||||||
},
|
},
|
||||||
"env": {
|
"env": {
|
||||||
|
"amd": true,
|
||||||
"browser": true,
|
"browser": true,
|
||||||
"jquery": true,
|
"jquery": true,
|
||||||
"node": true,
|
"node": true
|
||||||
"amd": true
|
|
||||||
},
|
},
|
||||||
"parser": "babel-eslint",
|
"parser": "babel-eslint"
|
||||||
"rules": {
|
|
||||||
"no-console": 0
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ php:
|
|||||||
- nightly
|
- nightly
|
||||||
|
|
||||||
env:
|
env:
|
||||||
- TRAVIS_NODE_VERSION="4.2" CXX="g++-4.8"
|
- TRAVIS_NODE_VERSION="4" CXX="g++-4.8"
|
||||||
- TRAVIS_NODE_VERSION="5.3" CXX="g++-4.8"
|
- TRAVIS_NODE_VERSION="6" CXX="g++-4.8"
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
fast_finish: true
|
fast_finish: true
|
||||||
@@ -33,7 +33,7 @@ before_install:
|
|||||||
- composer self-update
|
- composer self-update
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
|
- source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION && nvm use $TRAVIS_NODE_VERSION
|
||||||
- travis_retry npm install -g npm@latest
|
- travis_retry npm install -g npm@latest
|
||||||
- travis_retry npm install -g eslint
|
- travis_retry npm install -g eslint
|
||||||
- node -v && npm -v
|
- node -v && npm -v
|
||||||
@@ -43,5 +43,8 @@ install:
|
|||||||
- composer install -o --prefer-dist --no-interaction
|
- composer install -o --prefer-dist --no-interaction
|
||||||
|
|
||||||
script:
|
script:
|
||||||
|
- npm run test
|
||||||
- npm run build
|
- npm run build
|
||||||
|
- npm run clean
|
||||||
|
- npm run "build:production"
|
||||||
- composer test
|
- composer test
|
||||||
|
|||||||
8
assets/build/.eslintrc
Normal file
8
assets/build/.eslintrc
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"root": false,
|
||||||
|
"extends": "airbnb",
|
||||||
|
"rules": {
|
||||||
|
"import/no-extraneous-dependencies": 0,
|
||||||
|
"prefer-rest-params": 0
|
||||||
|
}
|
||||||
|
}
|
||||||
52
assets/build/config.js
Normal file
52
assets/build/config.js
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
/* eslint-disable import/no-extraneous-dependencies */
|
||||||
|
|
||||||
|
const path = require('path');
|
||||||
|
const argv = require('minimist')(process.argv.slice(2));
|
||||||
|
const glob = require('glob-all');
|
||||||
|
const merge = require('lodash/merge');
|
||||||
|
|
||||||
|
const mergeWithConcat = require('./util/mergeWithConcat');
|
||||||
|
const userConfig = require('../config');
|
||||||
|
|
||||||
|
const isProduction = !!((argv.env && argv.env.production) || argv.p);
|
||||||
|
const rootPath = (userConfig.paths && userConfig.paths.root)
|
||||||
|
? userConfig.paths.root
|
||||||
|
: process.cwd();
|
||||||
|
|
||||||
|
const config = mergeWithConcat({
|
||||||
|
copy: ['images/**/*'],
|
||||||
|
proxyUrl: 'http://localhost:3000',
|
||||||
|
cacheBusting: '[name]_[hash]',
|
||||||
|
paths: {
|
||||||
|
root: rootPath,
|
||||||
|
assets: path.join(rootPath, 'assets'),
|
||||||
|
dist: path.join(rootPath, 'dist'),
|
||||||
|
},
|
||||||
|
enabled: {
|
||||||
|
sourceMaps: !isProduction,
|
||||||
|
minify: isProduction,
|
||||||
|
cacheBusting: isProduction,
|
||||||
|
watcher: !!argv.watch,
|
||||||
|
uglifyJs: !(argv.p || argv.optimizeMinimize),
|
||||||
|
},
|
||||||
|
watch: [
|
||||||
|
'templates/**/*.php',
|
||||||
|
'src/**/*.php',
|
||||||
|
],
|
||||||
|
}, userConfig);
|
||||||
|
|
||||||
|
Object.keys(config.entry).forEach(id =>
|
||||||
|
config.entry[id].unshift(path.join(__dirname, 'public-path.js')));
|
||||||
|
|
||||||
|
module.exports = mergeWithConcat(config, {
|
||||||
|
env: merge({ production: isProduction, development: !isProduction }, argv.env),
|
||||||
|
entry: {
|
||||||
|
get files() {
|
||||||
|
return glob.sync(config.copy, {
|
||||||
|
cwd: config.paths.assets,
|
||||||
|
mark: true,
|
||||||
|
}).filter(file => !((file.slice(-1) === '/') || (!file.indexOf('*') === -1)))
|
||||||
|
.map(file => path.join(config.paths.assets, file));
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
8
assets/build/public-path.js
Normal file
8
assets/build/public-path.js
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
/* eslint-env browser */
|
||||||
|
/* globals WEBPACK_PUBLIC_PATH */
|
||||||
|
|
||||||
|
// Dynamically set absolute public path from current protocol and host
|
||||||
|
if (WEBPACK_PUBLIC_PATH) {
|
||||||
|
// eslint-disable-next-line no-undef, camelcase
|
||||||
|
__webpack_public_path__ = `${location.protocol}//${location.host}${WEBPACK_PUBLIC_PATH}`;
|
||||||
|
}
|
||||||
14
assets/build/util/mergeWithConcat.js
Normal file
14
assets/build/util/mergeWithConcat.js
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
/* eslint-disable import/no-extraneous-dependencies */
|
||||||
|
|
||||||
|
const mergeWith = require('lodash/mergeWith');
|
||||||
|
|
||||||
|
module.exports = function mergeWithConcat() {
|
||||||
|
const args = [].slice.call(arguments);
|
||||||
|
args.push((a, b) => {
|
||||||
|
if (Array.isArray(a) && Array.isArray(b)) {
|
||||||
|
return a.concat(b);
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
|
});
|
||||||
|
return mergeWith.apply(this, args);
|
||||||
|
};
|
||||||
200
assets/build/webpack.config.js
Normal file
200
assets/build/webpack.config.js
Normal file
@@ -0,0 +1,200 @@
|
|||||||
|
/* eslint-disable import/no-extraneous-dependencies */
|
||||||
|
const webpack = require('webpack');
|
||||||
|
const path = require('path');
|
||||||
|
const qs = require('qs');
|
||||||
|
const autoprefixer = require('autoprefixer');
|
||||||
|
const CleanPlugin = require('clean-webpack-plugin');
|
||||||
|
const ExtractTextPlugin = require('extract-text-webpack-plugin');
|
||||||
|
const ImageminPlugin = require('imagemin-webpack-plugin').default;
|
||||||
|
const imageminMozjpeg = require('imagemin-mozjpeg');
|
||||||
|
|
||||||
|
const mergeWithConcat = require('./util/mergeWithConcat');
|
||||||
|
const webpackConfigProduction = require('./webpack.config.production');
|
||||||
|
const webpackConfigWatch = require('./webpack.config.watch');
|
||||||
|
const config = require('./config');
|
||||||
|
|
||||||
|
const publicPath = `${config.publicPath}/${path.basename(config.paths.dist)}/`;
|
||||||
|
const assetsFilenames = (config.enabled.cacheBusting) ? config.cacheBusting : '[name]';
|
||||||
|
const sourceMapQueryStr = (config.enabled.sourceMaps) ? '+sourceMap' : '-sourceMap';
|
||||||
|
|
||||||
|
const jsLoader = {
|
||||||
|
test: /\.js$/,
|
||||||
|
exclude: [/(node_modules|bower_components)(?)/],
|
||||||
|
loaders: [`babel?presets[]=${path.resolve('./node_modules/babel-preset-es2015')}&cacheDirectory`],
|
||||||
|
};
|
||||||
|
|
||||||
|
if (config.enabled.watcher) {
|
||||||
|
jsLoader.loaders.unshift('monkey-hot');
|
||||||
|
}
|
||||||
|
|
||||||
|
const webpackConfig = {
|
||||||
|
context: config.paths.assets,
|
||||||
|
entry: config.entry,
|
||||||
|
devtool: (config.enabled.sourceMaps ? '#source-map' : undefined),
|
||||||
|
output: {
|
||||||
|
path: config.paths.dist,
|
||||||
|
publicPath,
|
||||||
|
filename: `scripts/${assetsFilenames}.js`,
|
||||||
|
},
|
||||||
|
module: {
|
||||||
|
preLoaders: [
|
||||||
|
{
|
||||||
|
test: /\.js?$/,
|
||||||
|
include: config.paths.assets,
|
||||||
|
loader: 'eslint',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
loaders: [
|
||||||
|
jsLoader,
|
||||||
|
{
|
||||||
|
test: /\.css$/,
|
||||||
|
include: config.paths.assets,
|
||||||
|
loader: ExtractTextPlugin.extract({
|
||||||
|
fallbackLoader: 'style',
|
||||||
|
loader: [
|
||||||
|
`css?${sourceMapQueryStr}`,
|
||||||
|
'postcss',
|
||||||
|
],
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
test: /\.scss$/,
|
||||||
|
include: config.paths.assets,
|
||||||
|
loader: ExtractTextPlugin.extract({
|
||||||
|
fallbackLoader: 'style',
|
||||||
|
loader: [
|
||||||
|
`css?${sourceMapQueryStr}`,
|
||||||
|
'postcss',
|
||||||
|
`resolve-url?${sourceMapQueryStr}`,
|
||||||
|
`sass?${sourceMapQueryStr}`,
|
||||||
|
],
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
test: /\.(png|jpe?g|gif|svg)$/,
|
||||||
|
include: config.paths.assets,
|
||||||
|
loaders: [
|
||||||
|
`file?${qs.stringify({
|
||||||
|
name: '[path][name].[ext]',
|
||||||
|
})}`,
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
test: /\.(ttf|eot)$/,
|
||||||
|
include: config.paths.assets,
|
||||||
|
loader: `file?${qs.stringify({
|
||||||
|
name: `[path]${assetsFilenames}.[ext]`,
|
||||||
|
})}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
test: /\.woff2?$/,
|
||||||
|
include: config.paths.assets,
|
||||||
|
loader: `url?${qs.stringify({
|
||||||
|
limit: 10000,
|
||||||
|
mimetype: 'application/font-woff',
|
||||||
|
name: `[path]${assetsFilenames}.[ext]`,
|
||||||
|
})}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
test: /\.(ttf|eot|woff2?|png|jpe?g|gif|svg)$/,
|
||||||
|
include: /node_modules|bower_components/,
|
||||||
|
loader: 'file',
|
||||||
|
query: {
|
||||||
|
name: `vendor/${config.cacheBusting}.[ext]`,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
modules: [
|
||||||
|
config.paths.assets,
|
||||||
|
'node_modules',
|
||||||
|
'bower_components',
|
||||||
|
],
|
||||||
|
enforceExtensions: false,
|
||||||
|
externals: {
|
||||||
|
jquery: 'jQuery',
|
||||||
|
},
|
||||||
|
plugins: [
|
||||||
|
new CleanPlugin([config.paths.dist], config.paths.root),
|
||||||
|
new ImageminPlugin({
|
||||||
|
optipng: {
|
||||||
|
optimizationLevel: 7,
|
||||||
|
},
|
||||||
|
gifsicle: {
|
||||||
|
optimizationLevel: 3,
|
||||||
|
},
|
||||||
|
pngquant: {
|
||||||
|
quality: '65-90',
|
||||||
|
speed: 4,
|
||||||
|
},
|
||||||
|
svgo: {
|
||||||
|
removeUnknownsAndDefaults: false,
|
||||||
|
cleanupIDs: false,
|
||||||
|
},
|
||||||
|
jpegtran: null,
|
||||||
|
plugins: [imageminMozjpeg({
|
||||||
|
quality: 75,
|
||||||
|
})],
|
||||||
|
disable: (config.enabled.watcher),
|
||||||
|
}),
|
||||||
|
new ExtractTextPlugin({
|
||||||
|
filename: `styles/${assetsFilenames}.css`,
|
||||||
|
allChunks: true,
|
||||||
|
disable: (config.enabled.watcher),
|
||||||
|
}),
|
||||||
|
new webpack.ProvidePlugin({
|
||||||
|
$: 'jquery',
|
||||||
|
jQuery: 'jquery',
|
||||||
|
'window.jQuery': 'jquery',
|
||||||
|
Tether: 'tether',
|
||||||
|
'window.Tether': 'tether',
|
||||||
|
}),
|
||||||
|
new webpack.DefinePlugin({
|
||||||
|
WEBPACK_PUBLIC_PATH: (config.enabled.watcher)
|
||||||
|
? JSON.stringify(publicPath)
|
||||||
|
: false,
|
||||||
|
}),
|
||||||
|
new webpack.LoaderOptionsPlugin({
|
||||||
|
minimize: config.enabled.minify,
|
||||||
|
debug: config.enabled.watcher,
|
||||||
|
stats: { colors: true },
|
||||||
|
postcss: [
|
||||||
|
autoprefixer({
|
||||||
|
browsers: [
|
||||||
|
'last 2 versions',
|
||||||
|
'android 4',
|
||||||
|
'opera 12',
|
||||||
|
],
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
eslint: {
|
||||||
|
failOnWarning: false,
|
||||||
|
failOnError: true,
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = webpackConfig;
|
||||||
|
|
||||||
|
if (config.env.production) {
|
||||||
|
module.exports = mergeWithConcat(webpackConfig, webpackConfigProduction);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (config.enabled.watcher) {
|
||||||
|
module.exports = mergeWithConcat(webpackConfig, webpackConfigWatch);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (config.enabled.uglifyJs) {
|
||||||
|
module.exports.plugins.push(
|
||||||
|
new webpack.optimize.UglifyJsPlugin({
|
||||||
|
compress: config.enabled.minify ? {
|
||||||
|
drop_debugger: true,
|
||||||
|
dead_code: true,
|
||||||
|
warnings: false,
|
||||||
|
} : false,
|
||||||
|
sourceMap: config.enabled.sourceMaps,
|
||||||
|
output: { comments: false },
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
40
assets/build/webpack.config.production.js
Normal file
40
assets/build/webpack.config.production.js
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
/* eslint-disable import/no-extraneous-dependencies */
|
||||||
|
const AssetsPlugin = require('assets-webpack-plugin');
|
||||||
|
const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
|
||||||
|
const cssnano = require('cssnano');
|
||||||
|
const path = require('path');
|
||||||
|
|
||||||
|
const config = require('./config');
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Process AssetsPlugin output and format it
|
||||||
|
* for Sage: {"[name].[ext]":"[name]_[hash].[ext]"}
|
||||||
|
* @param {Object} assets passed by processOutput
|
||||||
|
* @return {String} JSON
|
||||||
|
*/
|
||||||
|
const assetsPluginProcessOutput = (assets) => {
|
||||||
|
const results = {};
|
||||||
|
Object.keys(assets).forEach(name => {
|
||||||
|
Object.keys(assets[name]).forEach(ext => {
|
||||||
|
const filename = `${path.dirname(assets[name][ext])}/${path.basename(`${name}.${ext}`)}`;
|
||||||
|
results[filename] = assets[name][ext];
|
||||||
|
});
|
||||||
|
});
|
||||||
|
return JSON.stringify(results);
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
plugins: [
|
||||||
|
new AssetsPlugin({
|
||||||
|
path: config.paths.dist,
|
||||||
|
filename: 'assets.json',
|
||||||
|
fullPath: false,
|
||||||
|
processOutput: assetsPluginProcessOutput,
|
||||||
|
}),
|
||||||
|
new OptimizeCssAssetsPlugin({
|
||||||
|
cssProcessor: cssnano,
|
||||||
|
cssProcessorOptions: { discardComments: { removeAll: true } },
|
||||||
|
canPrint: true,
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
};
|
||||||
22
assets/build/webpack.config.watch.js
Normal file
22
assets/build/webpack.config.watch.js
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
/* eslint-disable import/no-extraneous-dependencies */
|
||||||
|
const BrowserSyncPlugin = require('browser-sync-webpack-plugin');
|
||||||
|
const url = require('url');
|
||||||
|
|
||||||
|
const config = require('./config');
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
output: { pathinfo: true },
|
||||||
|
debug: true,
|
||||||
|
devTool: 'cheap-module-source-map',
|
||||||
|
plugins: [
|
||||||
|
new BrowserSyncPlugin({
|
||||||
|
host: url.parse(config.proxyUrl).hostname,
|
||||||
|
port: url.parse(config.proxyUrl).port,
|
||||||
|
proxy: config.devUrl,
|
||||||
|
files: [
|
||||||
|
'templates/**/*.php',
|
||||||
|
'src/**/*.php',
|
||||||
|
],
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
};
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
{
|
{
|
||||||
"entry": {
|
"entry": {
|
||||||
"main": [
|
"main": [
|
||||||
"./scripts/util/public-path.js",
|
|
||||||
"./scripts/main.js",
|
"./scripts/main.js",
|
||||||
"./styles/main.scss"
|
"./styles/main.scss"
|
||||||
],
|
],
|
||||||
@@ -10,5 +9,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"publicPath": "/app/themes/sage",
|
"publicPath": "/app/themes/sage",
|
||||||
"devUrl": "http://example.dev"
|
"devUrl": "https://example.dev",
|
||||||
|
"proxyUrl": "https://localhost:3000",
|
||||||
|
"cacheBusting": "[name]_[hash:8]"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import $ from 'jquery';
|
import $ from 'jquery';
|
||||||
|
|
||||||
wp.customize('blogname', (value) => {
|
wp.customize('blogname', (value) => {
|
||||||
value.bind((to) => $('.brand').text(to))
|
value.bind((to) => $('.brand').text(to));
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
// import external dependencies
|
// import external dependencies
|
||||||
import 'jquery'
|
import 'jquery';
|
||||||
import 'bootstrap/dist/js/bootstrap'
|
import 'bootstrap/dist/js/bootstrap';
|
||||||
|
|
||||||
// import local dependencies
|
// import local dependencies
|
||||||
import Router from './util/router';
|
import Router from './util/router';
|
||||||
import common from './routes/Common';
|
import common from './routes/Common';
|
||||||
import home from './routes/Home';
|
import home from './routes/Home';
|
||||||
import about_us from './routes/About';
|
import aboutUs from './routes/About';
|
||||||
|
|
||||||
// Use this variable to set up the common and page specific functions. If you
|
// Use this variable to set up the common and page specific functions. If you
|
||||||
// rename this variable, you will also need to rename the namespace below.
|
// rename this variable, you will also need to rename the namespace below.
|
||||||
@@ -15,8 +15,8 @@ const routes = {
|
|||||||
common,
|
common,
|
||||||
// Home page
|
// Home page
|
||||||
home,
|
home,
|
||||||
// About us page, note the change from about-us to about_us.
|
// About us page, note the change from about-us to aboutUs.
|
||||||
about_us
|
aboutUs,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Load Events
|
// Load Events
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
export default {
|
export default {
|
||||||
init() {
|
init() {
|
||||||
// JavaScript to be fired on the about us page
|
// JavaScript to be fired on the about us page
|
||||||
}
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -4,5 +4,5 @@ export default {
|
|||||||
},
|
},
|
||||||
finalize() {
|
finalize() {
|
||||||
// JavaScript to be fired on all pages, after page specific JS is fired
|
// JavaScript to be fired on all pages, after page specific JS is fired
|
||||||
}
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -4,5 +4,5 @@ export default {
|
|||||||
},
|
},
|
||||||
finalize() {
|
finalize() {
|
||||||
// JavaScript to be fired on the home page, after the init JS
|
// JavaScript to be fired on the home page, after the init JS
|
||||||
}
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
5
assets/scripts/util/camelCase.js
Normal file
5
assets/scripts/util/camelCase.js
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
// the most terrible camelizer on the internet, guaranteed!
|
||||||
|
export default (str) => `${str.charAt(0).toLowerCase()}${str.replace(/[\W_]/g, '|').split('|')
|
||||||
|
.map(part => `${part.charAt(0).toUpperCase()}${part.slice(1)}`)
|
||||||
|
.join('')
|
||||||
|
.slice(1)}`;
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
/* globals WEBPACK_PUBLIC_PATH */
|
|
||||||
|
|
||||||
// Dynamically set absolute public path from current protocol and host
|
|
||||||
if (WEBPACK_PUBLIC_PATH !== false) {
|
|
||||||
/* eslint-disable no-undef */
|
|
||||||
__webpack_public_path__ = location.protocol + '//' + location.host + WEBPACK_PUBLIC_PATH;
|
|
||||||
/*eslint-enable no-undef*/
|
|
||||||
}
|
|
||||||
@@ -6,6 +6,8 @@
|
|||||||
* replace the dash with an underscore when adding it to the object below.
|
* replace the dash with an underscore when adding it to the object below.
|
||||||
* ======================================================================== */
|
* ======================================================================== */
|
||||||
|
|
||||||
|
import camelCase from './camelCase';
|
||||||
|
|
||||||
// The routing fires all common scripts, followed by the page specific scripts.
|
// The routing fires all common scripts, followed by the page specific scripts.
|
||||||
// Add additional events for more control over timing e.g. a finalize event
|
// Add additional events for more control over timing e.g. a finalize event
|
||||||
export default class Router {
|
export default class Router {
|
||||||
@@ -25,10 +27,15 @@ export default class Router {
|
|||||||
this.fire('common');
|
this.fire('common');
|
||||||
|
|
||||||
// Fire page-specific init JS, and then finalize JS
|
// Fire page-specific init JS, and then finalize JS
|
||||||
document.body.className.replace(/-/g, '_').split(/\s+/).forEach((className) => {
|
document.body.className
|
||||||
this.fire(className);
|
.toLowerCase()
|
||||||
this.fire(className, 'finalize');
|
.replace(/-/g, '_')
|
||||||
});
|
.split(/\s+/)
|
||||||
|
.map(camelCase)
|
||||||
|
.forEach((className) => {
|
||||||
|
this.fire(className);
|
||||||
|
this.fire(className, 'finalize');
|
||||||
|
});
|
||||||
|
|
||||||
// Fire common finalize JS
|
// Fire common finalize JS
|
||||||
this.fire('common', 'finalize');
|
this.fire('common', 'finalize');
|
||||||
|
|||||||
76
package.json
76
package.json
@@ -18,55 +18,63 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build:production": "webpack -p --progress --release",
|
"build": "webpack --progress --config assets/build/webpack.config.js",
|
||||||
"build": "webpack -d --progress",
|
"build:production": "npm run build -s -- -p",
|
||||||
"watch": "node watch.js --watch",
|
"start": "npm run build -s -- --watch",
|
||||||
"lint": "eslint -c .eslintrc assets/scripts watch.js webpack.config.js"
|
"clean": "node node_modules/rimraf/bin.js dist",
|
||||||
|
"lint": "node node_modules/eslint/bin/eslint.js assets/scripts assets/build",
|
||||||
|
"test": "npm run lint -s"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=4"
|
"node": ">=5"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"assets-webpack-plugin": "^3.4.0",
|
"assets-webpack-plugin": "^3.4.0",
|
||||||
"autoprefixer": "^6.1.0",
|
"autoprefixer": "^6.4.0",
|
||||||
"babel-cli": "^6.6.5",
|
"babel-cli": "^6.14.0",
|
||||||
"babel-core": "^6.7.4",
|
"babel-core": "^6.14.0",
|
||||||
"babel-eslint": "^6.0.0",
|
"babel-eslint": "^6.1.2",
|
||||||
"babel-loader": "^6.2.4",
|
"babel-loader": "^6.2.5",
|
||||||
"babel-preset-es2015": "^6.13.2",
|
"babel-preset-es2015-webpack": "^6.4.3",
|
||||||
"babel-register": "^6.5.2",
|
"babel-register": "^6.14.0",
|
||||||
"babel-runtime": "^6.5.0",
|
"babel-runtime": "^6.11.6",
|
||||||
"body-parser": "^1.14.1",
|
"body-parser": "^1.15.2",
|
||||||
"browser-sync": "^2.11.2",
|
"browser-sync": "^2.14.0",
|
||||||
"clean-webpack-plugin": "^0.1.8",
|
"browser-sync-webpack-plugin": "^1.1.2",
|
||||||
"css-loader": "^0.23.1",
|
"clean-webpack-plugin": "^0.1.10",
|
||||||
"cssnano": "^3.5.2",
|
"css-loader": "^0.24.0",
|
||||||
"eslint": "^3.2.2",
|
"cssnano": "^3.7.4",
|
||||||
"eslint-loader": "^1.3.0",
|
"eslint": "^3.4.0",
|
||||||
"eslint-plugin-react": "^6.0.0",
|
"eslint-config-airbnb": "^10.0.1",
|
||||||
"extract-text-webpack-plugin": "^1.0.1",
|
"eslint-config-airbnb-es5": "^1.0.9",
|
||||||
|
"eslint-loader": "^1.5.0",
|
||||||
|
"eslint-plugin-import": "^1.14.0",
|
||||||
|
"eslint-plugin-jsx-a11y": "^2.2.0",
|
||||||
|
"eslint-plugin-react": "^6.2.0",
|
||||||
|
"extract-text-webpack-plugin": "^2.0.0-beta.3",
|
||||||
"file-loader": "^0.9.0",
|
"file-loader": "^0.9.0",
|
||||||
"image-webpack-loader": "^2.0.0",
|
"glob-all": "^3.1.0",
|
||||||
"imagemin-pngcrush": "^5.0.0",
|
"imagemin-mozjpeg": "^6.0.0",
|
||||||
|
"imagemin-webpack-plugin": "^1.0.8",
|
||||||
"imports-loader": "^0.6.5",
|
"imports-loader": "^0.6.5",
|
||||||
|
"lodash": "^4.15.0",
|
||||||
"minimist": "^1.2.0",
|
"minimist": "^1.2.0",
|
||||||
"monkey-hot-loader": "0.0.3",
|
"monkey-hot-loader": "0.0.3",
|
||||||
"node-sass": "^3.4.2",
|
"node-sass": "^3.8.0",
|
||||||
"optimize-css-assets-webpack-plugin": "^1.3.0",
|
"optimize-css-assets-webpack-plugin": "^1.3.0",
|
||||||
"postcss": "^5.0.18",
|
"postcss": "^5.1.2",
|
||||||
"postcss-loader": "^0.9.1",
|
"postcss-loader": "^0.11.0",
|
||||||
"qs": "^6.1.0",
|
"qs": "^6.2.1",
|
||||||
"resolve-url-loader": "^1.4.3",
|
"resolve-url-loader": "^1.6.0",
|
||||||
|
"rimraf": "^2.5.4",
|
||||||
"sass-loader": "^4.0.0",
|
"sass-loader": "^4.0.0",
|
||||||
"style-loader": "^0.13.0",
|
"style-loader": "^0.13.1",
|
||||||
"url-loader": "^0.5.7",
|
"url-loader": "^0.5.7",
|
||||||
"webpack": "^1.12.14",
|
"webpack": "^2.1.0-beta.21"
|
||||||
"webpack-dev-middleware": "^1.6",
|
|
||||||
"webpack-hot-middleware": "^2.10.0"
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"bootstrap": "github:twbs/bootstrap#v4-dev",
|
"bootstrap": "github:twbs/bootstrap#v4-dev",
|
||||||
"font-awesome": "^4.6.3",
|
"font-awesome": "^4.6.3",
|
||||||
"jquery": "^1.12.4"
|
"jquery": "1.12.4 - 3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,8 +21,7 @@ class Asset
|
|||||||
public function __construct($file, ManifestInterface $manifest = null)
|
public function __construct($file, ManifestInterface $manifest = null)
|
||||||
{
|
{
|
||||||
$this->manifest = $manifest;
|
$this->manifest = $manifest;
|
||||||
$this->asset = basename($file);
|
$this->asset = $file;
|
||||||
$this->dir = dirname($file) != '.' ? dirname($file) : '';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function __toString()
|
public function __toString()
|
||||||
@@ -33,6 +32,6 @@ class Asset
|
|||||||
public function getUri()
|
public function getUri()
|
||||||
{
|
{
|
||||||
$file = ($this->manifest ? $this->manifest->get($this->asset) : $this->asset);
|
$file = ($this->manifest ? $this->manifest->get($this->asset) : $this->asset);
|
||||||
return get_template_directory_uri() . self::$dist . '/' . $this->dir . '/' . $file;
|
return get_template_directory_uri() . self::$dist . "/$file";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
33
watch.js
33
watch.js
@@ -1,33 +0,0 @@
|
|||||||
// External dependencies
|
|
||||||
var webpack = require('webpack'),
|
|
||||||
webpackDevMiddleware = require('webpack-dev-middleware'),
|
|
||||||
webpackHotMiddleware = require('webpack-hot-middleware'),
|
|
||||||
browserSync = require('browser-sync');
|
|
||||||
|
|
||||||
// Internal dependencies
|
|
||||||
var webpackConfig = require('./webpack.config'),
|
|
||||||
config = require('./assets/config');
|
|
||||||
|
|
||||||
// Internal variables
|
|
||||||
var compiler = webpack(webpackConfig);
|
|
||||||
|
|
||||||
browserSync.init({
|
|
||||||
proxy: {
|
|
||||||
target: config.devUrl,
|
|
||||||
middleware: [
|
|
||||||
webpackDevMiddleware(compiler, {
|
|
||||||
publicPath: webpackConfig.output.publicPath,
|
|
||||||
stats: {
|
|
||||||
colors: true
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
webpackHotMiddleware(compiler, {
|
|
||||||
log: browserSync.notify
|
|
||||||
})
|
|
||||||
]
|
|
||||||
},
|
|
||||||
files: [
|
|
||||||
'templates/**/*.php',
|
|
||||||
'src/**/*.php'
|
|
||||||
]
|
|
||||||
});
|
|
||||||
@@ -1,248 +0,0 @@
|
|||||||
// External dependencies
|
|
||||||
var webpack = require('webpack'),
|
|
||||||
path = require('path'),
|
|
||||||
argv = require('minimist')(process.argv.slice(2)),
|
|
||||||
qs = require('qs'),
|
|
||||||
autoprefixer = require('autoprefixer'),
|
|
||||||
Clean = require("clean-webpack-plugin"),
|
|
||||||
AssetsPlugin = require('assets-webpack-plugin'),
|
|
||||||
ExtractTextPlugin = require('extract-text-webpack-plugin'),
|
|
||||||
OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin'),
|
|
||||||
cssnano = require('cssnano');
|
|
||||||
|
|
||||||
// Internal dependencies
|
|
||||||
var config = require('./assets/config');
|
|
||||||
|
|
||||||
// Internal variables
|
|
||||||
var scriptsFilename = (argv.release) ? 'scripts/[name]_[hash].js' : 'scripts/[name].js',
|
|
||||||
stylesFilename = (argv.release) ? 'styles/[name]_[hash].css' : 'styles/[name].css',
|
|
||||||
sourceMapQueryStr = (argv.release) ? '-sourceMap' : '+sourceMap',
|
|
||||||
assets = 'assets/',
|
|
||||||
dist = 'dist/',
|
|
||||||
jsLoader,
|
|
||||||
webpackConfig;
|
|
||||||
|
|
||||||
jsLoader = {
|
|
||||||
test: /\.js$/,
|
|
||||||
exclude: [ /(node_modules|bower_components)(?)/ ],
|
|
||||||
loaders: [ 'babel?presets[]='+path.resolve('./node_modules/babel-preset-es2015')+'&cacheDirectory' ]
|
|
||||||
};
|
|
||||||
|
|
||||||
if (argv.watch) { // '--watch' to add monkey-hot
|
|
||||||
jsLoader.loaders.unshift('monkey-hot');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Process AssetsPlugin output and format it
|
|
||||||
* for Sage: {"[name].[ext]":"[name]_[hash].[ext]"}
|
|
||||||
* @param {Object} assets passed by processOutput
|
|
||||||
* @return {String} JSON
|
|
||||||
*/
|
|
||||||
var assetsPluginProcessOutput = function (assets) {
|
|
||||||
var name,
|
|
||||||
ext,
|
|
||||||
filename,
|
|
||||||
results = {};
|
|
||||||
|
|
||||||
for (name in assets) {
|
|
||||||
if (assets.hasOwnProperty(name)) {
|
|
||||||
for (ext in assets[name]) {
|
|
||||||
if (assets[name].hasOwnProperty(ext)) {
|
|
||||||
filename = name + '.' + ext;
|
|
||||||
results[filename] = path.basename(assets[name][ext]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return JSON.stringify(results);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Loop through webpack entry
|
|
||||||
* and add the hot middleware
|
|
||||||
* @param {Object} entry webpack entry
|
|
||||||
* @return {Object} entry with hot middleware
|
|
||||||
*/
|
|
||||||
var addHotMiddleware = function (entry) {
|
|
||||||
var name,
|
|
||||||
results = {},
|
|
||||||
hotMiddlewareScript = 'webpack-hot-middleware/client?' + qs.stringify({
|
|
||||||
timeout: 20000,
|
|
||||||
reload: true
|
|
||||||
});
|
|
||||||
|
|
||||||
for (name in entry) {
|
|
||||||
if (entry.hasOwnProperty(name)) {
|
|
||||||
if (entry[name] instanceof Array !== true) {
|
|
||||||
results[name] = [entry[name]];
|
|
||||||
} else {
|
|
||||||
results[name] = entry[name].slice(0);
|
|
||||||
}
|
|
||||||
results[name].push(hotMiddlewareScript);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return results;
|
|
||||||
};
|
|
||||||
|
|
||||||
webpackConfig = {
|
|
||||||
context: path.resolve(assets),
|
|
||||||
entry: config.entry,
|
|
||||||
output: {
|
|
||||||
path: path.join(__dirname, dist),
|
|
||||||
publicPath: path.join(config.publicPath, dist),
|
|
||||||
filename: scriptsFilename
|
|
||||||
},
|
|
||||||
module: {
|
|
||||||
preLoaders: [
|
|
||||||
{
|
|
||||||
test: /\.js?$/,
|
|
||||||
include: path.resolve(assets),
|
|
||||||
loader: 'eslint'
|
|
||||||
}
|
|
||||||
],
|
|
||||||
loaders: [
|
|
||||||
jsLoader,
|
|
||||||
{
|
|
||||||
test: /\.css$/,
|
|
||||||
include: path.resolve(assets),
|
|
||||||
loader: ExtractTextPlugin.extract('style', [
|
|
||||||
'css?' + sourceMapQueryStr,
|
|
||||||
'postcss'
|
|
||||||
])
|
|
||||||
},
|
|
||||||
{
|
|
||||||
test: /\.scss$/,
|
|
||||||
include: path.resolve(assets),
|
|
||||||
loader: ExtractTextPlugin.extract('style', [
|
|
||||||
'css?' + sourceMapQueryStr,
|
|
||||||
'postcss',
|
|
||||||
'resolve-url?' + sourceMapQueryStr,
|
|
||||||
'sass?' + sourceMapQueryStr
|
|
||||||
])
|
|
||||||
},
|
|
||||||
{
|
|
||||||
test: /\.(png|jpg|jpeg|gif|svg)(\?.*)?$/,
|
|
||||||
include: path.resolve(assets),
|
|
||||||
loaders: [
|
|
||||||
'file?' + qs.stringify({
|
|
||||||
name: '[path][name].[ext]'
|
|
||||||
}),
|
|
||||||
'image-webpack?' + JSON.stringify({
|
|
||||||
bypassOnDebug: true,
|
|
||||||
progressive: true,
|
|
||||||
optimizationLevel: 7,
|
|
||||||
interlaced: true,
|
|
||||||
pngquant: {
|
|
||||||
quality: "65-90",
|
|
||||||
speed: 4
|
|
||||||
},
|
|
||||||
svgo: {
|
|
||||||
removeUnknownsAndDefaults: false,
|
|
||||||
cleanupIDs: false
|
|
||||||
}
|
|
||||||
})
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
test: /\.(ttf|eot)(\?.*)?$/,
|
|
||||||
include: path.resolve(assets),
|
|
||||||
loader: 'file?' + qs.stringify({
|
|
||||||
name: '[path][name]_[md5:hash:hex:8].[ext]'
|
|
||||||
})
|
|
||||||
},
|
|
||||||
{
|
|
||||||
test: /\.woff(2)?(\?.*)?$/,
|
|
||||||
include: path.resolve(assets),
|
|
||||||
loader: 'url?' + qs.stringify({
|
|
||||||
limit: 10000,
|
|
||||||
mimetype: "application/font-woff",
|
|
||||||
name: "[path][name]_[md5:hash:hex:8].[ext]"
|
|
||||||
})
|
|
||||||
},
|
|
||||||
// Use file-loader for node_modules/ assets
|
|
||||||
{
|
|
||||||
test: /\.(ttf|eot|woff(2)?|png|jpg|jpeg|gif|svg)(\?.*)?$/,
|
|
||||||
include: /node_modules/,
|
|
||||||
loader: 'file?' + qs.stringify({
|
|
||||||
name: 'vendor/[name]_[md5:hash:hex:8].[ext]'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
resolve: {
|
|
||||||
extensions: [ '', '.js', '.json' ],
|
|
||||||
modulesDirectories: [
|
|
||||||
'node_modules',
|
|
||||||
'bower_components'
|
|
||||||
]
|
|
||||||
},
|
|
||||||
externals: {
|
|
||||||
jquery: 'jQuery'
|
|
||||||
},
|
|
||||||
plugins: [
|
|
||||||
new Clean([dist]),
|
|
||||||
new ExtractTextPlugin(stylesFilename, {
|
|
||||||
allChunks: true,
|
|
||||||
disable: (argv.watch === true) // '--watch' disable ExtractTextPlugin
|
|
||||||
}),
|
|
||||||
new webpack.ProvidePlugin({
|
|
||||||
$: 'jquery',
|
|
||||||
jQuery: 'jquery',
|
|
||||||
'window.jQuery': 'jquery',
|
|
||||||
'Tether': 'tether',
|
|
||||||
'window.Tether': 'tether'
|
|
||||||
}),
|
|
||||||
new webpack.DefinePlugin({
|
|
||||||
WEBPACK_PUBLIC_PATH: (argv.watch === true) ? JSON.stringify(path.join(config.publicPath, dist)) : false
|
|
||||||
})
|
|
||||||
],
|
|
||||||
postcss: [
|
|
||||||
autoprefixer({
|
|
||||||
browsers: [
|
|
||||||
'last 2 versions',
|
|
||||||
'android 4',
|
|
||||||
'opera 12'
|
|
||||||
]
|
|
||||||
})
|
|
||||||
],
|
|
||||||
eslint: {
|
|
||||||
failOnWarning: false,
|
|
||||||
failOnError: true
|
|
||||||
},
|
|
||||||
stats: {
|
|
||||||
colors: true
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// '--watch' to push additional plugins to webpackConfig
|
|
||||||
if (argv.watch) {
|
|
||||||
webpackConfig.entry = addHotMiddleware(webpackConfig.entry);
|
|
||||||
webpackConfig.output.pathinfo = true;
|
|
||||||
webpackConfig.debug = true;
|
|
||||||
webpackConfig.devtool = '#cheap-module-source-map';
|
|
||||||
webpackConfig.plugins.push(new webpack.optimize.OccurenceOrderPlugin());
|
|
||||||
webpackConfig.plugins.push(new webpack.HotModuleReplacementPlugin());
|
|
||||||
webpackConfig.plugins.push(new webpack.NoErrorsPlugin());
|
|
||||||
}
|
|
||||||
|
|
||||||
// '--release' to push additional plugins to webpackConfig
|
|
||||||
if (argv.release) {
|
|
||||||
webpackConfig.plugins.push(new AssetsPlugin({
|
|
||||||
path: path.join(__dirname, dist),
|
|
||||||
filename: 'assets.json',
|
|
||||||
fullPath: false,
|
|
||||||
processOutput: assetsPluginProcessOutput
|
|
||||||
}));
|
|
||||||
webpackConfig.plugins.push(new webpack.optimize.UglifyJsPlugin({
|
|
||||||
compress: {
|
|
||||||
'drop_debugger': true
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
webpackConfig.plugins.push(new OptimizeCssAssetsPlugin({
|
|
||||||
cssProcessor: cssnano,
|
|
||||||
cssProcessorOptions: { discardComments: { removeAll: true } },
|
|
||||||
canPrint: true
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = webpackConfig;
|
|
||||||
Reference in New Issue
Block a user