jetpacker 0.2.0 → 0.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.eslintrc.js +8 -8
- data/.github/workflows/jest.yml +38 -0
- data/.github/workflows/js-lint.yml +39 -0
- data/.github/workflows/rubocop.yml +39 -0
- data/.github/workflows/ruby.yml +70 -0
- data/.node-version +1 -1
- data/.travis.yml +8 -21
- data/CHANGELOG.jetpacker.md +18 -0
- data/CHANGELOG.md +44 -2
- data/Gemfile +1 -0
- data/Gemfile.lock +115 -101
- data/README.md +24 -649
- data/docs/css.md +58 -3
- data/docs/deployment.md +2 -2
- data/docs/docker.md +17 -17
- data/docs/engines.md +13 -0
- data/docs/env.md +0 -2
- data/docs/integrations.md +220 -0
- data/docs/target.md +22 -0
- data/docs/testing.md +2 -3
- data/docs/troubleshooting.md +3 -1
- data/docs/typescript.md +92 -28
- data/docs/webpack-dev-server.md +1 -1
- data/jetpacker.gemspec +6 -5
- data/lib/install/config/babel.config.js +1 -3
- data/lib/install/config/webpacker.yml +11 -6
- data/lib/install/examples/react/tsconfig.json +2 -1
- data/lib/install/examples/typescript/tsconfig.json +2 -1
- data/lib/install/loaders/svelte.js +2 -2
- data/lib/install/template.rb +7 -7
- data/lib/install/typescript.rb +5 -1
- data/lib/jetpacker.rb +1 -0
- data/lib/jetpacker/version.rb +1 -1
- data/lib/tasks/webpacker/check_node.rake +15 -8
- data/lib/tasks/webpacker/check_yarn.rake +17 -10
- data/lib/tasks/webpacker/clean.rake +12 -8
- data/lib/tasks/webpacker/clobber.rake +8 -4
- data/lib/tasks/webpacker/yarn_install.rake +5 -16
- data/lib/webpacker.rb +1 -1
- data/lib/webpacker/commands.rb +33 -9
- data/lib/webpacker/compiler.rb +9 -5
- data/lib/webpacker/configuration.rb +13 -9
- data/lib/webpacker/dev_server_proxy.rb +3 -1
- data/lib/webpacker/dev_server_runner.rb +2 -2
- data/lib/webpacker/helper.rb +37 -18
- data/lib/webpacker/manifest.rb +4 -4
- data/lib/webpacker/railtie.rb +0 -43
- data/lib/webpacker/runner.rb +1 -0
- data/lib/webpacker/turbine.rb +36 -0
- data/lib/webpacker/version.rb +1 -1
- data/lib/webpacker/webpack_runner.rb +2 -2
- data/package.json +39 -39
- data/package/__tests__/config.js +12 -1
- data/package/__tests__/dev_server.js +2 -0
- data/package/__tests__/development.js +14 -1
- data/package/config.js +4 -1
- data/package/configPath.js +3 -0
- data/package/dev_server.js +1 -1
- data/package/env.js +1 -2
- data/package/environments/__tests__/base.js +29 -2
- data/package/environments/base.js +17 -7
- data/package/environments/development.js +39 -37
- data/package/environments/production.js +1 -3
- data/package/rules/babel.js +12 -5
- data/package/rules/file.js +1 -0
- data/package/rules/node_modules.js +1 -3
- data/package/rules/sass.js +7 -1
- data/package/utils/helpers.js +1 -1
- data/test/compiler_test.rb +8 -3
- data/test/configuration_test.rb +8 -7
- data/test/dev_server_runner_test.rb +1 -1
- data/test/helper_test.rb +3 -0
- data/test/manifest_test.rb +37 -6
- data/test/rake_tasks_test.rb +11 -0
- data/test/test_app/app/javascript/packs/multi_entry.css +4 -0
- data/test/test_app/app/javascript/packs/multi_entry.js +4 -0
- data/test/test_app/config/application.rb +0 -1
- data/test/test_app/config/webpacker.yml +7 -1
- data/test/test_app/public/packs/manifest.json +1 -0
- data/test/webpack_runner_test.rb +1 -1
- data/yarn.lock +3405 -2836
- metadata +38 -16
- data/gemfiles/Gemfile-rails.4.2.x +0 -9
- data/gemfiles/Gemfile-rails.5.0.x +0 -9
- data/gemfiles/Gemfile-rails.5.1.x +0 -9
- data/lib/install/javascript/packs/application.js +0 -18
- data/lib/install/loaders/typescript.js +0 -11
data/lib/webpacker/runner.rb
CHANGED
@@ -12,6 +12,7 @@ module Webpacker
|
|
12
12
|
@app_path = File.expand_path(".", Dir.pwd)
|
13
13
|
@node_modules_bin_path = ENV["WEBPACKER_NODE_MODULES_BIN_PATH"] || `yarn bin`.chomp
|
14
14
|
@webpack_config = File.join(@app_path, "config/webpack/#{ENV["NODE_ENV"]}.js")
|
15
|
+
@webpacker_config = File.join(@app_path, "config/webpacker.yml")
|
15
16
|
|
16
17
|
unless File.exist?(@webpack_config)
|
17
18
|
$stderr.puts "webpack config #{@webpack_config} not found, please run 'bundle exec rails webpacker:install' to install Webpacker with default configs or add the missing config file for your custom environment."
|
@@ -0,0 +1,36 @@
|
|
1
|
+
require "webpacker/helper"
|
2
|
+
require "webpacker/dev_server_proxy"
|
3
|
+
require "jets"
|
4
|
+
|
5
|
+
module Webpacker
|
6
|
+
class Turbine < ::Jets::Turbine
|
7
|
+
initializer "webpacker.set_configs" do |app|
|
8
|
+
# Allows Webpacker config values to be set via Jets env config files
|
9
|
+
app.config.webpacker ||= ActiveSupport::OrderedOptions.new # TODO: all config access outside initializer block
|
10
|
+
end
|
11
|
+
|
12
|
+
# TODO: add support load middleware in a Turbine
|
13
|
+
# initializer "webpacker.proxy" do |app|
|
14
|
+
# insert_middleware = Webpacker.config.dev_server.present? rescue nil
|
15
|
+
# if insert_middleware
|
16
|
+
# app.middleware.insert_before 0, Webpacker::DevServerProxy
|
17
|
+
# end
|
18
|
+
# end
|
19
|
+
|
20
|
+
initializer "webpacker.helper" do
|
21
|
+
ActiveSupport.on_load :action_controller do
|
22
|
+
ActionController::Base.helper Webpacker::Helper
|
23
|
+
end
|
24
|
+
|
25
|
+
ActiveSupport.on_load :action_view do
|
26
|
+
include Webpacker::Helper
|
27
|
+
end
|
28
|
+
end
|
29
|
+
|
30
|
+
initializer "webpacker.set_source" do |app|
|
31
|
+
if Webpacker.config.config_path.exist?
|
32
|
+
app.config.javascript_path = Webpacker.config.source_path.relative_path_from(Jets.root.join("app")).to_s
|
33
|
+
end
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|
data/lib/webpacker/version.rb
CHANGED
@@ -5,6 +5,7 @@ module Webpacker
|
|
5
5
|
class WebpackRunner < Webpacker::Runner
|
6
6
|
def run
|
7
7
|
env = Webpacker::Compiler.env
|
8
|
+
env["WEBPACKER_CONFIG"] = @webpacker_config
|
8
9
|
|
9
10
|
cmd = if node_modules_bin_exist?
|
10
11
|
["#{@node_modules_bin_path}/webpack"]
|
@@ -12,9 +13,8 @@ module Webpacker
|
|
12
13
|
["yarn", "webpack"]
|
13
14
|
end
|
14
15
|
|
15
|
-
if
|
16
|
+
if @argv.include?("--debug-webpacker")
|
16
17
|
cmd = [ "node", "--inspect-brk"] + cmd
|
17
|
-
ARGV.delete("--debug")
|
18
18
|
end
|
19
19
|
|
20
20
|
cmd += ["--config", @webpack_config] + @argv
|
data/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@rails/webpacker",
|
3
|
-
"version": "
|
3
|
+
"version": "5.2.1",
|
4
4
|
"description": "Use webpack to manage app-like JavaScript modules in Rails",
|
5
5
|
"main": "package/index.js",
|
6
6
|
"files": [
|
@@ -8,56 +8,56 @@
|
|
8
8
|
"lib/install/config/webpacker.yml"
|
9
9
|
],
|
10
10
|
"engines": {
|
11
|
-
"node": ">=
|
12
|
-
"yarn": ">=1
|
11
|
+
"node": ">=10.17.0",
|
12
|
+
"yarn": ">=1 <2"
|
13
13
|
},
|
14
14
|
"dependencies": {
|
15
|
-
"@babel/core": "^7.
|
16
|
-
"@babel/plugin-proposal-class-properties": "^7.
|
17
|
-
"@babel/plugin-proposal-object-rest-spread": "^7.
|
18
|
-
"@babel/plugin-syntax-dynamic-import": "^7.
|
19
|
-
"@babel/plugin-transform-destructuring": "^7.
|
20
|
-
"@babel/plugin-transform-regenerator": "^7.
|
21
|
-
"@babel/plugin-transform-runtime": "^7.
|
22
|
-
"@babel/preset-env": "^7.
|
23
|
-
"@babel/runtime": "^7.
|
24
|
-
"babel-loader": "^8.0
|
25
|
-
"babel-plugin-dynamic-import-node": "^2.3.
|
26
|
-
"babel-plugin-macros": "^2.
|
27
|
-
"case-sensitive-paths-webpack-plugin": "^2.
|
28
|
-
"compression-webpack-plugin": "^
|
29
|
-
"core-js": "^3.
|
30
|
-
"css-loader": "^3.
|
31
|
-
"file-loader": "^
|
32
|
-
"flatted": "^
|
15
|
+
"@babel/core": "^7.11.1",
|
16
|
+
"@babel/plugin-proposal-class-properties": "^7.10.4",
|
17
|
+
"@babel/plugin-proposal-object-rest-spread": "^7.10.1",
|
18
|
+
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
|
19
|
+
"@babel/plugin-transform-destructuring": "^7.10.1",
|
20
|
+
"@babel/plugin-transform-regenerator": "^7.10.1",
|
21
|
+
"@babel/plugin-transform-runtime": "^7.11.0",
|
22
|
+
"@babel/preset-env": "^7.11.0",
|
23
|
+
"@babel/runtime": "^7.11.2",
|
24
|
+
"babel-loader": "^8.1.0",
|
25
|
+
"babel-plugin-dynamic-import-node": "^2.3.3",
|
26
|
+
"babel-plugin-macros": "^2.8.0",
|
27
|
+
"case-sensitive-paths-webpack-plugin": "^2.3.0",
|
28
|
+
"compression-webpack-plugin": "^4.0.0",
|
29
|
+
"core-js": "^3.6.5",
|
30
|
+
"css-loader": "^3.5.3",
|
31
|
+
"file-loader": "^6.0.0",
|
32
|
+
"flatted": "^3.0.4",
|
33
33
|
"glob": "^7.1.6",
|
34
|
-
"js-yaml": "^3.
|
35
|
-
"mini-css-extract-plugin": "^0.
|
36
|
-
"node-sass": "^4.
|
34
|
+
"js-yaml": "^3.14.0",
|
35
|
+
"mini-css-extract-plugin": "^0.9.0",
|
36
|
+
"node-sass": "^4.14.1",
|
37
37
|
"optimize-css-assets-webpack-plugin": "^5.0.3",
|
38
38
|
"path-complete-extname": "^1.0.0",
|
39
|
-
"pnp-webpack-plugin": "^1.
|
40
|
-
"postcss-flexbugs-fixes": "^4.1
|
39
|
+
"pnp-webpack-plugin": "^1.6.4",
|
40
|
+
"postcss-flexbugs-fixes": "^4.2.1",
|
41
41
|
"postcss-import": "^12.0.1",
|
42
42
|
"postcss-loader": "^3.0.0",
|
43
43
|
"postcss-preset-env": "^6.7.0",
|
44
|
-
"postcss-safe-parser": "^4.0.
|
45
|
-
"regenerator-runtime": "^0.13.
|
46
|
-
"sass-loader": "
|
47
|
-
"style-loader": "^1.
|
48
|
-
"terser-webpack-plugin": "^
|
49
|
-
"webpack": "^4.
|
44
|
+
"postcss-safe-parser": "^4.0.2",
|
45
|
+
"regenerator-runtime": "^0.13.7",
|
46
|
+
"sass-loader": "^8.0.2",
|
47
|
+
"style-loader": "^1.2.1",
|
48
|
+
"terser-webpack-plugin": "^4.0.0",
|
49
|
+
"webpack": "^4.44.1",
|
50
50
|
"webpack-assets-manifest": "^3.1.1",
|
51
|
-
"webpack-cli": "^3.3.
|
51
|
+
"webpack-cli": "^3.3.12",
|
52
52
|
"webpack-sources": "^1.4.3"
|
53
53
|
},
|
54
54
|
"devDependencies": {
|
55
|
-
"eslint": "^
|
56
|
-
"eslint-config-airbnb": "^18.0
|
57
|
-
"eslint-plugin-import": "^2.
|
58
|
-
"eslint-plugin-jsx-a11y": "^6.
|
59
|
-
"eslint-plugin-react": "^7.
|
60
|
-
"jest": "^
|
55
|
+
"eslint": "^7.6.0",
|
56
|
+
"eslint-config-airbnb": "^18.2.0",
|
57
|
+
"eslint-plugin-import": "^2.22.0",
|
58
|
+
"eslint-plugin-jsx-a11y": "^6.3.1",
|
59
|
+
"eslint-plugin-react": "^7.20.5",
|
60
|
+
"jest": "^26.2.2"
|
61
61
|
},
|
62
62
|
"jest": {
|
63
63
|
"testRegex": "(/__tests__/.*|(\\.|/))\\.jsx?$",
|
data/package/__tests__/config.js
CHANGED
@@ -23,6 +23,16 @@ describe('Config', () => {
|
|
23
23
|
expect(config.publicPath).toEqual('http://foo.com/packs/')
|
24
24
|
})
|
25
25
|
|
26
|
+
test('should return additional paths as listed in app config, with resolved paths', () => {
|
27
|
+
expect(config.additional_paths).toEqual(
|
28
|
+
[
|
29
|
+
'app/assets',
|
30
|
+
'/etc/yarn',
|
31
|
+
'app/elm'
|
32
|
+
]
|
33
|
+
)
|
34
|
+
})
|
35
|
+
|
26
36
|
test('should return extensions as listed in app config', () => {
|
27
37
|
expect(config.extensions).toEqual([
|
28
38
|
'.mjs',
|
@@ -37,7 +47,8 @@ describe('Config', () => {
|
|
37
47
|
'.svg',
|
38
48
|
'.gif',
|
39
49
|
'.jpeg',
|
40
|
-
'.jpg'
|
50
|
+
'.jpg',
|
51
|
+
'.elm'
|
41
52
|
])
|
42
53
|
})
|
43
54
|
|
@@ -13,11 +13,13 @@ describe('DevServer', () => {
|
|
13
13
|
process.env.RAILS_ENV = 'development'
|
14
14
|
process.env.WEBPACKER_DEV_SERVER_HOST = '0.0.0.0'
|
15
15
|
process.env.WEBPACKER_DEV_SERVER_PORT = 5000
|
16
|
+
process.env.WEBPACKER_DEV_SERVER_DISABLE_HOST_CHECK = false
|
16
17
|
|
17
18
|
const devServer = require('../dev_server')
|
18
19
|
expect(devServer).toBeDefined()
|
19
20
|
expect(devServer.host).toEqual('0.0.0.0')
|
20
21
|
expect(devServer.port).toEqual('5000')
|
22
|
+
expect(devServer.disable_host_check).toBe(false)
|
21
23
|
})
|
22
24
|
|
23
25
|
test('with custom env prefix', () => {
|
@@ -11,9 +11,10 @@ describe('Development environment', () => {
|
|
11
11
|
describe('toWebpackConfig', () => {
|
12
12
|
beforeEach(() => jest.resetModules())
|
13
13
|
|
14
|
-
test('should use development config and environment', () => {
|
14
|
+
test('should use development config and environment including devServer if WEBPACK_DEV_SERVER', () => {
|
15
15
|
process.env.RAILS_ENV = 'development'
|
16
16
|
process.env.NODE_ENV = 'development'
|
17
|
+
process.env.WEBPACK_DEV_SERVER = 'YES'
|
17
18
|
const { environment } = require('../index')
|
18
19
|
|
19
20
|
const config = environment.toWebpackConfig()
|
@@ -26,5 +27,17 @@ describe('Development environment', () => {
|
|
26
27
|
}
|
27
28
|
})
|
28
29
|
})
|
30
|
+
|
31
|
+
test('should use development config and environment if WEBPACK_DEV_SERVER', () => {
|
32
|
+
process.env.RAILS_ENV = 'development'
|
33
|
+
process.env.NODE_ENV = 'development'
|
34
|
+
process.env.WEBPACK_DEV_SERVER = undefined
|
35
|
+
const { environment } = require('../index')
|
36
|
+
|
37
|
+
const config = environment.toWebpackConfig()
|
38
|
+
expect(config.output.path).toEqual(resolve('public', 'packs'))
|
39
|
+
expect(config.output.publicPath).toEqual('/packs/')
|
40
|
+
expect(config.devServer).toEqual(undefined)
|
41
|
+
})
|
29
42
|
})
|
30
43
|
})
|
data/package/config.js
CHANGED
@@ -4,9 +4,9 @@ const { readFileSync } = require('fs')
|
|
4
4
|
const deepMerge = require('./utils/deep_merge')
|
5
5
|
const { isArray, ensureTrailingSlash } = require('./utils/helpers')
|
6
6
|
const { railsEnv } = require('./env')
|
7
|
+
const configPath = require('./configPath')
|
7
8
|
|
8
9
|
const defaultConfigPath = require.resolve('../lib/install/config/webpacker.yml')
|
9
|
-
const configPath = resolve('config', 'webpacker.yml')
|
10
10
|
|
11
11
|
const getDefaultConfig = () => {
|
12
12
|
const defaultConfig = safeLoad(readFileSync(defaultConfigPath), 'utf8')
|
@@ -24,6 +24,9 @@ if (isArray(app.static_assets_extensions) && app.static_assets_extensions.length
|
|
24
24
|
const config = deepMerge(defaults, app)
|
25
25
|
config.outputPath = resolve(config.public_root_path, config.public_output_path)
|
26
26
|
|
27
|
+
// Merge resolved_paths into additional_paths for backwards-compat
|
28
|
+
config.additional_paths = config.additional_paths.concat(config.resolved_paths || [])
|
29
|
+
|
27
30
|
// Ensure that the publicPath includes our asset host so dynamic imports
|
28
31
|
// (code-splitting chunks and static assets) load from the CDN instead of a relative path.
|
29
32
|
const getPublicPath = () => {
|
data/package/dev_server.js
CHANGED
@@ -12,7 +12,7 @@ if (devServerConfig) {
|
|
12
12
|
const envPrefix = config.dev_server.env_prefix || 'WEBPACKER_DEV_SERVER'
|
13
13
|
|
14
14
|
Object.keys(devServerConfig).forEach((key) => {
|
15
|
-
const envValue = fetch(`${envPrefix}_${key.toUpperCase()
|
15
|
+
const envValue = fetch(`${envPrefix}_${key.toUpperCase()}`)
|
16
16
|
if (envValue !== undefined) devServerConfig[key] = envValue
|
17
17
|
})
|
18
18
|
}
|
data/package/env.js
CHANGED
@@ -1,10 +1,9 @@
|
|
1
|
-
const { resolve } = require('path')
|
2
1
|
const { safeLoad } = require('js-yaml')
|
3
2
|
const { readFileSync } = require('fs')
|
4
3
|
|
5
4
|
const NODE_ENVIRONMENTS = ['development', 'production', 'test']
|
6
5
|
const DEFAULT = 'production'
|
7
|
-
const configPath =
|
6
|
+
const configPath = require('./configPath')
|
8
7
|
|
9
8
|
const railsEnv = process.env.RAILS_ENV
|
10
9
|
const nodeEnv = process.env.NODE_ENV
|
@@ -29,10 +29,20 @@ describe('Environment', () => {
|
|
29
29
|
)
|
30
30
|
})
|
31
31
|
|
32
|
+
test('should return multi file entry points', () => {
|
33
|
+
const config = environment.toWebpackConfig()
|
34
|
+
expect(config.entry.multi_entry.sort()).toEqual([
|
35
|
+
resolve('app', 'javascript', 'packs', 'multi_entry.css'),
|
36
|
+
resolve('app', 'javascript', 'packs', 'multi_entry.js')
|
37
|
+
])
|
38
|
+
})
|
39
|
+
|
32
40
|
test('should return output', () => {
|
33
41
|
const config = environment.toWebpackConfig()
|
34
42
|
expect(config.output.filename).toEqual('js/[name]-[contenthash].js')
|
35
|
-
expect(config.output.chunkFilename).toEqual(
|
43
|
+
expect(config.output.chunkFilename).toEqual(
|
44
|
+
'js/[name]-[contenthash].chunk.js'
|
45
|
+
)
|
36
46
|
})
|
37
47
|
|
38
48
|
test('should return default loader rules for each file in config/loaders', () => {
|
@@ -41,7 +51,23 @@ describe('Environment', () => {
|
|
41
51
|
const configRules = config.module.rules
|
42
52
|
|
43
53
|
expect(defaultRules.length).toEqual(7)
|
44
|
-
expect(configRules.length).toEqual(
|
54
|
+
expect(configRules.length).toEqual(7)
|
55
|
+
})
|
56
|
+
|
57
|
+
test('should return cache path for nodeModules rule', () => {
|
58
|
+
const nodeModulesLoader = rules.nodeModules.use.find(
|
59
|
+
(rule) => rule.loader === 'babel-loader'
|
60
|
+
)
|
61
|
+
|
62
|
+
expect(nodeModulesLoader.options.cacheDirectory).toBeTruthy()
|
63
|
+
})
|
64
|
+
|
65
|
+
test('should return cache path for babel-loader rule', () => {
|
66
|
+
const babelLoader = rules.babel.use.find(
|
67
|
+
(rule) => rule.loader === 'babel-loader'
|
68
|
+
)
|
69
|
+
|
70
|
+
expect(babelLoader.options.cacheDirectory).toBeTruthy()
|
45
71
|
})
|
46
72
|
|
47
73
|
test('should return default plugins', () => {
|
@@ -60,6 +86,7 @@ describe('Environment', () => {
|
|
60
86
|
resolve('app', 'javascript'),
|
61
87
|
resolve('app/assets'),
|
62
88
|
resolve('/etc/yarn'),
|
89
|
+
resolve('app/elm'),
|
63
90
|
'node_modules'
|
64
91
|
])
|
65
92
|
})
|
@@ -30,7 +30,7 @@ const getPluginList = () => {
|
|
30
30
|
const result = new ConfigList()
|
31
31
|
result.append(
|
32
32
|
'Environment',
|
33
|
-
new webpack.EnvironmentPlugin(
|
33
|
+
new webpack.EnvironmentPlugin(process.env)
|
34
34
|
)
|
35
35
|
result.append('CaseSensitivePaths', new CaseSensitivePathsPlugin())
|
36
36
|
result.append(
|
@@ -43,7 +43,6 @@ const getPluginList = () => {
|
|
43
43
|
result.append(
|
44
44
|
'Manifest',
|
45
45
|
new WebpackAssetsManifest({
|
46
|
-
integrity: false,
|
47
46
|
entrypoints: true,
|
48
47
|
writeToDisk: true,
|
49
48
|
publicPath: config.publicPathWithoutCDN
|
@@ -65,7 +64,18 @@ const getEntryObject = () => {
|
|
65
64
|
paths.forEach((path) => {
|
66
65
|
const namespace = relative(join(rootPath), dirname(path))
|
67
66
|
const name = join(namespace, basename(path, extname(path)))
|
68
|
-
|
67
|
+
let assetPaths = resolve(path)
|
68
|
+
|
69
|
+
// Allows for multiple filetypes per entry (https://webpack.js.org/guides/entry-advanced/)
|
70
|
+
// Transforms the config object value to an array with all values under the same name
|
71
|
+
let previousPaths = result.get(name)
|
72
|
+
if (previousPaths) {
|
73
|
+
previousPaths = Array.isArray(previousPaths) ? previousPaths : [previousPaths]
|
74
|
+
previousPaths.push(assetPaths)
|
75
|
+
assetPaths = previousPaths
|
76
|
+
}
|
77
|
+
|
78
|
+
result.set(name, assetPaths)
|
69
79
|
})
|
70
80
|
return result
|
71
81
|
}
|
@@ -73,8 +83,8 @@ const getEntryObject = () => {
|
|
73
83
|
const getModulePaths = () => {
|
74
84
|
const result = new ConfigList()
|
75
85
|
result.append('source', resolve(config.source_path))
|
76
|
-
if (config.
|
77
|
-
config.
|
86
|
+
if (config.additional_paths) {
|
87
|
+
config.additional_paths.forEach((path) => result.append(path, resolve(path)))
|
78
88
|
}
|
79
89
|
result.append('node_modules', 'node_modules')
|
80
90
|
return result
|
@@ -126,7 +136,7 @@ module.exports = class Base {
|
|
126
136
|
// https://twitter.com/wSokra/status/969633336732905474
|
127
137
|
splitChunks: {
|
128
138
|
chunks: 'all',
|
129
|
-
name:
|
139
|
+
name: true
|
130
140
|
},
|
131
141
|
// Separate runtime chunk to enable long term caching
|
132
142
|
// https://twitter.com/wSokra/status/969679223278505985
|
@@ -153,7 +163,7 @@ module.exports = class Base {
|
|
153
163
|
|
154
164
|
module: {
|
155
165
|
strictExportPresence: true,
|
156
|
-
rules:
|
166
|
+
rules: this.loaders.values()
|
157
167
|
},
|
158
168
|
|
159
169
|
plugins: this.plugins.values(),
|
@@ -7,45 +7,47 @@ module.exports = class extends Base {
|
|
7
7
|
constructor() {
|
8
8
|
super()
|
9
9
|
|
10
|
-
if (devServer.hmr) {
|
11
|
-
this.plugins.append('HotModuleReplacement', new webpack.HotModuleReplacementPlugin())
|
12
|
-
this.config.output.filename = '[name]-[hash].js'
|
13
|
-
}
|
14
|
-
|
15
10
|
this.config.merge({
|
16
11
|
mode: 'development',
|
17
|
-
|
18
|
-
devtool: 'cheap-module-source-map',
|
19
|
-
output: {
|
20
|
-
pathinfo: true
|
21
|
-
},
|
22
|
-
devServer: {
|
23
|
-
clientLogLevel: 'none',
|
24
|
-
compress: devServer.compress,
|
25
|
-
quiet: devServer.quiet,
|
26
|
-
disableHostCheck: devServer.disable_host_check,
|
27
|
-
host: devServer.host,
|
28
|
-
port: devServer.port,
|
29
|
-
https: devServer.https,
|
30
|
-
hot: devServer.hmr,
|
31
|
-
contentBase,
|
32
|
-
inline: devServer.inline,
|
33
|
-
useLocalIp: devServer.use_local_ip,
|
34
|
-
public: devServer.public,
|
35
|
-
publicPath,
|
36
|
-
historyApiFallback: {
|
37
|
-
disableDotRule: true
|
38
|
-
},
|
39
|
-
headers: devServer.headers,
|
40
|
-
overlay: devServer.overlay,
|
41
|
-
stats: {
|
42
|
-
entrypoints: false,
|
43
|
-
errorDetails: true,
|
44
|
-
modules: false,
|
45
|
-
moduleTrace: false
|
46
|
-
},
|
47
|
-
watchOptions: devServer.watch_options
|
48
|
-
}
|
12
|
+
devtool: 'cheap-module-source-map'
|
49
13
|
})
|
14
|
+
|
15
|
+
if (process.env.WEBPACK_DEV_SERVER
|
16
|
+
&& process.env.WEBPACK_DEV_SERVER !== 'undefined') {
|
17
|
+
if (devServer.hmr) {
|
18
|
+
this.plugins.append('HotModuleReplacement', new webpack.HotModuleReplacementPlugin())
|
19
|
+
this.config.output.filename = '[name]-[hash].js'
|
20
|
+
}
|
21
|
+
|
22
|
+
this.config.merge({
|
23
|
+
devServer: {
|
24
|
+
clientLogLevel: 'none',
|
25
|
+
compress: devServer.compress,
|
26
|
+
quiet: devServer.quiet,
|
27
|
+
disableHostCheck: devServer.disable_host_check,
|
28
|
+
host: devServer.host,
|
29
|
+
port: devServer.port,
|
30
|
+
https: devServer.https,
|
31
|
+
hot: devServer.hmr,
|
32
|
+
contentBase,
|
33
|
+
inline: devServer.inline,
|
34
|
+
useLocalIp: devServer.use_local_ip,
|
35
|
+
public: devServer.public,
|
36
|
+
publicPath,
|
37
|
+
historyApiFallback: {
|
38
|
+
disableDotRule: true
|
39
|
+
},
|
40
|
+
headers: devServer.headers,
|
41
|
+
overlay: devServer.overlay,
|
42
|
+
stats: {
|
43
|
+
entrypoints: false,
|
44
|
+
errorDetails: true,
|
45
|
+
modules: false,
|
46
|
+
moduleTrace: false
|
47
|
+
},
|
48
|
+
watchOptions: devServer.watch_options
|
49
|
+
}
|
50
|
+
})
|
51
|
+
}
|
50
52
|
}
|
51
53
|
}
|