Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change startpage-ui to startPage-ui, to fix CI #14111

Merged
merged 3 commits into from
Sep 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions .vscodeignore
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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/**
Expand Down Expand Up @@ -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/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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}`);
Expand All @@ -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
})
];
Expand All @@ -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'
Expand All @@ -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') {
Expand All @@ -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')
}
]
);
Expand All @@ -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`
},
Expand Down Expand Up @@ -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
],
Expand Down Expand Up @@ -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}']
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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];
6 changes: 3 additions & 3 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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']));

Expand All @@ -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'));
Expand All @@ -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');
});

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/client/common/startPage/startPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/test/startPage/mountedWebView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
/**
Expand Down
2 changes: 1 addition & 1 deletion src/test/startPage/startPage.functional.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.extension.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"node_modules",
".vscode-test",
".vscode test",
"src/startpage-ui",
"src/startPage-ui",
"build"
]
}
File renamed without changes.