Skip to content

Commit 7e3052f

Browse files
committed
Use a single webpack config for both landing and playground
1 parent 6143e75 commit 7e3052f

8 files changed

+51
-90
lines changed

package-lock.json

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"version": "1.0.0",
44
"description": "",
55
"scripts": {
6-
"test": "echo \"Error: no test specified\" && exit 1",
7-
"build-playground": "webpack --config ./src/playground/webpack.config.js --mode production",
8-
"dev-playground": "webpack-dev-server --content-base dist/ --config src/playground/webpack.config.js --mode development",
9-
"build-landing": "webpack --config ./src/landing/webpack.config.js --mode production",
10-
"dev-landing": "webpack-dev-server --content-base dist/ --config src/landing/webpack.config.js --mode development",
11-
"build": "npx rimraf dist && npm run build-playground && npm run build-landing",
6+
"build": "rimraf dist && webpack --mode production",
7+
"dev": "webpack-dev-server --mode development",
128
"deploy": "npm run build && npx gh-pages -d dist -b master",
139
"lint": "npm run lint:prettier",
1410
"lint:prettier": "prettier --check \"**/*.{js,ts,yml,json,md}\""
@@ -42,7 +38,6 @@
4238
"webpack-bundle-analyzer": "^3.6.0",
4339
"webpack-cli": "^3.3.10",
4440
"webpack-dev-server": "^3.10.1",
45-
"webpack-merge": "^4.2.2",
4641
"worker-loader": "^2.0.0"
4742
},
4843
"dependencies": {

src/landing/webpack.config.js

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/playground/tsconfig.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/playground/webpack.config.js

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/landing/tsconfig.json renamed to src/tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77
"lib": ["es5", "scripthost", "dom", "webworker"],
88
"allowJs": true,
99
"strict": true
10-
},
11-
"exclude": ["webpack*.js"]
10+
}
1211
}

src/webpack.common.js

Lines changed: 0 additions & 22 deletions
This file was deleted.

webpack.config.js

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
const path = require("path");
2+
const MonacoWebpackPlugin = require("monaco-editor-webpack-plugin");
3+
const HtmlWebpackPlugin = require("html-webpack-plugin");
4+
5+
const resolve = query => path.resolve(__dirname, query);
6+
7+
module.exports = {
8+
devtool: "source-map",
9+
entry: {
10+
landing_bundle: resolve("src/landing/index.ts"),
11+
play_bundle: resolve("src/playground/index.ts"),
12+
},
13+
output: { path: resolve("dist") },
14+
resolve: { extensions: [".tsx", ".ts", ".js"] },
15+
node: { fs: "empty" },
16+
module: {
17+
rules: [
18+
{ test: /\.tsx?$/, use: "ts-loader", exclude: /node_modules/ },
19+
{ test: /\.css$/, use: ["style-loader", "css-loader"] },
20+
{
21+
test: /\.(png|svg|jpg|gif|ico)$/,
22+
loader: "url-loader",
23+
options: { esModule: false, name: "[path][name].[ext]?hash=[hash:20]", limit: 8192 },
24+
},
25+
{ test: /\.ttf$/, loader: "file-loader" },
26+
{ test: /\.scss$/, use: ["style-loader", "css-loader", "sass-loader"] },
27+
{ test: /\.webmanifest?$/, loader: "file-loader", options: { esModule: false } },
28+
],
29+
},
30+
plugins: [
31+
new HtmlWebpackPlugin({
32+
title: "TypeScriptToLua",
33+
chunks: ["landing_bundle"],
34+
template: resolve("assets/layout/template.html"),
35+
filename: "index.html",
36+
contentFile: "landing.html",
37+
}),
38+
39+
new MonacoWebpackPlugin({ languages: ["javascript", "typescript", "lua"] }),
40+
new HtmlWebpackPlugin({
41+
title: "TypeScriptToLua - Online Compiler",
42+
chunks: ["play_bundle"],
43+
template: resolve("assets/layout/template.html"),
44+
filename: "play.html",
45+
contentFile: "play.html",
46+
}),
47+
],
48+
};

0 commit comments

Comments
 (0)