zhongjin
/
cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Copy images and fonts with webpack

Browse Source
pull/14080/head
rubenmoya 6 years ago
parent 9d99fd026a
commit dacef9a382
3 changed files with 112 additions and 50 deletions
Show Stats Download Patch File Download Diff File

4
package.json
Unescape View File

@ -68,8 +68,8 @@
"brfs": "^1.4.3",
"browserify-resolutions": "1.1.0",
"cartoassets": "CartoDB/CartoAssets#master",
"clean-webpack-plugin": "^0.1.19",
"colors": "1.1.2",
"copy-webpack-plugin": "^4.5.1",
"css-loader": "^0.28.11",
"csswring": "^3.0.5",
"eslint": "~4.8.0",
@ -81,6 +81,7 @@
"eslint-plugin-standard": "~3.0.1",
"exports-loader": "0.6.4",
"extract-text-webpack-plugin": "^2.1.2",
"file-loader": "^1.1.11",
"fs-extra": "2.0.0",
"git-rev": "0.2.1",
"glob": "7.1.1",
@ -126,6 +127,7 @@
"uglify-js": "2.7.x",
"watchify": "3.7.0",
"webpack-bundle-analyzer": "^2.4.0",
"webpack-delete-after-emit": "^1.0.5",
"webpack-stats-plugin": "0.1.4"
},
"optionalDependencies": {

48
webpack/dashboard/entryPoints.js
Unescape View File

@ -0,0 +1,48 @@
const glob = require('glob');
const { resolve } = require('path');
const rootDir = file => resolve(__dirname, '../../', file);
const cartoAssets = rootDir('node_modules/cartoassets/src/scss/entry.scss');
module.exports = {
common: [
...glob.sync(rootDir('assets/stylesheets/common/**/*.scss')),
cartoAssets
],
// cartodb: rootDir('vendor/assets/stylesheets/cartodb.css'),
dashboard: [
...glob.sync(rootDir('assets/stylesheets/dashboard/*.scss')),
rootDir('assets/stylesheets/editor-3/_scroll-view.scss'),
cartoAssets
],
public_table_new: rootDir('lib/assets/javascripts/dashboard/public-dataset.js'),
public_dashboard_new: rootDir('lib/assets/javascripts/dashboard/public-dashboard.js'),
user_feed_new: rootDir('lib/assets/javascripts/dashboard/user-feed.js'),
api_keys_new: [
rootDir('lib/assets/javascripts/dashboard/api-keys.js'),
rootDir('assets/stylesheets/dashboard/api-keys.scss'),
rootDir('vendor/assets/stylesheets/tipsy.css')
],
data_library_new: rootDir('lib/assets/javascripts/dashboard/data-library.js'),
mobile_apps_new: rootDir('lib/assets/javascripts/dashboard/mobile-apps.js'),
account_new: rootDir('lib/assets/javascripts/dashboard/account.js'),
profile_new: rootDir('lib/assets/javascripts/dashboard/profile.js'),
sessions_new: rootDir('lib/assets/javascripts/dashboard/sessions.js'),
confirmation_new: rootDir('lib/assets/javascripts/dashboard/confirmation.js'),
dashboard_new: rootDir('lib/assets/javascripts/dashboard/dashboard.js'),
organization_new: rootDir('lib/assets/javascripts/dashboard/organization.js')
};

108
webpack/dashboard/webpack.dev.config.js
Unescape View File

@ -1,18 +1,13 @@
const webpack = require('webpack');
const glob = require('glob');
const { resolve } = require('path');
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
const ExtractTextPlugin = require('extract-text-webpack-plugin');
const CleanWebpackPlugin = require('clean-webpack-plugin');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const WebpackDeleteAfterEmit = require('webpack-delete-after-emit');
const { version } = require('../../package.json');
const entryPoints = require('./entryPoints');
const PATHS_TO_CLEAN = [
'common.js'
];
const stats = (env) => {
return env && env.stats;
};
const stats = (env) => (env && env.stats);
const rootDir = file => resolve(__dirname, '../../', file);
@ -21,31 +16,6 @@ const isVendor = (module, count) => {
return userRequest && userRequest.indexOf('node_modules') >= 0;
};
const entryPoints = {
common: [
rootDir('app/assets/stylesheets/old_common/video_player.scss'),
rootDir('app/assets/stylesheets/cartoassets/entry.scss'),
...glob.sync(rootDir('app/assets/stylesheets/common/**/*.scss')),
...glob.sync(rootDir('app/assets/stylesheets/client/**/*.scss'))
],
public_table_new: rootDir('lib/assets/javascripts/dashboard/public-dataset.js'),
public_dashboard_new: rootDir('lib/assets/javascripts/dashboard/public-dashboard.js'),
user_feed_new: rootDir('lib/assets/javascripts/dashboard/user-feed.js'),
api_keys_new: [
rootDir('lib/assets/javascripts/dashboard/api-keys.js'),
rootDir('app/assets/stylesheets/new_dashboard/api-keys.scss'),
rootDir('app/assets/stylesheets/plugins/tipsy.scss')
],
data_library_new: rootDir('lib/assets/javascripts/dashboard/data-library.js'),
mobile_apps_new: rootDir('lib/assets/javascripts/dashboard/mobile-apps.js'),
account_new: rootDir('lib/assets/javascripts/dashboard/account.js'),
profile_new: rootDir('lib/assets/javascripts/dashboard/profile.js'),
sessions_new: rootDir('lib/assets/javascripts/dashboard/sessions.js'),
confirmation_new: rootDir('lib/assets/javascripts/dashboard/confirmation.js'),
dashboard_new: rootDir('lib/assets/javascripts/dashboard/dashboard.js'),
organization_new: rootDir('lib/assets/javascripts/dashboard/organization.js')
};
module.exports = env => {
return {
entry: entryPoints,
@ -103,9 +73,26 @@ module.exports = env => {
filename: `./${version}/stylesheets/[name].css`
}),
new CleanWebpackPlugin(PATHS_TO_CLEAN, {
root: rootDir(`public/assets/${version}/javascripts`),
verbose: true
new CopyWebpackPlugin([
{
from: rootDir('app/assets/fonts'),
to: `./${version}/fonts/`,
toType: 'dir'
},
{
from: rootDir('app/assets/images'),
to: `./${version}/images/`,
toType: 'dir'
}
]),
new WebpackDeleteAfterEmit({
globs: [
`${version}/javascripts/common.js`,
`${version}/javascripts/common.js.map`,
`${version}/javascripts/dashboard.js`,
`${version}/javascripts/dashboard.js.map`
]
})
])
.filter(p => !!p), // undefined is not a valid plugin, so filter undefined values here
@ -115,7 +102,7 @@ module.exports = env => {
test: /\.js$/,
loader: 'shim-loader',
include: [
resolve(__dirname, '../../', 'node_modules/internal-carto.js')
rootDir('node_modules/internal-carto.js')
],
options: {
shim: {
@ -135,19 +122,19 @@ module.exports = env => {
test: /\.tpl$/,
use: 'tpl-loader',
include: [
resolve(__dirname, '../../', 'lib/assets/javascripts/builder'),
resolve(__dirname, '../../', 'lib/assets/javascripts/dashboard'),
resolve(__dirname, '../../', 'node_modules/internal-carto.js')
rootDir('lib/assets/javascripts/builder'),
rootDir('lib/assets/javascripts/dashboard'),
rootDir('node_modules/internal-carto.js')
]
},
{
test: /\.js$/,
loader: 'babel-loader',
include: [
resolve(__dirname, '../../', 'node_modules/tangram-cartocss'),
resolve(__dirname, '../../', 'node_modules/tangram.cartodb'),
resolve(__dirname, '../../', 'lib/assets/javascripts/carto-node'),
resolve(__dirname, '../../', 'lib/assets/javascripts/dashboard')
rootDir('node_modules/tangram-cartocss'),
rootDir('node_modules/tangram.cartodb'),
rootDir('lib/assets/javascripts/carto-node'),
rootDir('lib/assets/javascripts/dashboard')
],
options: {
presets: ['env'],
@ -155,10 +142,35 @@ module.exports = env => {
}
},
{
test: /\.scss$/,
test: /\.s?css$/,
use: ExtractTextPlugin.extract({
use: ['css-loader', 'sass-loader']
use: [
{
loader: 'css-loader',
options: {
sourceMap: false
}
},
{
loader: 'sass-loader',
options: {
data: `$assetsDir: "/assets/${version}";`,
sourceMap: false
}
}
]
})
},
{
test: /\.(ttf|eot|woff|woff2|svg)(.+#.+)?$/,
use: {
loader: 'file-loader',
options: {
name: `[name].[ext]`,
outputPath: `${version}/fonts/`,
publicPath: `/assets/${version}/fonts/`
}
}
}
]
},
@ -167,6 +179,6 @@ module.exports = env => {
fs: 'empty' // This fixes the error Module not found: Error: Can't resolve 'fs'
},
stats: 'normal'
stats: 'errors-only'
};
};

Write Preview
Loading…
Cancel
Save