Skip to content

Commit

Permalink
fix: fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
EduardoJM committed May 5, 2023
2 parents 7f524a2 + 81eaf6a commit 4c3cd76
Show file tree
Hide file tree
Showing 5 changed files with 928 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '12.x'
registry-url: 'https://registry.npmjs.org'
node-version: "12.x"
registry-url: "https://registry.npmjs.org"
- run: yarn
- run: yarn tsc
- run: yarn build
- run: npm publish
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
8 changes: 7 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
"files": [
"dist"
],
"scripts": {
"build": "webpack --mode production"
},
"license": "MIT",
"repository": {
"type": "git",
Expand All @@ -22,6 +25,9 @@
"author": "Eduardo Oliveira <[email protected]>",
"homepage": "https://eduardojm.github.io/joi-translation-pt-br/",
"devDependencies": {
"typescript": "^4.3.2"
"ts-loader": "^9.4.2",
"typescript": "^4.3.2",
"webpack": "^5.82.0",
"webpack-cli": "^5.0.2"
}
}
5 changes: 1 addition & 4 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,5 @@
"declaration": true,
"outDir": "dist"
},
"exclude": [
"node_modules",
"examples"
]
"exclude": ["node_modules", "examples"]
}
23 changes: 23 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
const path = require("path");

module.exports = {
entry: "./src/index.ts",
module: {
rules: [
{
test: /\.ts$/,
use: "ts-loader",
exclude: /node_modules/,
},
],
},
resolve: {
extensions: [".ts", ".js"],
},
output: {
filename: "index.js",
path: path.resolve(__dirname, "dist"),
libraryTarget: "umd",
umdNamedDefine: true,
},
};
Loading

0 comments on commit 4c3cd76

Please sign in to comment.