Skip to content

Commit 5ca722d

Browse files
committed
use runtime-only vue to avoid GCP error, fixed #2
1 parent 3377019 commit 5ca722d

File tree

4 files changed

+17
-15
lines changed

4 files changed

+17
-15
lines changed

template/build/webpack.base.js

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
const path = require('path')
22
const webpack = require('webpack')
3+
const CleanWebpackPlugin = require('clean-webpack-plugin')
34
const ChromeReloadPlugin = require('wcer')
45
const CopyWebpackPlugin = require('copy-webpack-plugin')
56
{{#if components.locales}}
67
const GenerateLocaleJsonPlugin = require('../plugins/GenerateLocaleJsonPlugin')
78
{{/if}}
89
const { cssLoaders, htmlPage } = require('./tools')
910

10-
let resolve = (dir) => path.join(__dirname, '..', 'src', dir)
11+
const rootDir = path.resolve(__dirname, '..')
12+
13+
let resolve = (dir) => path.join(rootDir, 'src', dir)
14+
1115
module.exports = {
1216
entry: {
1317
{{#if components.popupTab}}
@@ -29,7 +33,7 @@ module.exports = {
2933
{{/if}}
3034
},
3135
output: {
32-
path: path.join(__dirname, '..', 'dist'),
36+
path: path.join(rootDir, 'dist'),
3337
publicPath: '/',
3438
filename: 'js/[name].js',
3539
chunkFilename: 'js/[id].[name].js?[hash]',
@@ -47,9 +51,7 @@ module.exports = {
4751
test: /\.(js|vue)$/,
4852
loader: 'eslint-loader',
4953
enforce: 'pre',
50-
include: [
51-
path.join(__dirname, '..', 'src'), path.join(__dirname, '..', 'test')
52-
],
54+
include: [ path.join(rootDir, 'src') ],
5355
options: { formatter: require('eslint-friendly-formatter') }
5456
}, {
5557
test: /\.vue$/,
@@ -71,7 +73,9 @@ module.exports = {
7173
test: /\.js$/,
7274
loader: 'babel-loader',
7375
include: [
74-
path.join(__dirname, '..', 'src'), path.join(__dirname, '..', 'test')
76+
path.join(rootDir, 'src'),
77+
// https://github.com/sagalbot/vue-select/issues/71#issuecomment-229453096
78+
path.join(rootDir, 'node_modules', 'element-ui', 'src', 'utils')
7579
]
7680
}, {
7781
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
@@ -97,6 +101,7 @@ module.exports = {
97101
}]
98102
},
99103
plugins: [
104+
new CleanWebpackPlugin(['*'], { root: path.join(rootDir, 'dist') }),
100105
// Customize your extension structure.
101106
{{#if components.popupTab}}
102107
htmlPage('home', 'app', ['manifest', 'vendor', 'tab']),
@@ -113,14 +118,14 @@ module.exports = {
113118
htmlPage('background', 'background', ['manifest', 'vendor', 'background']),
114119
{{/if}}
115120
// End customize
116-
new CopyWebpackPlugin([{ from: path.join(__dirname, '..', 'static') }]),
121+
new CopyWebpackPlugin([{ from: path.join(rootDir, 'static') }]),
117122
new ChromeReloadPlugin({
118123
port: 9090,
119-
manifest: path.join(__dirname, '..', 'src', 'manifest.js')
124+
manifest: path.join(rootDir, 'src', 'manifest.js')
120125
}),
121126
{{#if components.locales}}
122127
new GenerateLocaleJsonPlugin({
123-
_locales: path.join(__dirname, '..', 'src', '_locales')
128+
_locales: path.join(rootDir, 'src', '_locales')
124129
}),
125130
{{/if}}
126131
new webpack.optimize.CommonsChunkPlugin({

template/build/webpack.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const { styleLoaders } = require('./tools')
77
module.exports = merge(baseWebpack, {
88
watch: true,
99
module: { rules: styleLoaders({ sourceMap: false }) },
10-
devtool: '#cheap-module-eval-source-map',
10+
devtool: '#cheap-module-source-map',
1111
plugins: [
1212
new webpack.NoEmitOnErrorsPlugin(),
1313
new webpack.DefinePlugin({ 'process.env.NODE_ENV': '"development"' }),

template/build/webpack.prod.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
const webpack = require('webpack')
22
const merge = require('webpack-merge')
3-
const CleanWebpackPlugin = require('clean-webpack-plugin')
43
const ZipPlugin = require('zip-webpack-plugin')
54
const ExtractTextPlugin = require('extract-text-webpack-plugin')
65
const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
76
const baseWebpack = require('./webpack.base')
87
const { styleLoaders } = require('./tools')
98

109
module.exports = merge(baseWebpack, {
11-
devtool: '#cheap-module-eval-source-map',
1210
module: { rules: styleLoaders({ extract: true, sourceMap: true }) },
1311
plugins: [
14-
new CleanWebpackPlugin(['dist/*.*']),
1512
new webpack.NoEmitOnErrorsPlugin(),
1613
new webpack.DefinePlugin({ 'process.env.NODE_ENV': '"production"' }),
1714
new OptimizeCSSPlugin({ cssProcessorOptions: { safe: true } }),
1815
new ExtractTextPlugin({ filename: 'css/[name].[contenthash].css' }),
1916
new webpack.HashedModuleIdsPlugin(),
2017
new ZipPlugin({
2118
path: '..',
22-
filename: 'extension.zip',
19+
filename: 'extension.zip'
2320
})
2421
]
2522
})

template/src/manifest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ module.exports = {
6262
default_locale: 'en',
6363
{{/if}}
6464
manifest_version: 2,
65-
content_security_policy: "script-src 'self' 'unsafe-eval'; object-src 'self'",
65+
content_security_policy: "script-src 'self'; object-src 'self'",
6666
web_accessible_resources: [
6767
{{#if components.devtool}}
6868
'panel.html',

0 commit comments

Comments
 (0)