Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DO NOT MERGE: Unship commonjs files #2215

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

DO NOT MERGE: Unship commonjs files #2215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99be25b
Unship cjs from `exports` field in package.json
tetsuharuohzeki Apr 28, 2024
1815161
Remove cjs code generation
tetsuharuohzeki Apr 28, 2024
2a6d717
Remove vestiges about `cjs/` from the build system
tetsuharuohzeki Apr 28, 2024
c2a1af7
pnpm-lock.yaml
tetsuharuohzeki May 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,5 @@ node_modules/
__dist/
__tmp_base/
__tmp_mjs/
__tmp_cjs/
cjs/
esm/
lib/
2 changes: 0 additions & 2 deletions .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ node_modules/
__dist/
__tmp_base/
__tmp_mjs/
__tmp_cjs/
cjs/
esm/
lib/
__snapshots__/
Expand Down
2 changes: 0 additions & 2 deletions eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ export default [
'**/__dist/**/*',
'**/__tmp_base/**/*',
'**/__tmp_mjs/**/*',
'**/__tmp_cjs/**/*',
'**/cjs/**/*',
'**/esm/**/*',
'**/lib/**/*',
],
Expand Down
4 changes: 0 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
],
"packageManager": "pnpm@9.1.0+sha512.67f5879916a9293e5cf059c23853d571beaf4f753c707f40cb22bed5fb1578c6aad3b6c4107ccb3ba0b35be003eb621a16471ac836c87beb53f9d54bb4612724",
"devDependencies": {
"@babel/core": "^7.24.5",
"@babel/plugin-syntax-typescript": "^7.24.1",
"@babel/plugin-transform-export-namespace-from": "^7.24.1",
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
"@eslint/js": "^9.2.0",
"@reflink/reflink": "^0.1.16",
"@typescript-eslint/eslint-plugin": "^7.8.0",
Expand Down
57 changes: 3 additions & 54 deletions packages/option-t/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,12 @@ SRC_TEST_DIR := $(CURDIR)/__tests__
DIST_DIR := $(CURDIR)/__dist
DIST_DOCS_DIR := $(DIST_DIR)/docs
DIST_ESM_DIR := $(DIST_DIR)/esm
DIST_COMMONJS_DIR := $(DIST_DIR)/cjs
GENERATED_ESM_DIR := $(CURDIR)/esm
GENERATED_COMMONJS_DIR := $(CURDIR)/cjs
TMP_BASE_DIR := $(CURDIR)/__tmp_base
TMP_MJS_DIR := $(CURDIR)/__tmp_mjs
TMP_CJS_DIR := $(CURDIR)/__tmp_cjs

CJS_EXTENSION_GLOB := cjs
MJS_EXTENSION_GLOB := {js,mjs}
D_CTS_EXTENSION_GLOB := d.cts
DTS_EXTENSION_GLOB := d.{ts,cts,mts}
DTS_EXTENSION_GLOB := d.{ts,mts}

TEST_CASE_CONTAINS_EXPECTED := $(CURDIR)/tools/__tests__/distribution_contain_all.test.mjs

Expand All @@ -46,11 +41,9 @@ help:
###########################
CLEAN_TARGETS := \
dist \
generated_cjs \
generated_esm \
tmp_base \
tmp_mjs \
tmp_cjs
tmp_mjs

.PHONY: clean
clean: $(addprefix clean_, $(CLEAN_TARGETS))
Expand All @@ -59,10 +52,6 @@ clean: $(addprefix clean_, $(CLEAN_TARGETS))
clean_dist:
$(NPM_BIN)/del $(DIST_DIR)

.PHONY: clean_generated_cjs
clean_generated_cjs:
$(NPM_BIN)/del $(GENERATED_COMMONJS_DIR)

.PHONY: clean_generated_esm
clean_generated_esm:
$(NPM_BIN)/del $(GENERATED_ESM_DIR)
Expand All @@ -75,10 +64,6 @@ clean_tmp_base:
clean_tmp_mjs:
$(NPM_BIN)/del $(TMP_MJS_DIR)

.PHONY: clean_tmp_cjs
clean_tmp_cjs:
$(NPM_BIN)/del $(TMP_CJS_DIR)


###########################
# Build
Expand All @@ -87,43 +72,7 @@ clean_tmp_cjs:
build: __build cp_docs cp_license cp_readme generate_manifest ## Build artifacts required to publish packages.

.PHONY: __build
__build: build_cjs build_esm ## Build all targets.

.PHONY: build_cjs
build_cjs: clean_dist __build_cjs__cp_cjs_to_cjsdir __build_cjs__cp_dcts_to_cjsdir generate_manifest ## Build `cjs/`.
$(NODE_BIN) $(CURDIR)/tools/cp_files.mjs \
--basedir $(GENERATED_COMMONJS_DIR) \
--source '$(GENERATED_COMMONJS_DIR)/**/*' \
--destination $(DIST_COMMONJS_DIR)

.PHONY: __build_cjs__cp_cjs_to_cjsdir
__build_cjs__cp_cjs_to_cjsdir: __build_cjs__rename_js_to_cjs clean_generated_cjs generate_manifest
$(NODE_BIN) $(CURDIR)/tools/transform_files_by_babel.mjs \
--basedir $(TMP_CJS_DIR) \
--source '$(TMP_CJS_DIR)/**/*.$(CJS_EXTENSION_GLOB)' \
--destination $(GENERATED_COMMONJS_DIR) \
--config $(CURDIR)/tools/babel/babelrc.cjs.mjs

.PHONY: __build_cjs__cp_dcts_to_cjsdir
__build_cjs__cp_dcts_to_cjsdir: __build_cjs_rename_dts_to_dcts clean_generated_cjs generate_manifest
$(NODE_BIN) $(CURDIR)/tools/transform_files_by_babel.mjs \
--basedir $(TMP_CJS_DIR) \
--source '$(TMP_CJS_DIR)/**/*.$(D_CTS_EXTENSION_GLOB)' \
--destination $(GENERATED_COMMONJS_DIR) \
--config $(CURDIR)/tools/babel/babelrc.d.cts.mjs

.PHONY: __build_cjs_rename_dts_to_dcts
__build_cjs_rename_dts_to_dcts: __build_cjs__create_tmp_cjs generate_manifest
$(NODE_BIN) $(CURDIR)/tools/extension_renamer.mjs --target-dir $(TMP_CJS_DIR) --to-extension 'cts' --from-extension 'ts'

.PHONY: __build_cjs__rename_js_to_cjs
__build_cjs__rename_js_to_cjs: __build_cjs__create_tmp_cjs generate_manifest
$(NODE_BIN) $(CURDIR)/tools/extension_renamer.mjs --target-dir $(TMP_CJS_DIR) --to-extension 'cjs' --from-extension 'js'

.PHONY: __build_cjs__create_tmp_cjs
__build_cjs__create_tmp_cjs: __build_tmp_base clean_tmp_cjs generate_manifest
$(NODE_BIN) $(CURDIR)/tools/cp_files.mjs --basedir $(TMP_BASE_DIR) --source '$(TMP_BASE_DIR)/**/*' --destination $(TMP_CJS_DIR)

__build: build_esm ## Build all targets.

.PHONY: build_esm
build_esm: clean_dist __build_mjs_cp_mjs_to_esm __build_mjs_cp_dts_to_esm generate_manifest ## Build `esm/`.
Expand Down