From 673f3f0a85e12e889118b7aef7656c44afd69e2c Mon Sep 17 00:00:00 2001 From: Nejc Zupan Date: Thu, 13 Jul 2023 20:10:47 +0200 Subject: [PATCH] trying to fix make dist --- .gitignore | 1 + Makefile | 2 +- default.nix | 7 +- elm.json | 9 +- package.json | 16 +- src/index.html | 4 +- yarn.lock | 9119 +++++++++--------------------------------------- 7 files changed, 1684 insertions(+), 7474 deletions(-) diff --git a/.gitignore b/.gitignore index eed64a4..6f80505 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ repl-temp-* .direnv/ geckodriver.log yarn-error.log +.parcel-cache/ diff --git a/Makefile b/Makefile index 08ba3e5..7c40a29 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ dist: # For modules (commonjs or ES6) @parcel build src/index.js # For html script tags - @parcel build --global SalaryCalculator src/salary-calculator.js src/index.html + @parcel build src/salary-calculator.js src/index.html # Testing and linting targets .PHONY: lint diff --git a/default.nix b/default.nix index 6534cb4..e1eb347 100644 --- a/default.nix +++ b/default.nix @@ -68,10 +68,9 @@ let }; yarnLock = ./yarn.lock; publishBinsFor = [ - "codecov" - "elm-upgrade" - "eslint" - "parcel-bundler" + # "elm-upgrade" + # "eslint" + "parcel" ]; }; diff --git a/elm.json b/elm.json index ed17e2d..851d542 100644 --- a/elm.json +++ b/elm.json @@ -6,13 +6,13 @@ "elm-version": "0.19.1", "dependencies": { "direct": { - "elm-community/maybe-extra": "5.0.0", - "elm-community/result-extra": "2.2.1", "elm/browser": "1.0.1", "elm/core": "1.0.2", "elm/html": "1.0.0", "elm/json": "1.1.3", "elm/url": "1.0.0", + "elm-community/maybe-extra": "5.0.0", + "elm-community/result-extra": "2.2.1", "rundis/elm-bootstrap": "5.1.0" }, "indirect": { @@ -27,9 +27,10 @@ "elm-explorations/test": "2.1.1" }, "indirect": { - "elm/random": "1.0.0", "elm/regex": "1.0.0", - "elm/svg": "1.0.1" + "elm/svg": "1.0.1", + "elm/bytes": "1.0.8", + "elm/random": "1.0.0" } } } diff --git a/package.json b/package.json index 6cd62ca..90b3cc5 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,6 @@ "name": "salary-calculator", "version": "0.1.0", "description": "Elm engine running the Niteo Salary Calculator", - "main": "dist/index.js", "scripts": { "build": "make dist", "test": "make test" @@ -24,17 +23,10 @@ }, "homepage": "https://github.com/teamniteo/salarycalc#readme", "devDependencies": { - "@babel/core": "^7.3.4", - "babel-plugin-transform-es2015-modules-strip": "^0.1.1", - "codecov": "^3.2.0", - "elm-analyse": "^0.16.1", - "elm-coverage": "^0.2.0", - "elm-hot": "^1.0.1", - "elm-upgrade": "^0.19.8", - "elm-verify-examples": "^4.0.0", - "eslint": "^7.9.0", - "node-elm-compiler": "^5.0.5", - "parcel-bundler": "^1.12.0" + "node-elm-compiler": "*", + "parcel": "*", + "@parcel/transformer-yaml": "*", + "@parcel/transformer-elm": "*" }, "dependencies": {} } diff --git a/src/index.html b/src/index.html index 000e6cf..7f4ab1e 100644 --- a/src/index.html +++ b/src/index.html @@ -22,9 +22,9 @@ - -