Skip to content

Commit 6fea1e8

Browse files
committed
Remove compat.js builds, index.js is now ES2018
1 parent 55d26c1 commit 6fea1e8

31 files changed

+36
-196
lines changed

babel_config.js

Lines changed: 0 additions & 27 deletions
This file was deleted.

bundle_config.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

compat_config.js

Lines changed: 0 additions & 11 deletions
This file was deleted.

fluent-bundle/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
esm/
22
/index.js
3-
/compat.js

fluent-bundle/makefile

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,14 @@ test: esm/.compiled
2424
test/**/*_test.js
2525

2626
.PHONY: build
27-
build: index.js compat.js
27+
build: index.js
2828

2929
index.js: esm/.compiled
3030
@rollup $(CURDIR)/esm/index.js \
31-
--config $(ROOT)/bundle_config.js \
32-
--banner "/* $(PACKAGE)@$(VERSION) */" \
33-
--amd.id $(PACKAGE) \
34-
--name $(GLOBAL) \
35-
--output.file $@
36-
@echo -e " $(OK) $@ built"
37-
38-
compat.js: esm/.compiled
39-
@rollup $(CURDIR)/esm/index.js \
40-
--config $(ROOT)/compat_config.js \
4131
--banner "/* $(PACKAGE)@$(VERSION) */" \
4232
--amd.id $(PACKAGE) \
4333
--name $(GLOBAL) \
34+
--output.format umd \
4435
--output.file $@
4536
@echo -e " $(OK) $@ built"
4637

@@ -56,7 +47,7 @@ html:
5647

5748
clean:
5849
@rm -f esm/*.js esm/*.d.ts esm/.compiled
59-
@rm -f index.js compat.js
50+
@rm -f index.js
6051
@rm -rf .nyc_output coverage
6152
@echo -e " $(OK) clean"
6253

fluent-bundle/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"compilerOptions": {
3-
"target": "es2019",
3+
"target": "es2018",
44
"module": "es2015",
55
"strict": true,
66
"allowJs": false,

fluent-dedent/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
esm/
22
/index.js
3-
/compat.js

fluent-dedent/makefile

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,14 @@ test: esm/.compiled
2424
test/**/*_test.js
2525

2626
.PHONY: build
27-
build: index.js compat.js
27+
build: index.js
2828

2929
index.js: esm/.compiled
3030
@rollup $(CURDIR)/esm/index.js \
31-
--config $(ROOT)/bundle_config.js \
32-
--banner "/* $(PACKAGE)@$(VERSION) */" \
33-
--amd.id $(PACKAGE) \
34-
--name $(GLOBAL) \
35-
--output.file $@
36-
@echo -e " $(OK) $@ built"
37-
38-
compat.js: esm/.compiled
39-
@rollup $(CURDIR)/esm/index.js \
40-
--config $(ROOT)/compat_config.js \
4131
--banner "/* $(PACKAGE)@$(VERSION) */" \
4232
--amd.id $(PACKAGE) \
4333
--name $(GLOBAL) \
34+
--output.format umd \
4435
--output.file $@
4536
@echo -e " $(OK) $@ built"
4637

@@ -56,6 +47,6 @@ html:
5647

5748
clean:
5849
@rm -f esm/*.js esm/*.d.ts esm/.compiled
59-
@rm -f index.js compat.js
50+
@rm -f index.js
6051
@rm -rf .nyc_output coverage
6152
@echo -e " $(OK) clean"

fluent-dedent/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"compilerOptions": {
3-
"target": "es2019",
3+
"target": "es2018",
44
"module": "es2015",
55
"strict": true,
66
"allowJs": false,

fluent-dom/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
esm/
22
/index.js
3-
/compat.js

fluent-dom/makefile

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,15 @@ test: esm/.compiled
2626
test/**/*_test.js
2727

2828
.PHONY: build
29-
build: index.js compat.js
29+
build: index.js
3030

3131
index.js: esm/.compiled
3232
@rollup $(CURDIR)/esm/index.js \
33-
--config $(ROOT)/bundle_config.js \
34-
--banner "/* $(PACKAGE)@$(VERSION) */" \
35-
--amd.id $(PACKAGE) \
36-
--name $(GLOBAL) \
37-
--globals $(DEPS) \
38-
--output.file $@
39-
@echo -e " $(OK) $@ built"
40-
41-
compat.js: esm/.compiled
42-
@rollup $(CURDIR)/esm/index.js \
43-
--config $(ROOT)/compat_config.js \
4433
--banner "/* $(PACKAGE)@$(VERSION) */" \
4534
--amd.id $(PACKAGE) \
4635
--name $(GLOBAL) \
4736
--globals $(DEPS) \
37+
--output.format umd \
4838
--output.file $@
4939
@echo -e " $(OK) $@ built"
5040

@@ -60,6 +50,6 @@ html:
6050

6151
clean:
6252
@rm -f esm/*.js esm/*.d.ts esm/.compiled
63-
@rm -f index.js compat.js
53+
@rm -f index.js
6454
@rm -rf .nyc_output coverage
6555
@echo -e " $(OK) clean"

fluent-dom/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"compilerOptions": {
3-
"target": "es2019",
3+
"target": "es2018",
44
"module": "es2015",
55
"strict": true,
66
"allowJs": true,

fluent-gecko/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,8 @@
2626
"keywords": [
2727
"localization",
2828
"l10n"
29-
]
29+
],
30+
"devDependencies": {
31+
"rollup-plugin-node-resolve": "^4.2.2"
32+
}
3033
}

fluent-gecko/vendor_config.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import nodeResolve from 'rollup-plugin-node-resolve';
2-
import bundleConfig from '../bundle_config';
32

4-
export default Object.assign({}, bundleConfig, {
3+
export default {
54
context: 'this',
65
output: {
76
format: 'cjs',
@@ -31,4 +30,4 @@ export default Object.assign({}, bundleConfig, {
3130
plugins: [
3231
nodeResolve(),
3332
]
34-
});
33+
};

fluent-gecko/xpcom_config.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import nodeResolve from 'rollup-plugin-node-resolve';
2-
import bundleConfig from '../bundle_config';
32

4-
export default Object.assign({}, bundleConfig, {
3+
export default {
54
context: 'this',
65
output: {
76
format: 'es',
@@ -29,4 +28,4 @@ export default Object.assign({}, bundleConfig, {
2928
plugins: [
3029
nodeResolve(),
3130
]
32-
});
31+
};

fluent-langneg/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
esm/
22
/index.js
3-
/compat.js

fluent-langneg/makefile

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,14 @@ test: esm/.compiled
2424
test/**/*_test.js
2525

2626
.PHONY: build
27-
build: index.js compat.js
27+
build: index.js
2828

2929
index.js: $(SOURCES)
3030
@rollup $(CURDIR)/esm/index.js \
31-
--config $(ROOT)/bundle_config.js \
32-
--banner "/* $(PACKAGE)@$(VERSION) */" \
33-
--amd.id $(PACKAGE) \
34-
--name $(GLOBAL) \
35-
--output.file $@
36-
@echo -e " $(OK) $@ built"
37-
38-
compat.js: $(SOURCES)
39-
@rollup $(CURDIR)/esm/index.js \
40-
--config $(ROOT)/compat_config.js \
4131
--banner "/* $(PACKAGE)@$(VERSION) */" \
4232
--amd.id $(PACKAGE) \
4333
--name $(GLOBAL) \
34+
--output.format umd \
4435
--output.file $@
4536
@echo -e " $(OK) $@ built"
4637

@@ -56,6 +47,6 @@ html:
5647

5748
clean:
5849
@rm -f esm/*.js esm/*.d.ts esm/.compiled
59-
@rm -f index.js compat.js
50+
@rm -f index.js
6051
@rm -rf .nyc_output coverage
6152
@echo -e " $(OK) clean"

fluent-langneg/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"compilerOptions": {
3-
"target": "es2019",
3+
"target": "es2018",
44
"module": "es2015",
55
"strict": true,
66
"allowJs": false,

fluent-react/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
esm/
22
/index.js
3-
/compat.js

fluent-react/babel.config.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,4 @@ module.exports = {
66
"targets": "node >= 10.0.0"
77
}]
88
],
9-
"plugins": [
10-
["babel-plugin-transform-rename-import", {
11-
"original": "fluent",
12-
"replacement": "fluent/compat"
13-
}]
14-
],
159
};

fluent-react/compat_config.js

Lines changed: 0 additions & 27 deletions
This file was deleted.

fluent-react/makefile

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,15 @@ test: esm/.compiled
2121
@jest --collect-coverage
2222

2323
.PHONY: build
24-
build: index.js compat.js
24+
build: index.js
2525

2626
index.js: esm/.compiled
2727
@rollup $(CURDIR)/esm/index.js \
28-
--config $(ROOT)/bundle_config.js \
2928
--banner "/* $(PACKAGE)@$(VERSION) */" \
3029
--amd.id $(PACKAGE) \
3130
--name $(GLOBAL) \
3231
--globals @fluent/sequence:FluentSequence,cached-iterable:CachedIterable,react:React,prop-types:PropTypes \
33-
--output.file $@
34-
@echo -e " $(OK) $@ built"
35-
36-
compat.js: esm/.compiled
37-
@rollup $(CURDIR)/esm/index.js \
38-
--config $(CURDIR)/compat_config.js \
39-
--banner "/* $(PACKAGE)@$(VERSION) */" \
40-
--amd.id $(PACKAGE) \
41-
--name $(GLOBAL) \
42-
--globals @fluent/sequence/compat:FluentSequence,cached-iterable/compat:CachedIterable,react:React,prop-types:PropTypes \
32+
--output.format umd \
4333
--output.file $@
4434
@echo -e " $(OK) $@ built"
4535

@@ -55,6 +45,6 @@ html:
5545

5646
clean:
5747
@rm -f esm/*.js esm/*.d.ts esm/.compiled
58-
@rm -f index.js compat.js
48+
@rm -f index.js
5949
@rm -rf .nyc_output coverage
6050
@echo -e " $(OK) clean"

fluent-react/package.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,10 @@
6060
"@types/react": "^16.9.22",
6161
"@types/react-dom": "^16.9.5",
6262
"babel-jest": "^24.8.0",
63-
"babel-plugin-transform-rename-import": "^2.2.0",
6463
"jest": "^24.8.0",
6564
"prettier": "^1.18.2",
6665
"react": "^16.8.0",
6766
"react-dom": "^16.8.0",
6867
"react-test-renderer": "^16.8.6"
69-
},
70-
"jest": {
71-
"transformIgnorePatterns": [
72-
"node_modules/(?!(@fluent/sequence)/)"
73-
]
7468
}
7569
}

fluent-react/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"compilerOptions": {
3-
"target": "es2019",
3+
"target": "es2018",
44
"module": "es2015",
55
"strict": true,
66
"allowJs": false,

fluent-sequence/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
esm/
22
/index.js
3-
/compat.js

0 commit comments

Comments
 (0)