diff --git a/.gitignore b/.gitignore index 1b3acd7..b69f094 100644 --- a/.gitignore +++ b/.gitignore @@ -2,11 +2,12 @@ node_modules # Build -src/**/*.js +.cache dist lib .bsb.lock .merlin +**/*.bs.js # Logs *.log diff --git a/bsconfig.json b/bsconfig.json index 4107b09..7caafba 100644 --- a/bsconfig.json +++ b/bsconfig.json @@ -1,23 +1,14 @@ { "name": "reason-calculator", "reason": { - "react-jsx": 2 + "react-jsx": 3 }, - "bs-dependencies": [ - "reason-react", - "reductive" - ], + "bs-dependencies": ["bs-css", "reason-react"], "bs-dev-dependencies": [ - "bs-jest", - "bs-react-test-renderer" - ], - "bsc-flags": [ - "-bs-super-errors" + "@glennsl/bs-jest", + "bs-jest-dom", + "bs-react-testing-library" ], - "js-post-build": { - "cmd": "./scripts/copy.js" - }, - "refmt": 3, "sources": [ { "dir": "src", @@ -30,18 +21,14 @@ "type": "dev" } ] - }, - { - "dir": "reductive", - "subdirs": [ - { - "dir": "__tests__", - "type": "dev" - } - ] - }, - "styles" + } ] } - ] + ], + "package-specs": { + "module": "es6", + "in-source": true + }, + "suffix": ".bs.js", + "refmt": 3 } diff --git a/package.json b/package.json index 63ebd10..4edfe56 100644 --- a/package.json +++ b/package.json @@ -10,39 +10,35 @@ }, "license": "MIT", "scripts": { - "build": "npm-run-all build:*", + "build": "run-s build:*", "build:bsb": "bsb -make-world", - "build:webpack": "webpack -p", - "clean": "npm-run-all clean:*", + "build:parcel": "parcel build public/index.html", + "clean": "run-p clean:*", "clean:bsb": "bsb -clean-world", - "clean:project": "rimraf dist lib .merlin 'src/**/*.js'", - "deploy": "surge dist reason-calculator.surge.sh", - "dev": "npm-run-all --parallel dev:*", - "dev:bsb": "npm run build:bsb -- -w", - "dev:webpack": "webpack-dev-server -w", - "jest": "jest", - "np": "np --no-publish --yolo", - "prebuild": "npm run clean", - "predeploy": "npm-run-all build np", - "test": "npm-run-all build:bsb jest", - "version": "write-changelog" + "clean:parcel": "rimraf dist lib .merlin", + "pretest": "bsb -make-world", + "start": "run-p start:*", + "start:bsb": "bsb -make-world -w", + "start:parcel": "parcel public/index.html", + "test": "yarn jest" + }, + "dependencies": { + "bs-css": "^8.0.4", + "react": "^16.8.6", + "react-dom": "^16.8.6", + "reason-react": "^0.7.0" }, "devDependencies": { - "bs-jest": "^0.2.0", - "bs-platform": "^2.0.0", - "bs-react-test-renderer": "^1.0.1", - "glamor": "^2.20.40", - "np": "^2.16.1", - "npm-run-all": "^4.1.2", - "react": "^15.6.2", - "reason-react": "^0.2.4", - "reductive": "^0.1.0", - "rimraf": "^2.6.2", - "surge": "^0.19.0", - "webpack": "^3.8.1", - "webpack-dev-server": "^2.9.4", - "webpack-html-plugin": "^0.1.1", - "write-changelog": "^1.1.0" + "@glennsl/bs-jest": "^0.4.8", + "@wyze/changelog": "^1.0.0", + "@wyze/github-release": "^1.0.0", + "bs-jest-dom": "^2.0.0", + "bs-platform": "^5.0.3", + "bs-react-testing-library": "^0.4.0", + "bsb-js": "^1.1.7", + "npm-run-all": "^4.1.5", + "parcel-bundler": "^1.12.3", + "rimraf": "^2.6.3" }, "jest": { "roots": [ diff --git a/index.html b/public/index.html similarity index 79% rename from index.html rename to public/index.html index 537cbb6..b36d4a1 100644 --- a/index.html +++ b/public/index.html @@ -7,7 +7,7 @@