Skip to content

Commit

Permalink
fix #2919: publish two versions of the index.d.ts file to fix a Typ…
Browse files Browse the repository at this point in the history
…eScript type exports issues
  • Loading branch information
josdejong committed Aug 30, 2023
1 parent 2c819ea commit 48f7043
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 11 deletions.
16 changes: 16 additions & 0 deletions gulpfile.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ const REF_DIR = path.join(__dirname, '/docs')
const REF_DEST = `${REF_DIR}/reference/functions`
const REF_ROOT = `${REF_DIR}/reference`

const TYPES_SRC = path.join(__dirname, '/types/index.d.ts')
const TYPES_DEST_ESM = path.join(__dirname, '/lib/esm/index.d.ts')
const TYPES_DEST_CJS = path.join(__dirname, '/lib/cjs/index.d.cts')

const MATH_JS = `${COMPILE_BROWSER}/${FILE}`
const COMPILED_HEADER = `${COMPILE_CJS}/header.js`

Expand Down Expand Up @@ -222,6 +226,15 @@ async function generateDocs (done) {
done()
}

function copyTypes(done) {
const types = fs.readFileSync(TYPES_SRC)

fs.writeFileSync(TYPES_DEST_ESM, types)
fs.writeFileSync(TYPES_DEST_CJS, types)

done()
}

function generateEntryFiles (done) {
entryGenerator.generateEntryFiles().then(() => {
done()
Expand Down Expand Up @@ -252,6 +265,8 @@ gulp.task('clean', clean)

gulp.task('docs', generateDocs)

gulp.task('copyTypes', copyTypes)

// check whether any of the source files contains non-ascii characters
gulp.task('validate:ascii', validateAscii)

Expand All @@ -276,6 +291,7 @@ gulp.task('default', gulp.series(
compileCommonJs,
compileEntryFiles,
compileESModules, // Must be after generateEntryFiles
copyTypes,
writeCompiledHeader,
bundle,
generateDocs
Expand Down
35 changes: 24 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,25 +95,39 @@
},
"type": "module",
"main": "./lib/cjs",
"types": "./types/index.d.ts",
"module": "./lib/esm",
"unpkg": "./lib/browser/math.js",
"jsdelivr": "./lib/browser/math.js",
"exports": {
".": {
"types": "./types/index.d.ts",
"import": "./lib/esm/index.js",
"require": "./lib/cjs/index.js"
"import": {
"types": "./lib/esm/index.d.ts",
"default": "./lib/esm/index.js"
},
"require": {
"types": "./lib/cjs/index.d.cts",
"default": "./lib/cjs/index.js"
}
},
"./number": {
"types": "./types/index.d.ts",
"import": "./lib/esm/number.js",
"require": "./lib/cjs/number.js"
"import": {
"types": "./lib/esm/index.d.ts",
"default": "./lib/esm/number.js"
},
"require": {
"types": "./lib/cjs/index.d.cts",
"default": "./lib/cjs/number.js"
}
},
"./lib/esm/number": {
"types": "./types/index.d.ts",
"import": "./lib/esm/number.js",
"require": "./lib/cjs/number.js"
"import": {
"types": "./lib/esm/index.d.ts",
"default": "./lib/esm/number.js"
},
"require": {
"types": "./lib/cjs/index.d.cts",
"default": "./lib/cjs/number.js"
}
},
"./package.json": "./package.json",
"./lib/browser/math.js": "./lib/browser/math.js",
Expand All @@ -131,7 +145,6 @@
"dist",
"lib",
"main",
"types",
"number.cjs",
"LICENSE",
"NOTICE",
Expand Down

0 comments on commit 48f7043

Please sign in to comment.