Skip to content

Commit

Permalink
Renamed "build" script to "bundle"
Browse files Browse the repository at this point in the history
  • Loading branch information
oliverschwendener committed Aug 22, 2018
1 parent df21add commit 48a4445
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ueli.count.json

#Compiled files
build/
#Bundled files
bundle/

#Packaged apps
dist/
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ script:
- yarn test:all
- yarn test:unit --coverage
- yarn coverage
- yarn build
- yarn bundle
- yarn package:publish
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"sourceMaps": true,
"cwd": "${workspaceRoot}",
"outFiles": [
"${workspaceRoot}/build/main.js"
"${workspaceRoot}/bundle/main.js"
]
},
{
Expand All @@ -26,7 +26,7 @@
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd"
},
"runtimeArgs": [
"${workspaceRoot}/build/main.js",
"${workspaceRoot}/bundle/main.js",
"--remote-debugging-port=9222"
],
"port": 9222,
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -339,11 +339,11 @@ $ yarn
### Run

```
$ yarn build
$ yarn bundle
$ yarn start
```

> Note: there is also a watch task `$ yarn build:watch` which watches the stylesheets and typescript files and transpiles them automatically if there are any changes.
> Note: there is also a watch task `$ yarn bundle:watch` which watches the typescript files and bundles them automatically if there are any changes.

### Debug

Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ build_script:
- yarn lint
- yarn test:all
- yarn test:unit --coverage
- yarn build
- yarn bundle
- yarn package:publish

test: off
6 changes: 3 additions & 3 deletions electron-builder-config.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
directories:
output: dist
buildResources: build
buildResources: bundle

files:
- build/**/*.js
- build/**/*.css
- bundle/**/*.js
- bundle/**/*.css
- main.html
- img/**/*

Expand Down
2 changes: 1 addition & 1 deletion main.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
</div>

<script>
require('./build/renderer.js');
require('./bundle/renderer.js');
</script>
</body>

Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
"Windows",
"macOS"
],
"main": "./build/main.js",
"main": "./bundle/main.js",
"scripts": {
"build": "./node_modules/.bin/webpack",
"build:watch": "./node_modules/.bin/webpack --watch",
"bundle": "./node_modules/.bin/webpack",
"bundle:watch": "./node_modules/.bin/webpack --watch",
"start": "./node_modules/.bin/electron . --enable-logging",
"lint": "./node_modules/.bin/tslint src/**/*.ts",
"test:unit": "./node_modules/.bin/jest --config jest.json --silent ./src/tests/unit",
Expand All @@ -40,8 +40,8 @@
},
"husky": {
"hooks": {
"pre-commit": "yarn lint && yarn test:all && yarn build",
"pre-push": "yarn lint && yarn test:all && yarn build"
"pre-commit": "yarn lint && yarn test:all && yarn bundle",
"pre-push": "yarn lint && yarn test:all && yarn bundle"
}
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// "declaration": true, /* Generates corresponding '.d.ts' file. */
"sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */
"outDir": "./build/js", /* Redirect output structure to the directory. */
"outDir": "./bundle/js", /* Redirect output structure to the directory. */
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "removeComments": true, /* Do not emit comments to output. */
// "noEmit": true, /* Do not emit outputs. */
Expand Down
2 changes: 1 addition & 1 deletion webpack/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
mode: "development",
output: {
filename: "renderer.js",
path: path.resolve(__dirname, "../build")
path: path.resolve(__dirname, "../bundle")
},
resolve: {
extensions: [".ts", ".js"]
Expand Down

0 comments on commit 48a4445

Please sign in to comment.