Skip to content

Commit 762b0a1

Browse files
committed
🔥 Remove the umd flavor
The browser flavor is already a umd so there's no need to publish this file twice.
1 parent 8262182 commit 762b0a1

File tree

4 files changed

+12
-18
lines changed

4 files changed

+12
-18
lines changed

tasks/dist.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ const copyToDist = (environments) => {
2020
log.task('copy to dist/')
2121
removeDistDirSync(environments)
2222
bfs.copySync('build/css/asciidoctor.css', 'dist/css/asciidoctor.css')
23-
bfs.copySync('build/asciidoctor-umd.min.js', 'dist/umd/asciidoctor.min.js')
2423
bfs.copySync('build/asciidoctor-browser.min.js', 'dist/browser/asciidoctor.min.js')
2524
environments.forEach((environment) => {
2625
bfs.copySync(`build/asciidoctor-${environment}.js`, `dist/${environment}/asciidoctor.js`)
@@ -34,6 +33,6 @@ const start = process.hrtime()
3433
;(async () => {
3534
await builderModule.build()
3635
runTest()
37-
copyToDist(['browser', 'node', 'graalvm', 'umd'])
36+
copyToDist(['browser', 'node', 'graalvm'])
3837
log.success(`Done in ${process.hrtime(start)[0]} s`)
3938
})()

tasks/module/builder.js

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ const rebuild = async (asciidoctorCoreDependency, environments) => {
2929
compilerModule.compile(asciidoctorCoreDependency, environments)
3030
}
3131

32-
const concat = (message, files, destination) => {
33-
log.debug(message)
32+
const concat = (files, destination) => {
33+
log.transform('concat', files.join(' + '), destination)
3434
bfs.concatSync(files, destination)
3535
}
3636

@@ -51,8 +51,8 @@ const parseTemplateData = (data, templateModel) => {
5151
.join('\n')
5252
}
5353

54-
const generateUMD = (asciidoctorCoreTarget, environments) => {
55-
log.task('generate UMD')
54+
const generateFlavors = (asciidoctorCoreTarget, environments) => {
55+
log.task('generate flavors')
5656

5757
// Asciidoctor core + extensions
5858
const apiFiles = [
@@ -61,7 +61,7 @@ const generateUMD = (asciidoctorCoreTarget, environments) => {
6161
]
6262

6363
const apiBundle = 'build/asciidoctor-api.js'
64-
concat('Asciidoctor API core + extensions', apiFiles, apiBundle)
64+
concat(apiFiles, apiBundle)
6565

6666
const packageJson = require('../../package.json')
6767
const templateModel = {
@@ -72,6 +72,7 @@ const generateUMD = (asciidoctorCoreTarget, environments) => {
7272

7373
// Build a dedicated JavaScript file for each environment
7474
environments.forEach((environment) => {
75+
log.debug(environment)
7576
const opalExtData = fs.readFileSync(`build/opal-ext-${environment}.js`, 'utf8')
7677
const asciidoctorCoreData = fs.readFileSync(asciidoctorCoreTarget, 'utf8')
7778
let data
@@ -88,12 +89,10 @@ const generateUMD = (asciidoctorCoreTarget, environments) => {
8889
})
8990
let templateFile
9091
let target = `build/asciidoctor-${environment}.js`
91-
if (environment === 'browser') {
92-
templateFile = 'src/template-asciidoctor-browser.js'
93-
} else if (environment === 'node' || environment === 'electron') {
92+
if (environment === 'node' || environment === 'electron') {
9493
templateFile = 'src/template-asciidoctor-node.js'
9594
} else {
96-
templateFile = 'src/template-asciidoctor-umd.js'
95+
templateFile = 'src/template-asciidoctor-browser.js'
9796
}
9897
templateModel['//{{asciidoctorCode}}'] = asciidoctorData
9998
const content = parseTemplateFile(templateFile, templateModel)
@@ -119,7 +118,7 @@ module.exports = class Builder {
119118
this.benchmarkBuildDir = path.join('build', 'benchmark')
120119
this.examplesBuildDir = path.join('build', 'examples')
121120
this.asciidocRepoBaseURI = 'https://raw.githubusercontent.com/asciidoc/asciidoc/d43faae38c4a8bf366dcba545971da99f2b2d625'
122-
this.environments = ['umd', 'node', 'graalvm', 'browser']
121+
this.environments = ['node', 'graalvm', 'browser']
123122
this.asciidoctorCoreTarget = path.join('build', 'asciidoctor-core.js')
124123
}
125124

@@ -144,7 +143,7 @@ module.exports = class Builder {
144143

145144
bfs.mkdirsSync('build/css')
146145
await rebuild(asciidoctorCoreDependency, this.environments)
147-
generateUMD(this.asciidoctorCoreTarget, this.environments)
146+
generateFlavors(this.asciidoctorCoreTarget, this.environments)
148147
await uglifyModule.uglify()
149148
log.success(`Done in ${process.hrtime(start)[0]} s`)
150149
}

tasks/module/uglify.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ module.exports.uglify = async () => {
1010
return
1111
}
1212
log.task('uglify')
13-
const umdSource = 'build/asciidoctor-umd.js'
14-
const umdDestination = 'build/asciidoctor-umd.min.js'
15-
log.transform('minify', umdSource, umdDestination)
16-
await new Uglify().minify(umdSource, umdDestination)
1713

1814
const browserSource = 'build/asciidoctor-browser.js'
1915
const browserDestination = 'build/asciidoctor-browser.min.js'

tasks/test/unsupported-features.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const fs = require('fs')
22
const log = require('bestikk-log')
33

44
log.task('Check unsupported features')
5-
const data = fs.readFileSync('build/asciidoctor-umd.js', 'utf8')
5+
const data = fs.readFileSync('build/asciidoctor-browser.js', 'utf8')
66
const mutableStringPattern = /\['\$(g)?sub!'\]/
77
if (mutableStringPattern.test(data)) {
88
log.error('Mutable String methods are not supported in Opal, please replace sub! and gsub! methods')

0 commit comments

Comments
 (0)