intl: add deprecation warning for v8BreakIterator

targos · jasnell · commit 9ad3082b1ca4 · 2016-10-07T09:34:35.000-07:00
Fixes: #8865 PR-URL: #8908 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Anna Henningsen <anna@addaleax.net>
diff --git a/lib/internal/process.js b/lib/internal/process.js
@@ -118,16 +118,17 @@ function setupConfig(_source) {
     return value;
   });
   const processConfig = process.binding('config');
-  // Intl.v8BreakIterator() would crash w/ fatal error, so throw instead.
-  if (processConfig.hasIntl &&
-      processConfig.hasSmallICU &&
-      Intl.hasOwnProperty('v8BreakIterator') &&
-      !process.icu_data_dir) {
+  if (typeof Intl !== 'undefined' && Intl.hasOwnProperty('v8BreakIterator')) {
+    const oldV8BreakIterator = Intl.v8BreakIterator;
     const des = Object.getOwnPropertyDescriptor(Intl, 'v8BreakIterator');
-    des.value = function v8BreakIterator() {
-      throw new Error('v8BreakIterator: full ICU data not installed. ' +
-                      'See https://github.com/nodejs/node/wiki/Intl');
-    };
+    des.value = require('internal/util').deprecate(function v8BreakIterator() {
+      if (processConfig.hasSmallICU && !process.icu_data_dir) {
+        // Intl.v8BreakIterator() would crash w/ fatal error, so throw instead.
+        throw new Error('v8BreakIterator: full ICU data not installed. ' +
+                        'See https://github.com/nodejs/node/wiki/Intl');
+      }
+      return Reflect.construct(oldV8BreakIterator, arguments);
+    }, 'Intl.v8BreakIterator is deprecated and will be removed soon.');
     Object.defineProperty(Intl, 'v8BreakIterator', des);
   }
   // Don’t let icu_data_dir leak through.
diff --git a/test/parallel/test-intl-v8BreakIterator.js b/test/parallel/test-intl-v8BreakIterator.js
@@ -6,6 +6,9 @@ if (global.Intl === undefined || Intl.v8BreakIterator === undefined) {
   return common.skip('no Intl');
 }
 
+const warning = 'Intl.v8BreakIterator is deprecated and will be removed soon.';
+common.expectWarning('DeprecationWarning', warning);
+
 try {
   new Intl.v8BreakIterator();
   // May succeed if data is available - OK

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@ if (global.Intl === undefined \|\| Intl.v8BreakIterator === undefined) {`
`6`	`6`	`return common.skip('no Intl');`
`7`	`7`	`}`
`8`	`8`
	`9`	`+const warning = 'Intl.v8BreakIterator is deprecated and will be removed soon.';`
	`10`	`+common.expectWarning('DeprecationWarning', warning);`
	`11`	`+`
`9`	`12`	`try {`
`10`	`13`	`new Intl.v8BreakIterator();`
`11`	`14`	`// May succeed if data is available - OK`