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
18 changes: 8 additions & 10 deletions config/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

const path = require('path');
const env = require('yargs').argv.env;
const ESLintPlugin = require('eslint-webpack-plugin');

const srcRoot = path.join(__dirname, '..', 'src');
const nodeRoot = path.join(__dirname, '..', 'node_modules');
Expand Down Expand Up @@ -41,18 +42,10 @@ const config = {
}
}
},
{
test: /(\.js)$/,
exclude: /node_modules/,
use: {
loader: 'eslint-loader'
},
enforce: "pre",
},
{
test: /\.ts?$/,
use: {
loader: path.resolve("loaders/assemblyscript.js"),
loader: path.resolve("loaders/assemblyscript.mjs"),
},
},
]
Expand All @@ -61,7 +54,12 @@ const config = {
modules: [srcRoot, nodeRoot],
extensions: ['.js']
},
plugins: []
plugins: [
new ESLintPlugin({
extensions: ['js'],
exclude: ['node_modules'],
})
]
};


Expand Down
11 changes: 5 additions & 6 deletions loaders/assemblyscript.js → loaders/assemblyscript.mjs
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
const asc = require("assemblyscript/cli/asc");
import {compileString} from "assemblyscript/dist/asc.js";

module.exports = async function (content, map, meta) {
export default async function (content, map, meta) {
var callback = this.async();
await asc.ready;
const { binary, stderr } = asc.compileString(content, {
const { binary, stderr } = await compileString(content, {
optimize: true,
optimizeLevel: 3,
runtime: "none",
runtime: "stub",
pedantic: true,
// noUnsafe: true,
});
if (stderr.toString()) {
callback(stderr.toString());
callback(new EvalError(stderr.toString()));
return;
}

Expand Down
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
],
"scripts": {
"build": "webpack --config config/webpack.config.js --env prod",
"dev": "webpack --config config/webpack.config.js --progress --colors --watch --env dev",
"dev-build": "webpack --config config/webpack.config.js --progress --colors --env dev"
"dev": "webpack --config config/webpack.config.js --progress --color --watch --env dev",
"dev-build": "webpack --config config/webpack.config.js --progress --color --env dev"
},
"repository": {
"type": "git",
Expand All @@ -28,25 +28,25 @@
"license": "MIT",
"homepage": "https://butterchurnviz.com",
"dependencies": {
"@assemblyscript/loader": "^0.17.11",
"@babel/runtime": "^7.11.2",
"@assemblyscript/loader": "^0.27.9",
"@babel/runtime": "^7.22.11",
"ecma-proposal-math-extensions": "0.0.2",
"eel-wasm": "^0.0.15"
},
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/plugin-transform-runtime": "^7.11.5",
"@babel/preset-env": "^7.11.5",
"assemblyscript": "^0.17.11",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.1.0",
"eslint": "^7.9.0",
"eslint-loader": "^4.0.2",
"eslint-plugin-prettier": "^3.1.4",
"prettier": "^2.1.2",
"webpack": "^4.44.2",
"webpack-cli": "^3.3.12",
"yargs": "^16.0.3"
"@babel/core": "^7.22.11",
"@babel/eslint-parser": "^7.22.11",
"@babel/plugin-transform-runtime": "^7.22.10",
"@babel/preset-env": "^7.22.10",
"assemblyscript": "^0.27.9",
"babel-loader": "^9.1.3",
"eslint": "^8.48.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-webpack-plugin": "^4.0.1",
"prettier": "^3.0.2",
"webpack": "^5.88.2",
"webpack-cli": "^5.1.4",
"yargs": "^17.7.2"
},
"browserslist": "supports audio-api and supports webgl2 and last 3 years"
}
Loading