Bug 1298012 - move l10n.js from devtools/client/shared to devtools/shared;r=bgrins
MozReview-Commit-ID: 1HX0g7AoJwt
--- a/.eslintignore
+++ b/.eslintignore
@@ -160,18 +160,20 @@ devtools/client/framework/toolbox-proces
devtools/client/performance/system.js
devtools/client/webide/webide-prefs.js
devtools/client/preferences/**
# Ignore devtools third-party libs
devtools/shared/jsbeautify/*
devtools/shared/acorn/*
devtools/client/sourceeditor/tern/*
+devtools/shared/node-properties/*
devtools/shared/pretty-fast/*
devtools/shared/sourcemap/*
+devtools/shared/sprintfjs/*
devtools/shared/qrcode/decoder/*
devtools/shared/qrcode/encoder/*
devtools/client/shared/demangle.js
devtools/client/shared/vendor/*
devtools/client/sourceeditor/codemirror/*.js
devtools/client/sourceeditor/codemirror/**/*.js
devtools/client/sourceeditor/test/codemirror/*
devtools/client/inspector/markup/test/lib_*
--- a/devtools/client/shared/moz.build
+++ b/devtools/client/shared/moz.build
@@ -31,17 +31,16 @@ DevToolsModules(
'file-watcher-worker.js',
'file-watcher.js',
'frame-script-utils.js',
'getjson.js',
'inplace-editor.js',
'Jsbeautify.jsm',
'key-shortcuts.js',
'keycodes.js',
- 'l10n.js',
'node-attribute-parser.js',
'options-view.js',
'output-parser.js',
'poller.js',
'prefs.js',
'scroll.js',
'source-utils.js',
'SplitView.jsm',
--- a/devtools/client/shared/vendor/moz.build
+++ b/devtools/client/shared/vendor/moz.build
@@ -2,27 +2,25 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
modules = []
modules += [
'immutable.js',
'jsol.js',
- 'node-properties.js',
]
# react-dev is used if either debug mode is enabled,
# so include it for both
if CONFIG['DEBUG_JS_MODULES'] or CONFIG['MOZ_DEBUG']:
modules += ['react-dev.js']
modules += [
'react-dom.js',
'react-proxy.js',
'react-redux.js',
'react.js',
'redux.js',
'seamless-immutable.js',
- 'sprintf.js',
]
DevToolsModules(*modules)
rename from devtools/client/shared/l10n.js
rename to devtools/shared/l10n.js
--- a/devtools/client/shared/l10n.js
+++ b/devtools/shared/l10n.js
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const parsePropertiesFile = require("devtools/client/shared/vendor/node-properties");
-const { sprintf } = require("devtools/client/shared/vendor/sprintf");
+const parsePropertiesFile = require("devtools/shared/node-properties/node-properties");
+const { sprintf } = require("devtools/shared/sprintfjs/sprintf");
/**
* Localization convenience methods.
*
* @param string stringBundleName
* The desired string bundle's name.
*/
function LocalizationHelper(stringBundleName) {
--- a/devtools/shared/moz.build
+++ b/devtools/shared/moz.build
@@ -13,22 +13,24 @@ DIRS += [
'discovery',
'fronts',
'gcli',
'heapsnapshot',
'inspector',
'jsbeautify',
'layout',
'locales',
+ 'node-properties',
'performance',
'platform',
'pretty-fast',
'qrcode',
'security',
'sourcemap',
+ 'sprintfjs',
'shims',
'specs',
'touch',
'transport',
'webconsole',
'worker',
]
@@ -51,16 +53,17 @@ DevToolsModules(
'defer.js',
'deprecated-sync-thenables.js',
'DevToolsUtils.js',
'dom-node-constants.js',
'dom-node-filter-constants.js',
'event-emitter.js',
'flags.js',
'indentation.js',
+ 'l10n.js',
'loader-plugin-raw.jsm',
'Loader.jsm',
'Parser.jsm',
'path.js',
'protocol.js',
'system.js',
'task.js',
'ThreadSafeDevToolsUtils.js',
rename from devtools/client/shared/vendor/NODE_PROPERTIES_UPGRADING
rename to devtools/shared/node-properties/UPGRADING.md
new file mode 100644
--- /dev/null
+++ b/devtools/shared/node-properties/moz.build
@@ -0,0 +1,9 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DevToolsModules(
+ 'node-properties.js'
+)
rename from devtools/client/shared/vendor/node-properties.js
rename to devtools/shared/node-properties/node-properties.js
rename from devtools/client/shared/vendor/SPRINTF_JS_UPGRADING
rename to devtools/shared/sprintfjs/UPGRADING.md
new file mode 100644
--- /dev/null
+++ b/devtools/shared/sprintfjs/moz.build
@@ -0,0 +1,9 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DevToolsModules(
+ 'sprintf.js'
+)
rename from devtools/client/shared/vendor/sprintf.js
rename to devtools/shared/sprintfjs/sprintf.js