From f9e12af35ace2ab20eed1b5861ff6b7572f4059a Mon Sep 17 00:00:00 2001 From: David Kutugata Date: Fri, 25 Sep 2020 15:16:57 -0700 Subject: [PATCH 1/3] change startpage-ui to startPage-ui --- .eslintignore | 2 +- .vscodeignore | 10 +++++----- .../webpack.startpage-ui.config.builder.js | 16 ++++++++-------- gulpfile.js | 2 +- src/client/common/startPage/startPage.ts | 2 +- src/test/startPage/mountedWebView.ts | 2 +- src/test/startPage/startPage.functional.test.tsx | 2 +- tsconfig.extension.json | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.eslintignore b/.eslintignore index ad9a90d59d02..d17edd6ed974 100644 --- a/.eslintignore +++ b/.eslintignore @@ -979,7 +979,7 @@ src/startPage-ui/react-common/logger.ts src/startPage-ui/react-common/postOffice.ts src/startPage-ui/react-common/themeDetector.ts src/startPage-ui/startPage/index.tsx -src/startpage-ui/startPage/startPage.tsx +src/startPage-ui/startPage/startPage.tsx src/test/startPage/startPageIocContainer.ts src/test/startPage/mockCommandManager.ts src/test/startPage/mockDocument.ts diff --git a/.vscodeignore b/.vscodeignore index d0984ed9eded..778f528f730d 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -1,6 +1,6 @@ **/*.map **/*.analyzer.html -!out/startpage-ui/viewers/commons.initial.bundle.js.map +!out/startPage-ui/viewers/commons.initial.bundle.js.map *.vsix .appveyor.yml .editorconfig @@ -69,10 +69,10 @@ obj/** out/**/*.stats.json out/client/**/*.analyzer.html out/coverconfig.json -out/startpage-ui/common/** -out/startpage-ui/startPage/** -out/startpage-ui/react-common/** -out/startpage-ui/viewers/** +out/startPage-ui/common/** +out/startPage-ui/startPage/** +out/startPage-ui/react-common/** +out/startPage-ui/viewers/** out/pythonFiles/** out/src/** out/test/** diff --git a/build/webpack/webpack.startpage-ui.config.builder.js b/build/webpack/webpack.startpage-ui.config.builder.js index 19e8a39a208c..21ec9f21fccd 100644 --- a/build/webpack/webpack.startpage-ui.config.builder.js +++ b/build/webpack/webpack.startpage-ui.config.builder.js @@ -24,7 +24,7 @@ function getEntry(bundle) { switch (bundle) { case 'viewers': return { - startPage: ['babel-polyfill', `./src/startpage-ui/startPage/index.tsx`] + startPage: ['babel-polyfill', `./src/startPage-ui/startPage/index.tsx`] }; default: throw new Error(`Bundle not supported ${bundle}`); @@ -36,7 +36,7 @@ function getPlugins(bundle) { new ForkTsCheckerWebpackPlugin({ checkSyntacticErrors: true, tsconfig: configFileName, - reportFiles: ['src/startpage-ui/**/*.{ts,tsx}'], + reportFiles: ['src/startPage-ui/**/*.{ts,tsx}'], memoryLimit: 9096 }) ]; @@ -55,7 +55,7 @@ function getPlugins(bundle) { ...(isProdBuild ? [definePlugin] : []), ...[ new HtmlWebpackPlugin({ - template: 'src/startpage-ui/startPage/index.html', + template: 'src/startPage-ui/startPage/index.html', indexUrl: `${constants.ExtensionRootDir}/out/1`, chunks: ['commons', 'startPage'], filename: 'index.startPage.html' @@ -72,7 +72,7 @@ function getPlugins(bundle) { } function buildConfiguration(bundle) { - // Folder inside `startpage-ui` that will be created and where the files will be dumped. + // Folder inside `startPage-ui` that will be created and where the files will be dumped. const bundleFolder = bundle; const filesToCopy = []; if (bundle === 'notebook') { @@ -81,7 +81,7 @@ function buildConfiguration(bundle) { ...[ { from: path.join(constants.ExtensionRootDir, 'node_modules/font-awesome/**/*'), - to: path.join(constants.ExtensionRootDir, 'out', 'startpage-ui', bundleFolder, 'node_modules') + to: path.join(constants.ExtensionRootDir, 'out', 'startPage-ui', bundleFolder, 'node_modules') } ] ); @@ -90,7 +90,7 @@ function buildConfiguration(bundle) { context: constants.ExtensionRootDir, entry: getEntry(bundle), output: { - path: path.join(constants.ExtensionRootDir, 'out', 'startpage-ui', bundleFolder), + path: path.join(constants.ExtensionRootDir, 'out', 'startPage-ui', bundleFolder), filename: '[name].js', chunkFilename: `[name].bundle.js` }, @@ -179,7 +179,7 @@ function buildConfiguration(bundle) { { from: './**/*theme*.json', to: '.' }, { from: path.join(constants.ExtensionRootDir, 'node_modules/requirejs/require.js'), - to: path.join(constants.ExtensionRootDir, 'out', 'startpage-ui', bundleFolder) + to: path.join(constants.ExtensionRootDir, 'out', 'startPage-ui', bundleFolder) }, ...filesToCopy ], @@ -218,7 +218,7 @@ function buildConfiguration(bundle) { configFile: configFileName, // Faster (turn on only on CI, for dev we don't need this). transpileOnly: true, - reportFiles: ['src/startpage-ui/**/*.{ts,tsx}'] + reportFiles: ['src/startPage-ui/**/*.{ts,tsx}'] } } ] diff --git a/gulpfile.js b/gulpfile.js index 6cc209f4b6ae..882484918ea3 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -99,7 +99,7 @@ gulp.task('hygiene-branch', (done) => run({ mode: 'diffMain' }, done)); gulp.task('output:clean', () => del(['coverage'])); -gulp.task('clean:cleanExceptTests', () => del(['clean:vsix', 'out/client', 'out/startpage-ui', 'out/server'])); +gulp.task('clean:cleanExceptTests', () => del(['clean:vsix', 'out/client', 'out/startPage-ui', 'out/server'])); gulp.task('clean:vsix', () => del(['*.vsix'])); gulp.task('clean:out', () => del(['out'])); diff --git a/src/client/common/startPage/startPage.ts b/src/client/common/startPage/startPage.ts index 92b7e06dffa6..8db99707f86d 100644 --- a/src/client/common/startPage/startPage.ts +++ b/src/client/common/startPage/startPage.ts @@ -26,7 +26,7 @@ import { StartPageMessageListener } from './startPageMessageListener'; import { ICodeCssGenerator, IStartPage, IStartPageMapping, IThemeFinder, StartPageMessages } from './types'; import { WebviewPanelHost } from './webviewPanelHost'; -const startPageDir = path.join(EXTENSION_ROOT_DIR, 'out', 'startpage-ui', 'viewers'); +const startPageDir = path.join(EXTENSION_ROOT_DIR, 'out', 'startPage-ui', 'viewers'); // Class that opens, disposes and handles messages and actions for the Python Extension Start Page. // It also runs when the extension activates. diff --git a/src/test/startPage/mountedWebView.ts b/src/test/startPage/mountedWebView.ts index 0df4863f0f11..51ef0ca136de 100644 --- a/src/test/startPage/mountedWebView.ts +++ b/src/test/startPage/mountedWebView.ts @@ -12,7 +12,7 @@ import { import { traceError, traceInfo } from '../../client/common/logger'; import { IDisposable } from '../../client/common/types'; import { createDeferred } from '../../client/common/utils/async'; -import { IVsCodeApi } from '../../startpage-ui/react-common/postOffice'; +import { IVsCodeApi } from '../../startPage-ui/react-common/postOffice'; export type WaitForMessageOptions = { /** diff --git a/src/test/startPage/startPage.functional.test.tsx b/src/test/startPage/startPage.functional.test.tsx index d3f398376a5c..ae335e68e00f 100644 --- a/src/test/startPage/startPage.functional.test.tsx +++ b/src/test/startPage/startPage.functional.test.tsx @@ -6,7 +6,7 @@ import * as assert from 'assert'; import { ComponentClass, mount, ReactWrapper } from 'enzyme'; import * as React from 'react'; import { IStartPage } from '../../client/common/startPage/types'; -import { StartPage } from '../../startpage-ui/startPage/startPage'; +import { StartPage } from '../../startPage-ui/startPage/startPage'; import { StartPageIocContainer } from './startPageIocContainer'; suite('StartPage tests', () => { diff --git a/tsconfig.extension.json b/tsconfig.extension.json index 0708e0857dec..390071d12c98 100644 --- a/tsconfig.extension.json +++ b/tsconfig.extension.json @@ -21,7 +21,7 @@ "node_modules", ".vscode-test", ".vscode test", - "src/startpage-ui", + "src/startPage-ui", "build" ] } From e73661d05e769cafffc5de5df6da93dc86884133 Mon Sep 17 00:00:00 2001 From: David Kutugata Date: Fri, 25 Sep 2020 15:34:46 -0700 Subject: [PATCH 2/3] more renames --- .eslintignore | 6 +++--- ...ers.config.js => webpack.startPage-ui-viewers.config.js} | 2 +- ...ig.builder.js => webpack.startPage-ui.config.builder.js} | 2 +- ...tartpage-ui.config.js => webpack.startPage-ui.config.js} | 2 +- gulpfile.js | 4 ++-- package.json | 2 +- tsconfig.startpage-ui.json => tsconfig.startPage-ui.json | 0 7 files changed, 9 insertions(+), 9 deletions(-) rename build/webpack/{webpack.startpage-ui-viewers.config.js => webpack.startPage-ui-viewers.config.js} (70%) rename build/webpack/{webpack.startpage-ui.config.builder.js => webpack.startPage-ui.config.builder.js} (99%) rename build/webpack/{webpack.startpage-ui.config.js => webpack.startPage-ui.config.js} (70%) rename tsconfig.startpage-ui.json => tsconfig.startPage-ui.json (100%) diff --git a/.eslintignore b/.eslintignore index d17edd6ed974..657df27a73ba 100644 --- a/.eslintignore +++ b/.eslintignore @@ -10,14 +10,14 @@ build/ci/performance/checkPerformanceResults.js build/ci/performance/createNewPerformanceBenchmark.js build/ci/performance/savePerformanceResults.js -build/webpack/webpack.startpage-ui.config.js +build/webpack/webpack.startPage-ui.config.js build/webpack/webpack.extension.config.js build/webpack/plugins/less-plugin-base64.js -build/webpack/webpack.startpage-ui.config.builder.js +build/webpack/webpack.startPage-ui.config.builder.js build/webpack/pdfkit.js build/webpack/webpack.extension.dependencies.config.js build/webpack/common.js -build/webpack/webpack.startpage-ui-viewers.config.js +build/webpack/webpack.startPage-ui-viewers.config.js build/webpack/loaders/fixNodeFetch.js build/webpack/loaders/remarkLoader.js build/webpack/loaders/jsonloader.js diff --git a/build/webpack/webpack.startpage-ui-viewers.config.js b/build/webpack/webpack.startPage-ui-viewers.config.js similarity index 70% rename from build/webpack/webpack.startpage-ui-viewers.config.js rename to build/webpack/webpack.startPage-ui-viewers.config.js index 00e0ca38ea4e..b321b9aea40a 100644 --- a/build/webpack/webpack.startpage-ui-viewers.config.js +++ b/build/webpack/webpack.startPage-ui-viewers.config.js @@ -3,5 +3,5 @@ 'use strict'; -const builder = require('./webpack.startpage-ui.config.builder'); +const builder = require('./webpack.startPage-ui.config.builder'); module.exports = [builder.viewers]; diff --git a/build/webpack/webpack.startpage-ui.config.builder.js b/build/webpack/webpack.startPage-ui.config.builder.js similarity index 99% rename from build/webpack/webpack.startpage-ui.config.builder.js rename to build/webpack/webpack.startPage-ui.config.builder.js index 21ec9f21fccd..c005e3f5a2f9 100644 --- a/build/webpack/webpack.startpage-ui.config.builder.js +++ b/build/webpack/webpack.startPage-ui.config.builder.js @@ -14,7 +14,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin'); const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin'); const TerserPlugin = require('terser-webpack-plugin'); const constants = require('../constants'); -const configFileName = 'tsconfig.startpage-ui.json'; +const configFileName = 'tsconfig.startPage-ui.json'; const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin'); // Any build on the CI is considered production mode. diff --git a/build/webpack/webpack.startpage-ui.config.js b/build/webpack/webpack.startPage-ui.config.js similarity index 70% rename from build/webpack/webpack.startpage-ui.config.js rename to build/webpack/webpack.startPage-ui.config.js index 00e0ca38ea4e..b321b9aea40a 100644 --- a/build/webpack/webpack.startpage-ui.config.js +++ b/build/webpack/webpack.startPage-ui.config.js @@ -3,5 +3,5 @@ 'use strict'; -const builder = require('./webpack.startpage-ui.config.builder'); +const builder = require('./webpack.startPage-ui.config.builder'); module.exports = [builder.viewers]; diff --git a/gulpfile.js b/gulpfile.js index 882484918ea3..98acb2992860 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -116,7 +116,7 @@ gulp.task('checkNativeDependencies', (done) => { const webpackEnv = { NODE_OPTIONS: '--max_old_space_size=9096' }; gulp.task('compile-viewers', async () => { - await buildWebPackForDevOrProduction('./build/webpack/webpack.startpage-ui-viewers.config.js'); + await buildWebPackForDevOrProduction('./build/webpack/webpack.startPage-ui-viewers.config.js'); }); gulp.task('compile-webviews', gulp.series('compile-viewers')); @@ -131,7 +131,7 @@ async function buildWebPackForDevOrProduction(configFile, configNameForProductio gulp.task('webpack', async () => { // Build node_modules. await buildWebPackForDevOrProduction('./build/webpack/webpack.extension.dependencies.config.js', 'production'); - await buildWebPackForDevOrProduction('./build/webpack/webpack.startpage-ui-viewers.config.js', 'production'); + await buildWebPackForDevOrProduction('./build/webpack/webpack.startPage-ui-viewers.config.js', 'production'); await buildWebPackForDevOrProduction('./build/webpack/webpack.extension.config.js', 'extension'); }); diff --git a/package.json b/package.json index ee323f0620f9..50eec096d24d 100644 --- a/package.json +++ b/package.json @@ -1949,7 +1949,7 @@ "compile": "tsc -watch -p ./", "compiled": "deemon npm run compile", "kill-compiled": "deemon --kill npm run compile", - "compile-webviews-watch": "cross-env NODE_OPTIONS=--max_old_space_size=9096 webpack --config ./build/webpack/webpack.startpage-ui.config.js --watch", + "compile-webviews-watch": "cross-env NODE_OPTIONS=--max_old_space_size=9096 webpack --config ./build/webpack/webpack.startPage-ui.config.js --watch", "compile-webviews-watchd": "deemon npm run compile-webviews-watch", "kill-compile-webviews-watchd": "deemon --kill npm run compile-webviews-watch", "checkDependencies": "gulp checkDependencies", diff --git a/tsconfig.startpage-ui.json b/tsconfig.startPage-ui.json similarity index 100% rename from tsconfig.startpage-ui.json rename to tsconfig.startPage-ui.json From 49e4b5029f0d47fa85c2d4c2611189505cc2e4b0 Mon Sep 17 00:00:00 2001 From: David Kutugata Date: Fri, 25 Sep 2020 15:35:46 -0700 Subject: [PATCH 3/3] oops --- .vscodeignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscodeignore b/.vscodeignore index 778f528f730d..b37ac9ef002d 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -37,7 +37,7 @@ typings.json vsc-extension-quickstart.md vscode-python-signing.* webpack.config.js -webpack.startpage-*.config.js +webpack.startPage-*.config.js .devcontainer/** .github/**