Merge pull request #479 from stasm/es2018

stasm · web-flow · commit c27994d75a8a · 2020-04-21T16:46:26.000+02:00
Remove compat.js; compile index.cjs to ES2018
diff --git a/babel_config.js b/babel_config.js
diff --git a/bundle_config.js b/bundle_config.js
diff --git a/compat_config.js b/compat_config.js
diff --git a/fluent-bundle/.gitignore b/fluent-bundle/.gitignore
@@ -1,3 +1,2 @@
 esm/
 /index.js
-/compat.js
diff --git a/fluent-bundle/makefile b/fluent-bundle/makefile
@@ -24,23 +24,14 @@ test: esm/.compiled
 	    test/**/*_test.js
 
 .PHONY: build
-build: index.js compat.js
+build: index.js
 
 index.js: esm/.compiled
 	@rollup $(CURDIR)/esm/index.js \
-	    --config $(ROOT)/bundle_config.js \
-	    --banner "/* $(PACKAGE)@$(VERSION) */" \
-	    --amd.id $(PACKAGE) \
-	    --name $(GLOBAL) \
-	    --output.file $@
-	@echo -e " $(OK) $@ built"
-
-compat.js: esm/.compiled
-	@rollup $(CURDIR)/esm/index.js \
-	    --config $(ROOT)/compat_config.js \
 	    --banner "/* $(PACKAGE)@$(VERSION) */" \
 	    --amd.id $(PACKAGE) \
 	    --name $(GLOBAL) \
+	    --output.format umd \
 	    --output.file $@
 	@echo -e " $(OK) $@ built"
 
@@ -56,7 +47,7 @@ html:
 
 clean:
 	@rm -f esm/*.js esm/*.d.ts esm/.compiled
-	@rm -f index.js compat.js
+	@rm -f index.js
 	@rm -rf .nyc_output coverage
 	@echo -e " $(OK) clean"
 
diff --git a/fluent-bundle/tsconfig.json b/fluent-bundle/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "target": "es2019",
+        "target": "es2018",
         "module": "es2015",
         "strict": true,
         "allowJs": false,
diff --git a/fluent-dedent/.gitignore b/fluent-dedent/.gitignore
@@ -1,3 +1,2 @@
 esm/
 /index.js
-/compat.js
diff --git a/fluent-dedent/makefile b/fluent-dedent/makefile
@@ -24,23 +24,14 @@ test: esm/.compiled
 	    test/**/*_test.js
 
 .PHONY: build
-build: index.js compat.js
+build: index.js
 
 index.js: esm/.compiled
 	@rollup $(CURDIR)/esm/index.js \
-	    --config $(ROOT)/bundle_config.js \
-	    --banner "/* $(PACKAGE)@$(VERSION) */" \
-	    --amd.id $(PACKAGE) \
-	    --name $(GLOBAL) \
-	    --output.file $@
-	@echo -e " $(OK) $@ built"
-
-compat.js: esm/.compiled
-	@rollup $(CURDIR)/esm/index.js \
-	    --config $(ROOT)/compat_config.js \
 	    --banner "/* $(PACKAGE)@$(VERSION) */" \
 	    --amd.id $(PACKAGE) \
 	    --name $(GLOBAL) \
+	    --output.format umd \
 	    --output.file $@
 	@echo -e " $(OK) $@ built"
 
@@ -56,6 +47,6 @@ html:
 
 clean:
 	@rm -f esm/*.js esm/*.d.ts esm/.compiled
-	@rm -f index.js compat.js
+	@rm -f index.js
 	@rm -rf .nyc_output coverage
 	@echo -e " $(OK) clean"
diff --git a/fluent-dedent/tsconfig.json b/fluent-dedent/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "target": "es2019",
+        "target": "es2018",
         "module": "es2015",
         "strict": true,
         "allowJs": false,
diff --git a/fluent-dom/.gitignore b/fluent-dom/.gitignore
@@ -1,3 +1,2 @@
 esm/
 /index.js
-/compat.js
diff --git a/fluent-dom/makefile b/fluent-dom/makefile
@@ -26,25 +26,15 @@ test: esm/.compiled
 	    test/**/*_test.js
 
 .PHONY: build
-build: index.js compat.js
+build: index.js
 
 index.js: esm/.compiled
 	@rollup $(CURDIR)/esm/index.js \
-		--config $(ROOT)/bundle_config.js \
-		--banner "/* $(PACKAGE)@$(VERSION) */" \
-		--amd.id $(PACKAGE) \
-		--name $(GLOBAL) \
-		--globals $(DEPS) \
-		--output.file $@
-	@echo -e " $(OK) $@ built"
-
-compat.js: esm/.compiled
-	@rollup $(CURDIR)/esm/index.js \
-		--config $(ROOT)/compat_config.js \
 		--banner "/* $(PACKAGE)@$(VERSION) */" \
 		--amd.id $(PACKAGE) \
 		--name $(GLOBAL) \
 		--globals $(DEPS) \
+		--output.format umd \
 		--output.file $@
 	@echo -e " $(OK) $@ built"
 
@@ -60,6 +50,6 @@ html:
 
 clean:
 	@rm -f esm/*.js esm/*.d.ts esm/.compiled
-	@rm -f index.js compat.js
+	@rm -f index.js
 	@rm -rf .nyc_output coverage
 	@echo -e " $(OK) clean"
diff --git a/fluent-dom/tsconfig.json b/fluent-dom/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "target": "es2019",
+        "target": "es2018",
         "module": "es2015",
         "strict": true,
         "allowJs": true,
diff --git a/fluent-gecko/package.json b/fluent-gecko/package.json
@@ -26,5 +26,8 @@
   "keywords": [
     "localization",
     "l10n"
-  ]
+  ],
+  "devDependencies": {
+    "rollup-plugin-node-resolve": "^4.2.2"
+  }
 }
diff --git a/fluent-gecko/vendor_config.js b/fluent-gecko/vendor_config.js
@@ -1,7 +1,6 @@
 import nodeResolve from 'rollup-plugin-node-resolve';
-import bundleConfig from '../bundle_config';
 
-export default Object.assign({}, bundleConfig, {
+export default {
   context: 'this',
   output: {
     format: 'cjs',
@@ -31,4 +30,4 @@ export default Object.assign({}, bundleConfig, {
   plugins: [
     nodeResolve(),
   ]
-});
+};
diff --git a/fluent-gecko/xpcom_config.js b/fluent-gecko/xpcom_config.js
@@ -1,7 +1,6 @@
 import nodeResolve from 'rollup-plugin-node-resolve';
-import bundleConfig from '../bundle_config';
 
-export default Object.assign({}, bundleConfig, {
+export default {
   context: 'this',
   output: {
     format: 'es',
@@ -29,4 +28,4 @@ export default Object.assign({}, bundleConfig, {
   plugins: [
     nodeResolve(),
   ]
-});
+};
diff --git a/fluent-langneg/.gitignore b/fluent-langneg/.gitignore
@@ -1,3 +1,2 @@
 esm/
 /index.js
-/compat.js
diff --git a/fluent-langneg/makefile b/fluent-langneg/makefile
@@ -24,23 +24,14 @@ test: esm/.compiled
 	    test/**/*_test.js
 
 .PHONY: build
-build: index.js compat.js
+build: index.js
 
 index.js: $(SOURCES)
 	@rollup $(CURDIR)/esm/index.js \
-	    --config $(ROOT)/bundle_config.js \
-	    --banner "/* $(PACKAGE)@$(VERSION) */" \
-	    --amd.id $(PACKAGE) \
-	    --name $(GLOBAL) \
-	    --output.file $@
-	@echo -e " $(OK) $@ built"
-
-compat.js: $(SOURCES)
-	@rollup $(CURDIR)/esm/index.js \
-	    --config $(ROOT)/compat_config.js \
 	    --banner "/* $(PACKAGE)@$(VERSION) */" \
 	    --amd.id $(PACKAGE) \
 	    --name $(GLOBAL) \
+	    --output.format umd \
 	    --output.file $@
 	@echo -e " $(OK) $@ built"
 
@@ -56,6 +47,6 @@ html:
 
 clean:
 	@rm -f esm/*.js esm/*.d.ts esm/.compiled
-	@rm -f index.js compat.js
+	@rm -f index.js
 	@rm -rf .nyc_output coverage
 	@echo -e " $(OK) clean"
diff --git a/fluent-langneg/tsconfig.json b/fluent-langneg/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "target": "es2019",
+        "target": "es2018",
         "module": "es2015",
         "strict": true,
         "allowJs": false,
diff --git a/fluent-react/.gitignore b/fluent-react/.gitignore
@@ -1,3 +1,2 @@
 esm/
 /index.js
-/compat.js
diff --git a/fluent-react/babel.config.js b/fluent-react/babel.config.js
@@ -6,10 +6,4 @@ module.exports = {
       "targets": "node >= 10.0.0"
     }]
   ],
-  "plugins": [
-    ["babel-plugin-transform-rename-import", {
-      "original": "fluent",
-      "replacement": "fluent/compat"
-    }]
-  ],
 };
diff --git a/fluent-react/compat_config.js b/fluent-react/compat_config.js
diff --git a/fluent-react/makefile b/fluent-react/makefile
@@ -21,25 +21,15 @@ test: esm/.compiled
 	@jest --collect-coverage
 
 .PHONY: build
-build: index.js compat.js
+build: index.js
 
 index.js: esm/.compiled
 	@rollup $(CURDIR)/esm/index.js \
-	    --config $(ROOT)/bundle_config.js \
 	    --banner "/* $(PACKAGE)@$(VERSION) */" \
 	    --amd.id $(PACKAGE) \
 	    --name $(GLOBAL) \
 	    --globals @fluent/sequence:FluentSequence,cached-iterable:CachedIterable,react:React,prop-types:PropTypes \
-	    --output.file $@
-	@echo -e " $(OK) $@ built"
-
-compat.js: esm/.compiled
-	@rollup $(CURDIR)/esm/index.js \
-	    --config $(CURDIR)/compat_config.js \
-	    --banner "/* $(PACKAGE)@$(VERSION) */" \
-	    --amd.id $(PACKAGE) \
-	    --name $(GLOBAL) \
-	    --globals @fluent/sequence/compat:FluentSequence,cached-iterable/compat:CachedIterable,react:React,prop-types:PropTypes \
+	    --output.format umd \
 	    --output.file $@
 	@echo -e " $(OK) $@ built"
 
@@ -55,6 +45,6 @@ html:
 
 clean:
 	@rm -f esm/*.js esm/*.d.ts esm/.compiled
-	@rm -f index.js compat.js
+	@rm -f index.js
 	@rm -rf .nyc_output coverage
 	@echo -e " $(OK) clean"
diff --git a/fluent-react/package.json b/fluent-react/package.json
@@ -60,16 +60,10 @@
     "@types/react": "^16.9.22",
     "@types/react-dom": "^16.9.5",
     "babel-jest": "^24.8.0",
-    "babel-plugin-transform-rename-import": "^2.2.0",
     "jest": "^24.8.0",
     "prettier": "^1.18.2",
     "react": "^16.8.0",
     "react-dom": "^16.8.0",
     "react-test-renderer": "^16.8.6"
-  },
-  "jest": {
-    "transformIgnorePatterns": [
-      "node_modules/(?!(@fluent/sequence)/)"
-    ]
   }
 }
diff --git a/fluent-react/tsconfig.json b/fluent-react/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "target": "es2019",
+        "target": "es2018",
         "module": "es2015",
         "strict": true,
         "allowJs": false,
diff --git a/fluent-sequence/.gitignore b/fluent-sequence/.gitignore
@@ -1,3 +1,2 @@
 esm/
 /index.js
-/compat.js
diff --git a/fluent-sequence/makefile b/fluent-sequence/makefile
diff --git a/fluent-sequence/tsconfig.json b/fluent-sequence/tsconfig.json
diff --git a/fluent-syntax/.gitignore b/fluent-syntax/.gitignore
diff --git a/fluent-syntax/makefile b/fluent-syntax/makefile
diff --git a/fluent-syntax/tsconfig.json b/fluent-syntax/tsconfig.json
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`esm/`
`2`	`2`	`/index.js`
`3`		`-/compat.js`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"compilerOptions": {`
`3`		`- "target": "es2019",`
	`3`	`+ "target": "es2018",`
`4`	`4`	`"module": "es2015",`
`5`	`5`	`"strict": true,`
`6`	`6`	`"allowJs": false,`