From f1d26cb476fc3a4ec985e6bbd277c518242d8705 Mon Sep 17 00:00:00 2001 From: Jason Laster Date: Mon, 2 Oct 2017 15:31:03 -0400 Subject: [PATCH] bump 9-29 (#4214) * bump 9-29 * Revert "Upgrade tree component (#4215)" This reverts commit 179582c1a47d3786fa1c9cab03c3bb6c9cde8eb8. * assets --- assets/module-manifest.json | 42 +++++++++++++++++++++++++++++++++++-- bin/publish-assets.js | 40 ----------------------------------- webpack.config.js | 1 - 3 files changed, 40 insertions(+), 43 deletions(-) delete mode 100644 bin/publish-assets.js diff --git a/assets/module-manifest.json b/assets/module-manifest.json index cb08ea42cf..7c23ec9e04 100644 --- a/assets/module-manifest.json +++ b/assets/module-manifest.json @@ -20008,7 +20008,26 @@ "../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/components/SecondaryPanes/UtilsBar.js": 1185, "../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/utils/parser/getScopes.js": 1186, "../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../devtools-map-bindings/src/parser.js": 1187, - "../../css-loader/index.js?{\"importLoaders\":1}!../../../src/components/ShortcutsModal.css": 1188 + "../../css-loader/index.js?{\"importLoaders\":1}!../../../src/components/ShortcutsModal.css": 1188, + "../../react-redux/es/index.js": 1189, + "../../react-redux/es/utils/warning.js": 1190, + "../../react-redux/es/utils/PropTypes.js": 1191, + "../../react-redux/es/components/connectAdvanced.js": 1192, + "../../react-redux/es/connect/wrapMapToProps.js": 1193, + "../../react-redux/es/utils/verifyPlainObject.js": 1194, + "../../react-redux/es/components/Provider.js": 1195, + "../../react-redux/node_modules/hoist-non-react-statics/index.js": 1196, + "../../react-redux/es/utils/Subscription.js": 1197, + "../../react-redux/es/connect/connect.js": 1198, + "../../react-redux/es/utils/shallowEqual.js": 1199, + "../../react-redux/es/connect/mapDispatchToProps.js": 1200, + "../../react-redux/es/connect/mapStateToProps.js": 1201, + "../../react-redux/es/connect/mergeProps.js": 1202, + "../../react-redux/es/connect/selectorFactory.js": 1203, + "../../react-redux/es/connect/verifySubselectors.js": 1204, + "../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../node_modules/svg-inline-react/dist/index.js": 1205, + "../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../devtools-map-bindings/src/utils.js": 1206, + "../../babel-loader/lib/index.js?plugins[]=transform-flow-strip-types,plugins[]=transform-async-to-generator&ignore=src/lib!../../../src/utils/parser/validate.js": 1207 }, "usedIds": { "0": 0, @@ -21199,7 +21218,26 @@ "1185": 1185, "1186": 1186, "1187": 1187, - "1188": 1188 + "1188": 1188, + "1189": 1189, + "1190": 1190, + "1191": 1191, + "1192": 1192, + "1193": 1193, + "1194": 1194, + "1195": 1195, + "1196": 1196, + "1197": 1197, + "1198": 1198, + "1199": 1199, + "1200": 1200, + "1201": 1201, + "1202": 1202, + "1203": 1203, + "1204": 1204, + "1205": 1205, + "1206": 1206, + "1207": 1207 } }, "chunks": { diff --git a/bin/publish-assets.js b/bin/publish-assets.js deleted file mode 100644 index 57dd30b2e4..0000000000 --- a/bin/publish-assets.js +++ /dev/null @@ -1,40 +0,0 @@ -const { tools: { makeBundle, symlinkTests, copyFile }} = require("devtools-launchpad/index"); -const path = require("path"); -const fs = require("fs"); -const rimraf = require("rimraf"); - -function start() { - console.log("start: publish assets") - const projectPath = path.resolve(__dirname, "..") - const mcModulePath = "devtools/client/debugger/new"; - - const buildDir = path.resolve(projectPath, "assets/build"); - const assetsDir = path.resolve(projectPath, "assets"); - - if (fs.existsSync(buildDir)) { - rimraf(buildDir, {}, () => {}); - } - fs.mkdirSync(buildDir); - - copyFile( - path.resolve(projectPath, "assets/panel"), - path.join(projectPath, "assets/build/panel"), - { cwd: projectPath } - ); - - copyFile( - path.resolve(projectPath, "src/test/mochitest"), - path.resolve(projectPath, "assets/build/mochitest"), - { cwd: projectPath } - ); - - makeBundle({ - outputPath: `${projectPath}/assets/build`, - projectPath - }).then(() => { - console.log("done: publish assets") - }) - -} - -start(); diff --git a/webpack.config.js b/webpack.config.js index 97d3b402b4..3db41641fa 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -28,7 +28,6 @@ const webpackConfig = { path: path.join(__dirname, "assets/build"), filename: "[name].js", publicPath: "/assets/build" - // libraryTarget: "umd" } };