Skip to content
Merged
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
4,352 changes: 2,852 additions & 1,500 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
"webpack": "^5.0.0"
},
"dependencies": {
"cspell": "^6.31.1",
"json-parse-better-errors": "^1.0.2",
"loader-runner": "^4.1.0",
"neo-async": "^2.6.2",
Expand All @@ -61,6 +60,7 @@
"babel-loader": "^9.1.2",
"cross-env": "^7.0.2",
"css-loader": "^6.7.3",
"cspell": "^6.31.1",
"del": "^5.1.0",
"del-cli": "^5.0.0",
"eslint": "^8.39.0",
Expand All @@ -81,6 +81,7 @@
"sass": "^1.62.1",
"sass-loader": "^11.0.1",
"standard-version": "^9.0.0",
"ts-loader": "^9.2.6",
"webpack": "^5.81.0"
},
"keywords": [
Expand Down
5 changes: 4 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ function pitch() {
ident: l.ident,
};
}),
_compiler: { fsStartTime: this._compiler.fsStartTime },
_compiler: {
fsStartTime: this._compiler.fsStartTime,
options: { plugins: [] },
},
_compilation: {
outputOptions: {
hashSalt: this._compilation.outputOptions.hashSalt,
Expand Down
1 change: 1 addition & 0 deletions test/ts-loader-example/assets/color_palette.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$white: #FFFFFF;
3 changes: 3 additions & 0 deletions test/ts-loader-example/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
const foo: string = 'foo';

console.log(foo);
1 change: 1 addition & 0 deletions test/ts-loader-example/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
40 changes: 40 additions & 0 deletions test/ts-loader-example/webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
const path = require('path');

const threadLoader = require('../../src'); // eslint-disable-line import/no-extraneous-dependencies

module.exports = (env) => {
const workerPool = {
workers: +env.threads,
poolTimeout: env.watch ? Infinity : 2000,
};
if (+env.threads > 0) {
threadLoader.warmup(workerPool, ['ts-loader']);
}
return {
mode: 'none',
context: __dirname,
devtool: false,
entry: ['./index.ts'],
output: {
path: path.resolve('dist'),
filename: 'bundle.js',
},
module: {
rules: [
{
test: /\.ts$/,
use: [
env.threads !== 0 && {
loader: path.resolve(__dirname, '../../dist/index.js'),
options: workerPool,
},
{ loader: 'ts-loader', options: { happyPackMode: true } },
].filter(Boolean),
},
],
},
stats: {
children: false,
},
};
};
21 changes: 21 additions & 0 deletions test/webpack.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import webpack from 'webpack';

import sassLoaderConfig from './sass-loader-example/webpack.config';
import tsLoaderConfig from './ts-loader-example/webpack.config';

test("Processes sass-loader's @import correctly", (done) => {
const config = sassLoaderConfig({});
Expand All @@ -21,3 +22,23 @@ test("Processes sass-loader's @import correctly", (done) => {
done();
});
}, 30000);

test('Processes ts-loader correctly', (done) => {
const config = tsLoaderConfig({});

webpack(config, (err, stats) => {
if (err) {
// eslint-disable-next-line no-console
console.error(err);
}

expect(err).toBe(null);

if (stats.hasErrors()) {
// eslint-disable-next-line no-console
console.error(stats.toJson().errors);
}
expect(stats.hasErrors()).toBe(false);
done();
});
}, 30000);