Skip to content

Commit

Permalink
🧱 Add ts-loader dependency and remove package-lock.json
Browse files Browse the repository at this point in the history
- `package-lock.json` only conflicts with `yarn.lock`, and since we use yarn instead of npm, we shouldn't have `package-lock.json`.
- `awesome-typescript-loader` was making build issues, and since it's been deprecated and has an incorrect dependency version of typescript, I replaced it with `ts-loader`.
  • Loading branch information
jinh0 committed Aug 18, 2022
1 parent 6cfc32d commit 70626b8
Show file tree
Hide file tree
Showing 9 changed files with 3,026 additions and 45,566 deletions.
33,357 changes: 0 additions & 33,357 deletions package-lock.json

This file was deleted.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
"@types/webpack": "^4.39.0",
"@typescript-eslint/eslint-plugin": "^3.8.0",
"@typescript-eslint/parser": "^3.8.0",
"awesome-typescript-loader": "^5.2.1",
"bulma": "^0.9.0",
"bulma-extensions": "^6.2.7",
"bulma-slider": "^2.0.0",
Expand All @@ -91,8 +90,9 @@
"selenium-webdriver": "^4.0.0-alpha.1",
"source-map": "^0.7.3",
"ts-jest": "^26.1.4",
"ts-loader": "~8.2.0",
"typedoc": "^0.18.0",
"typescript": "^4.0.2",
"typescript": "4.6.4",
"uuid": "^8.3.0",
"verovio-dev": "file:./verovio-util/verovio-dev",
"webpack": "^4.12.0",
Expand Down
2 changes: 1 addition & 1 deletion test/NeonCore.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ test('Test chain action', async () => {
};
expect(await neon.edit(editorAction, pathToPNG)).toBeTruthy();
const dragAtts = await neon.getElementAttr('m-044e7093-895e-4a78-bbda-7f1779a896d4', pathToPNG);
const insertAtts = await neon.getElementAttr((await neon.info(pathToPNG))['1'].uuid, pathToPNG);
const insertAtts = await neon.getElementAttr(((await neon.info(pathToPNG))['1'] as any).uuid, pathToPNG);
expect(dragAtts.pname).toBe('b');
expect(dragAtts.oct).toBe('2');
expect(insertAtts.pname).toBe('e');
Expand Down
5 changes: 1 addition & 4 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,5 @@
],
"exclude": [
"node_modules"
],
"awesomeTypescriptLoaderOptions": {
"useCache": true
}
]
}
4 changes: 2 additions & 2 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ module.exports = {
node: {
fs: 'empty'
},
devtool: 'source-map',
devtool: 'inline-source-map',
module: {
rules: [
{
test: /\.tsx?$/,
use: [
'awesome-typescript-loader'
'ts-loader'
],
exclude: /node_modules/
},
Expand Down
4 changes: 2 additions & 2 deletions webpack.dev.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module.exports = {
node: {
fs: 'empty'
},
devtool: 'source-map',
devtool: 'inline-source-map',
devServer: {
static: './deployment/server',
hot: true,
Expand All @@ -32,7 +32,7 @@ module.exports = {
{
test: /\.tsx?$/,
use: [
'awesome-typescript-loader'
'ts-loader'
],
exclude: /node_modules/
},
Expand Down
4 changes: 2 additions & 2 deletions webpack.pages-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ module.exports = {
node: {
fs: 'empty',
},
devtool: 'source-map',
devtool: 'inline-source-map',
module: {
rules: [
{
test: /\.tsx?$/,
use: ['awesome-typescript-loader'],
use: ['ts-loader'],
exclude: /node_modules/,
},
{
Expand Down
Loading

0 comments on commit 70626b8

Please sign in to comment.