Skip to content

Commit

Permalink
Merge pull request #442 from GrimoireGL/fix-434
Browse files Browse the repository at this point in the history
fix: #434 build fail on first time build
  • Loading branch information
kyasbal authored Feb 12, 2017
2 parents 3c19498 + 0389494 commit 66c0337
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
"typescript": "^2.1.6",
"typescript-awaiter": "^1.0.0",
"webpack": "^2.2.1",
"webpack-dev-server": "^2.3.0",
"webpack-shell-plugin": "^0.5.0",
"xhr-mock": "^1.7.0",
"xmldom": "^0.1.27",
"yargs": "^6.5.0"
Expand All @@ -49,7 +47,7 @@
"lint": "tslint -c tslint.json ./src/**/*.ts",
"prepublish": "npm run build -- --env.prod&& npm test",
"start": "webpack --progress --watch",
"build": "webpack --progress",
"build": "npm run generate-expose && webpack --progress && npm run generate-reference",
"generate-expose": "cauldron generate-exposure --src ./src --dest ./src/index.ts --ts --main ./src/main.ts",
"generate-reference": "cauldron generate-reference --src ./src --dest ./src/index.ts --ts --main ./src/main.ts --dts ./ref",
"semantic-release": "semantic-release pre && npm publish && semantic-release post"
Expand Down
6 changes: 1 addition & 5 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const path = require("path");
const webpack = require("webpack");
const shell = require("webpack-shell-plugin");
const argv = require("yargs").argv;
const fs = require("fs");
const fnPrefix = JSON.parse(fs.readFileSync(path.resolve(__dirname, "package.json"), "utf-8")).name.replace("grimoirejs", "grimoire");
Expand All @@ -25,10 +24,7 @@ const getBuildTask = (fileName, plugins, needPolyfill) => {
resolve: {
extensions: ['.ts', '.js']
},
plugins: [new shell({
onBuildStart: "npm run generate-expose",
onBuildEnd: "npm run generate-reference"
})].concat(plugins),
plugins: plugins,
devtool: 'source-map'
}
};
Expand Down

0 comments on commit 66c0337

Please sign in to comment.