Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions lib/webpack.config.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,19 @@ sveltePreprocess =
filename: input.filename
code: code.replace /\$_/g, '$:'

babel =
makeBabel = (prjPath = '') ->
presets = [
require.resolve('@babel/preset-env')
require.resolve('@babel/preset-react')
]
try
presets.push require.resolve('@babel/preset-typescript', { paths: [prjPath] })
catch
# @babel/preset-typescript is optional — .ts/.tsx files won't compile without it

loader: 'babel-loader'
options:
presets: [
require.resolve('@babel/preset-env')
require.resolve('@babel/preset-react')
]
presets: presets
plugins: [
require.resolve('babel-plugin-add-module-exports')
require.resolve('@babel/plugin-transform-modules-commonjs')
Expand Down Expand Up @@ -56,16 +62,20 @@ module.exports = (builderCmd, builderEnv, builderDir) ->
implementation: builderConfig.sassImplementation || 'node-sass'
sassOptions: builderConfig.sassOptions || {}

babel = makeBabel(prjPath)

tsRule = [{test: /\.tsx?$/, exclude: /node_modules/, use: [thread, babel]}]

# Svelte support — enabled when builderConfig.svelte is set
svelteRule = if builderConfig.svelte
svelteOpts = Object.assign {dev: mode == 'development', preprocess: sveltePreprocess}, builderConfig.svelte
[{test: /\.svelte$/, use: {loader: 'svelte-loader', options: svelteOpts}}]
else []

# Extensions — auto-add svelte-related when svelte is enabled
defaultExtensions = ['.coffee', '.js', '.cjsx']
# Extensions — auto-add based on enabled features
defaultExtensions = ['.coffee', '.js', '.cjsx', '.ts', '.tsx']
if builderConfig.svelte
defaultExtensions = ['.mjs', '.js', '.svelte', '.coffee']
defaultExtensions = ['.mjs', '.js', '.svelte', '.coffee', '.ts', '.tsx']
extensions = builderConfig.extensions || defaultExtensions

# Main fields — auto-add 'svelte' when svelte is enabled
Expand Down Expand Up @@ -97,6 +107,7 @@ module.exports = (builderCmd, builderEnv, builderDir) ->
module:
rules: [
...svelteRule
...tsRule
...(builderConfig.extraRules || [])
{
test: /\.scss$/
Expand Down
10 changes: 7 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zeropack2",
"version": "3.2.0",
"version": "3.3.0",
"description": "",
"main": "bin/zeropack",
"scripts": {
Expand Down Expand Up @@ -35,11 +35,15 @@
"peerDependencies": {
"sass": "^1.0.0",
"sass-embedded": "*",
"node-sass": "^7.0.0 || ^8.0.0 || ^9.0.0"
"node-sass": "^7.0.0 || ^8.0.0 || ^9.0.0",
"@babel/preset-typescript": "^7.24.0",
"typescript": ">=4.0.0"
},
"peerDependenciesMeta": {
"sass": { "optional": true },
"sass-embedded": { "optional": true },
"node-sass": { "optional": true }
"node-sass": { "optional": true },
"@babel/preset-typescript": { "optional": true },
"typescript": { "optional": true }
}
}