Skip to content
This repository has been archived by the owner on Nov 4, 2023. It is now read-only.

Commit

Permalink
use preconstruct (#189)
Browse files Browse the repository at this point in the history
  • Loading branch information
tim-smart committed Oct 3, 2023
1 parent bd5dc26 commit 213d831
Show file tree
Hide file tree
Showing 22 changed files with 1,329 additions and 857 deletions.
3 changes: 0 additions & 3 deletions .babel.cjs.json

This file was deleted.

3 changes: 0 additions & 3 deletions .babel.mjs.json

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/tricky-ducks-press.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@effect/match": minor
---

update deps & use preconstruct
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,10 @@ yarn-error.log
tmp/
build/
dist/
.direnv/

# files
/dist
/internal
/SafeRefinement
/Types
16 changes: 13 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"typescript.tsdk": "node_modules/typescript/lib",
"typescript.preferences.importModuleSpecifier": "non-relative",
"typescript.preferences.importModuleSpecifier": "project-relative",
"typescript.enablePromptUseWorkspaceTsdk": true,
"editor.formatOnSave": true,
"eslint.format.enable": true,
Expand All @@ -10,7 +10,11 @@
"[markdown]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"eslint.validate": ["markdown", "javascript", "typescript"],
"eslint.validate": [
"markdown",
"javascript",
"typescript"
],
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},
Expand All @@ -31,5 +35,11 @@
"files.watcherExclude": {
"**/target": true
},
"files.insertFinalNewline": true
"files.insertFinalNewline": true,
"files.exclude": {
"dist": true,
"internal": true,
"SafeRefinement": true,
"Types": true
}
}
4 changes: 4 additions & 0 deletions babel.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"plugins": [["annotate-pure-calls"]],
"presets": ["@babel/preset-typescript"]
}
92 changes: 61 additions & 31 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"name": "@effect/match",
"version": "0.36.1",
"publishConfig": {
"access": "public",
"directory": "dist"
"access": "public"
},
"repository": {
"type": "git",
Expand All @@ -16,6 +15,17 @@
},
"homepage": "https://github.com/effect-ts/match",
"description": "Pattern matching for TypeScript",
"main": "dist/effect-match.cjs.js",
"module": "dist/effect-match.esm.js",
"preconstruct": {
"entrypoints": [
"*.ts"
],
"distFilenameStrategy": "full",
"exports": {
"importConditionDefaultExport": "default"
}
},
"tags": [
"typescript",
"pattern-matching"
Expand All @@ -27,70 +37,90 @@
"scripts": {
"example": "ts-node --project tsconfig.examples.json",
"version": "changeset version && pnpm install --no-frozen-lockfile && pnpm run docs-update",
"release": "pnpm run build && changeset publish",
"clean": "rimraf build tsbuildinfo dist .ultra.cache.json",
"build": "pnpm build-all && pnpm build-pack",
"build-cjs": "babel build/esm --config-file ./.babel.cjs.json --out-dir build/cjs --out-file-extension .js --source-maps",
"build-mjs": "babel build/esm --config-file ./.babel.mjs.json --out-dir build/mjs --out-file-extension .mjs --source-maps",
"build-post": "build-utils pack-v1",
"build-pack": "concurrently \"pnpm build-cjs\" \"pnpm build-mjs\" && pnpm build-post",
"build-all": "tsc -b tsconfig.json",
"build-watch": "tsc -b tsconfig.json --watch",
"clean": "node scripts/clean.mjs",
"gen": "node scripts/gen.mjs",
"build": "pnpm gen && preconstruct fix && preconstruct build && pnpm gen",
"dtslint": "dtslint dtslint",
"lint": "eslint . --ext .ts,.tsx",
"autofix": "pnpm lint --fix",
"tc": "tsc --noEmit",
"docs": "docgen",
"docs-update": "git add --force --all docs/modules || true",
"circular": "madge --ts-config ./tsconfig.madge.json --circular --no-color --no-spinner --warning build/esm",
"circular": "madge --ts-config ./tsconfig.madge.json --circular --no-color --no-spinner --warning dist",
"test": "vitest",
"test-all": "npm run circular && npm run lint && npm run dtslint && vitest run",
"coverage": "vitest run --coverage"
},
"exports": {
".": {
"require": "./build/cjs/index.js"
"types": "./dist/declarations/src/index.d.ts",
"module": "./dist/effect-match.esm.js",
"import": "./dist/effect-match.cjs.mjs",
"default": "./dist/effect-match.cjs.js"
},
"./package.json": "./package.json",
"./SafeRefinement": {
"types": "./dist/declarations/src/SafeRefinement.d.ts",
"module": "./SafeRefinement/dist/effect-match-SafeRefinement.esm.js",
"import": "./SafeRefinement/dist/effect-match-SafeRefinement.cjs.mjs",
"default": "./SafeRefinement/dist/effect-match-SafeRefinement.cjs.js"
},
"./*": {
"require": "./build/cjs/*.js"
"./Types": {
"types": "./dist/declarations/src/Types.d.ts",
"module": "./Types/dist/effect-match-Types.esm.js",
"import": "./Types/dist/effect-match-Types.cjs.mjs",
"default": "./Types/dist/effect-match-Types.cjs.js"
}
},
"peerDependencies": {
"effect": "2.0.0-next.38"
"effect": "2.0.0-next.42"
},
"devDependencies": {
"@babel/cli": "^7.22.10",
"@babel/core": "^7.22.11",
"@babel/plugin-transform-modules-commonjs": "^7.22.11",
"@babel/core": "^7.23.0",
"@babel/preset-typescript": "^7.23.0",
"@changesets/changelog-github": "^0.4.8",
"@changesets/cli": "^2.26.2",
"@effect/build-utils": "^0.1.4",
"@effect/docgen": "^0.1.4",
"@effect/docgen": "^0.1.8",
"@effect/eslint-plugin": "^0.1.2",
"@effect/language-service": "^0.0.21",
"@types/chai": "^4.3.5",
"@types/node": "^20.5.7",
"@typescript-eslint/eslint-plugin": "^6.5.0",
"@typescript-eslint/parser": "^6.5.0",
"@vitest/coverage-v8": "^0.34.3",
"@preconstruct/cli": "^2.8.1",
"@types/chai": "^4.3.6",
"@types/node": "^20.8.2",
"@typescript-eslint/eslint-plugin": "^6.7.4",
"@typescript-eslint/parser": "^6.7.4",
"@vitest/coverage-v8": "^0.34.6",
"babel-plugin-annotate-pure-calls": "^0.4.0",
"benny": "^3.7.1",
"concurrently": "^8.2.1",
"effect": "2.0.0-next.38",
"eslint": "^8.48.0",
"eslint-import-resolver-typescript": "^3.6.0",
"effect": "2.0.0-next.42",
"eslint": "^8.50.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-codegen": "0.17.0",
"eslint-plugin-deprecation": "^1.5.0",
"eslint-plugin-deprecation": "^2.0.0",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-simple-import-sort": "^10.0.0",
"eslint-plugin-sort-destructure-keys": "^1.5.0",
"glob": "^10.3.10",
"madge": "^6.1.0",
"rimraf": "^5.0.1",
"rimraf": "^5.0.5",
"ts-node": "^10.9.1",
"ts-pattern": "^5.0.5",
"tslint": "^6.1.3",
"typescript": "5.2.2",
"vite": "^4.4.9",
"vitest": "0.34.3"
"vitest": "0.34.6"
},
"files": [
"src",
"dist",
"internal",
"SafeRefinement",
"Types"
],
"pnpm": {
"patchedDependencies": {
"@preconstruct/cli@2.8.1": "patches/@preconstruct__cli@2.8.1.patch"
}
}
}
78 changes: 78 additions & 0 deletions patches/@preconstruct__cli@2.8.1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
diff --git a/cli/dist/preconstruct-cli-cli.cjs.js b/cli/dist/preconstruct-cli-cli.cjs.js
index b18c560863966454aab77816b147401f4ee875e1..2a8665507dbc386eaa886f567eed6ff090518c6c 100644
--- a/cli/dist/preconstruct-cli-cli.cjs.js
+++ b/cli/dist/preconstruct-cli-cli.cjs.js
@@ -3065,6 +3065,7 @@ function getRollupConfigs(pkg) {
interop
}, {
format: "es",
+ preserveModules: true,
entryFileNames: `[name].${getDistExtensionForConditions(conditions.concat("module"))}`,
chunkFileNames: `dist/[name]-[hash].${getDistExtensionForConditions(conditions.concat("module"))}`,
dir: pkg.directory
@@ -3091,6 +3092,7 @@ function getRollupConfigs(pkg) {
interop
}, ...(hasModuleField ? [{
format: "es",
+ preserveModules: true,
entryFileNames: `[name].${getDistExtension("esm")}`,
chunkFileNames: `dist/[name]-[hash].${getDistExtension("esm")}`,
dir: pkg.directory
@@ -3125,6 +3127,7 @@ function getRollupConfigs(pkg) {
interop
}, hasModuleField && {
format: "es",
+ preserveModules: true,
entryFileNames: `[name].${getDistExtension("browser-esm")}`,
chunkFileNames: `dist/[name]-[hash].${getDistExtension("browser-esm")}`,
dir: pkg.directory
@@ -3140,6 +3143,7 @@ function getRollupConfigs(pkg) {
}, () => {}),
outputs: [{
format: "es",
+ preserveModules: true,
entryFileNames: `[name].${getDistExtension("worker")}`,
chunkFileNames: `dist/[name]-[hash].${getDistExtension("worker")}`,
dir: pkg.directory
diff --git a/cli/dist/preconstruct-cli-cli.esm.js b/cli/dist/preconstruct-cli-cli.esm.js
index f54aa61f8445c990c215ef9934845741ea6bf591..d86dce28d7164b5a6900e48235880986f4224264 100644
--- a/cli/dist/preconstruct-cli-cli.esm.js
+++ b/cli/dist/preconstruct-cli-cli.esm.js
@@ -3015,6 +3015,7 @@ function getRollupConfigs(pkg) {
interop
}, {
format: "es",
+ preserveModules: true,
entryFileNames: `[name].${getDistExtensionForConditions(conditions.concat("module"))}`,
chunkFileNames: `dist/[name]-[hash].${getDistExtensionForConditions(conditions.concat("module"))}`,
dir: pkg.directory
@@ -3041,6 +3042,7 @@ function getRollupConfigs(pkg) {
interop
}, ...(hasModuleField ? [{
format: "es",
+ preserveModules: true,
entryFileNames: `[name].${getDistExtension("esm")}`,
chunkFileNames: `dist/[name]-[hash].${getDistExtension("esm")}`,
dir: pkg.directory
@@ -3075,6 +3077,7 @@ function getRollupConfigs(pkg) {
interop
}, hasModuleField && {
format: "es",
+ preserveModules: true,
entryFileNames: `[name].${getDistExtension("browser-esm")}`,
chunkFileNames: `dist/[name]-[hash].${getDistExtension("browser-esm")}`,
dir: pkg.directory
@@ -3090,6 +3093,7 @@ function getRollupConfigs(pkg) {
}, () => {}),
outputs: [{
format: "es",
+ preserveModules: true,
entryFileNames: `[name].${getDistExtension("worker")}`,
chunkFileNames: `dist/[name]-[hash].${getDistExtension("worker")}`,
dir: pkg.directory
diff --git a/dist/declarations/src/cli.d.ts b/dist/declarations/src/cli.d.ts
deleted file mode 100644
index cb0ff5c3b541f646105198ee23ac0fc3d805023e..0000000000000000000000000000000000000000
diff --git a/dist/declarations/src/worker.d.ts b/dist/declarations/src/worker.d.ts
deleted file mode 100644
index 9cd1f2dbb0325b78d77a6f2d93b066baf080fa6f..0000000000000000000000000000000000000000
Loading

0 comments on commit 213d831

Please sign in to comment.