Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update webpack to use babel loader with support for TS. #2119

Merged
merged 9 commits into from Feb 7, 2019
Merged

Update webpack to use babel loader with support for TS. #2119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0f440f2
Upgrade to webpack 4, babel 7
Dec 8, 2018
b765d56
Use straight git link for webworkify dep
Dec 9, 2018
9f344b2
Use simpler git url
Dec 9, 2018
0cc7b55
Re-add globalObject workaround
Dec 9, 2018
8893218
Bump karma dep versions
Dec 9, 2018
b32a088
Dont preprocess non-test files
Dec 9, 2018
0342d94
Use @babel/register over ts-node
Dec 9, 2018
8f6d0a0
Update demo `const` usage.
itsjamie Feb 6, 2019
ebfdeb7
Use webpack debug config in Karma configuration rather than duplication.
itsjamie Feb 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion demo/main.js
View file
Open in desktop
Expand Up @@ -1152,7 +1152,7 @@ function onConfigPersistenceChanged(event) {

function getEditorValue(options) {
options = $.extend({ parse: false }, options || {});
const value = configEditor.session.getValue();
let value = configEditor.session.getValue();

if (options.parse) {
try {
Expand Down
64 changes: 25 additions & 39 deletions karma.conf.js
View file
Open in desktop
@@ -1,9 +1,30 @@
// Karma configuration
// Generated on Tue Jul 18 2017 12:17:16 GMT-0700 (PDT)

const pkgJson = require('./package.json');
const webpack = require('webpack');
const path = require('path');
const merge = require('webpack-merge');
const webpackConfig = require('./webpack.config')({ debug: true })[0];
delete webpackConfig.entry;
delete webpackConfig.output;
const mergeConfig = merge(webpackConfig, {
devtool: 'inline-source-map',
module: {
rules: [
{
test: /\.(ts|js)$/,
exclude: path.resolve(__dirname, 'node_modules'),
enforce: 'post',
use: [
{
loader: 'istanbul-instrumenter-loader',
options: {
esModules: true
}
}
]
}
]
}
});

module.exports = function (config) {
config.set({
Expand All @@ -24,7 +45,6 @@ module.exports = function (config) {

// preprocess matching files before serving them to the browser
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
// node_modules must not be webpacked or else Karma will fail to load frameworks
preprocessors: {
'tests/index.js': ['webpack', 'sourcemap']
},
Expand All @@ -39,41 +59,7 @@ module.exports = function (config) {
fixWebpackSourcePaths: true
},

webpack: {
mode: 'development',
devtool: 'inline-source-map',
resolve: {
extensions: ['.ts', '.js']
},module: {
rules: [
{
test: /\.(ts|js)$/,
include: path.resolve(__dirname, 'src'),
exclude: path.resolve(__dirname, 'node_modules'),
loader: 'ts-loader'
},// instrument only testing sources with Istanbul
{
test: /\.(ts|js)$/,

exclude: path.resolve(__dirname, 'node_modules'),enforce: 'post',
use: [
{
loader: 'istanbul-instrumenter-loader',
options: { esModules: true }
}
]
}
]
},
plugins: [
new webpack.DefinePlugin({
__VERSION__: JSON.stringify(pkgJson.version),
__USE_SUBTITLES__: JSON.stringify(true),
__USE_ALT_AUDIO__: JSON.stringify(true),
__USE_EME_DRM__: JSON.stringify(true)
})
]
},
webpack: mergeConfig,

// web server port
port: 9876,
Expand Down