Change dir structure so lerna will build

stjordanis · Apr 17, 2019 · 539b9ba · 539b9ba
1 parent 4daec40
commit 539b9ba
Show file tree

Hide file tree

Showing 81 changed files with 31 additions and 25 deletions.
diff --git a/Spell Checker.code-workspace b/Spell Checker.code-workspace
@@ -7,10 +7,10 @@
  "path": "packages/client"
  },
  {
- "path": "packages/server"
+ "path": "packages/_server"
  },
  {
- "path": "packages/settingsViewer"
+ "path": "packages/_settingsViewer"
  }
  ],
  "settings": {
@@ -21,4 +21,4 @@
  ],
  "typescript.tsdk": "server/node_modules/typescript/lib"
  }
-}
+}
diff --git a/lerna.json b/lerna.json
@@ -1,7 +1,7 @@
 {
  "packages": [
- "packages/settingsViewer",
- "packages/server",
+ "packages/_settingsViewer",
+ "packages/_server",
  "packages/client"
  ],
  "version": "1.6.10"

diff --git a/package.json b/package.json
@@ -5,17 +5,10 @@
  "private": true,
  "scripts": {
  "bootstrap": "lerna bootstrap",
- "build": "lerna run build --concurrency 1",
- "build-x": "npm run build-server ; npm run build-client",
- "build-client": "cd packages/client && npm run build",
- "build-server": "cd packages/server && npm run build",
+ "build": "lerna run build --no-sort --concurrency 1",
  "clean": "lerna run clean && lerna clean",
- "test-client": "cd packages/client && npm run test",
  "test-client-integration": "lerna run test-integration",
- "test-server": "cd packages/server && npm run test",
- "test-settings-viewer": "cd packages/settingsViewer && npm run test",
- "test": "lerna run test",
- "test-x": "npm run test-server && npm run test-client && npm run test-settings-viewer"
+ "test": "lerna run test"
  },
  "repository": {
  "type": "git",

diff --git a/packages/server/.gitignore → packages/_server/.gitignore b/packages/server/.gitignore → packages/_server/.gitignore
diff --git a/packages/server/.vscode/cSpell.json → packages/_server/.vscode/cSpell.json b/packages/server/.vscode/cSpell.json → packages/_server/.vscode/cSpell.json
diff --git a/packages/server/.vscode/launch.json → packages/_server/.vscode/launch.json b/packages/server/.vscode/launch.json → packages/_server/.vscode/launch.json
diff --git a/packages/server/.vscode/settings.json → packages/_server/.vscode/settings.json b/packages/server/.vscode/settings.json → packages/_server/.vscode/settings.json
diff --git a/packages/server/.vscode/tasks.json → packages/_server/.vscode/tasks.json b/packages/server/.vscode/tasks.json → packages/_server/.vscode/tasks.json
diff --git a/packages/server/License.txt → packages/_server/License.txt b/packages/server/License.txt → packages/_server/License.txt
diff --git a/packages/server/README.md → packages/_server/README.md b/packages/server/README.md → packages/_server/README.md
diff --git a/packages/server/jest.config.js → packages/_server/jest.config.js b/packages/server/jest.config.js → packages/_server/jest.config.js
diff --git a/packages/server/package-lock.json → packages/_server/package-lock.json b/packages/server/package-lock.json → packages/_server/package-lock.json
diff --git a/packages/server/package.json → packages/_server/package.json b/packages/server/package.json → packages/_server/package.json
@@ -1,10 +1,10 @@
 {
  "name": "vscode-spell-checker-server",
+ "private": true,
  "description": "Spell Checker Server",
  "version": "1.6.10",
  "author": "Jason Dent",
  "license": "MIT",
- "private": true,
  "repository": {
  "type": "git",
  "url": "https://github.com/Jason-Rev/vscode-spell-checker"

diff --git a/...ages/server/sampleSourceFiles/cSpell.json → ...ges/_server/sampleSourceFiles/cSpell.json b/...ages/server/sampleSourceFiles/cSpell.json → ...ges/_server/sampleSourceFiles/cSpell.json
diff --git a/packages/server/sampleSourceFiles/sample.c → packages/_server/sampleSourceFiles/sample.c b/packages/server/sampleSourceFiles/sample.c → packages/_server/sampleSourceFiles/sample.c
diff --git a/packages/server/src/api.ts → packages/_server/src/api.ts b/packages/server/src/api.ts → packages/_server/src/api.ts
diff --git a/packages/server/src/codeActions.ts → packages/_server/src/codeActions.ts b/packages/server/src/codeActions.ts → packages/_server/src/codeActions.ts
diff --git a/packages/server/src/cspellConfig.ts → packages/_server/src/cspellConfig.ts b/packages/server/src/cspellConfig.ts → packages/_server/src/cspellConfig.ts
diff --git a/packages/server/src/documentSettings.ts → packages/_server/src/documentSettings.ts b/packages/server/src/documentSettings.ts → packages/_server/src/documentSettings.ts
diff --git a/packages/server/src/index.ts → packages/_server/src/index.ts b/packages/server/src/index.ts → packages/_server/src/index.ts
diff --git a/packages/server/src/logger.ts → packages/_server/src/logger.ts b/packages/server/src/logger.ts → packages/_server/src/logger.ts
diff --git a/packages/server/src/server.ts → packages/_server/src/server.ts b/packages/server/src/server.ts → packages/_server/src/server.ts
diff --git a/packages/server/src/util.ts → packages/_server/src/util.ts b/packages/server/src/util.ts → packages/_server/src/util.ts
diff --git a/packages/server/src/validator.md → packages/_server/src/validator.md b/packages/server/src/validator.md → packages/_server/src/validator.md
diff --git a/packages/server/src/validator.test.ts → packages/_server/src/validator.test.ts b/packages/server/src/validator.test.ts → packages/_server/src/validator.test.ts
diff --git a/packages/server/src/validator.ts → packages/_server/src/validator.ts b/packages/server/src/validator.ts → packages/_server/src/validator.ts
diff --git a/...ges/server/src/vscode.workspaceFolders.ts → ...es/_server/src/vscode.workspaceFolders.ts b/...ges/server/src/vscode.workspaceFolders.ts → ...es/_server/src/vscode.workspaceFolders.ts
diff --git a/packages/server/tsconfig.json → packages/_server/tsconfig.json b/packages/server/tsconfig.json → packages/_server/tsconfig.json
diff --git a/packages/server/tslint.json → packages/_server/tslint.json b/packages/server/tslint.json → packages/_server/tslint.json
diff --git a/packages/settingsViewer/.gitignore → packages/_settingsViewer/.gitignore b/packages/settingsViewer/.gitignore → packages/_settingsViewer/.gitignore
diff --git a/packages/settingsViewer/.vscode/launch.json → packages/_settingsViewer/.vscode/launch.json b/packages/settingsViewer/.vscode/launch.json → packages/_settingsViewer/.vscode/launch.json
diff --git a/...ages/settingsViewer/.vscode/settings.json → ...ges/_settingsViewer/.vscode/settings.json b/...ages/settingsViewer/.vscode/settings.json → ...ges/_settingsViewer/.vscode/settings.json
diff --git a/packages/settingsViewer/.vscode/tasks.json → packages/_settingsViewer/.vscode/tasks.json b/packages/settingsViewer/.vscode/tasks.json → packages/_settingsViewer/.vscode/tasks.json
diff --git a/packages/settingsViewer/README.md → packages/_settingsViewer/README.md b/packages/settingsViewer/README.md → packages/_settingsViewer/README.md
diff --git a/packages/settingsViewer/jest.config.js → packages/_settingsViewer/jest.config.js b/packages/settingsViewer/jest.config.js → packages/_settingsViewer/jest.config.js
diff --git a/packages/settingsViewer/package-lock.json → packages/_settingsViewer/package-lock.json b/packages/settingsViewer/package-lock.json → packages/_settingsViewer/package-lock.json
diff --git a/packages/settingsViewer/package.json → packages/_settingsViewer/package.json b/packages/settingsViewer/package.json → packages/_settingsViewer/package.json
@@ -1,18 +1,18 @@
 {
- "name": "cspell-settings-webview",
+ "name": "code-spell-checker-settings-webview",
+ "private": true,
  "version": "1.6.10",
  "description": "Webview for VS Code to edit cspell settings",
  "typings": "out",
  "main": "out",
  "scripts": {
  "build": "tsc -p . && webpack",
- "clean": "rimraf viewer && rimraf out",
+ "clean": "rimraf ../client/settingsViewer",
  "coverage": "jest --coverage src",
  "start:dev": "webpack-dev-server",
  "start": "http-server dist",
  "test": "jest src"
  },
- "private": true,
  "keywords": [],
  "author": "Jason Dent",
  "license": "MIT",

diff --git a/.../settingsViewer/src/__mocks__/fileMock.js → ..._settingsViewer/src/__mocks__/fileMock.js b/.../settingsViewer/src/__mocks__/fileMock.js → ..._settingsViewer/src/__mocks__/fileMock.js
diff --git a/...settingsViewer/src/__mocks__/styleMock.js → ...settingsViewer/src/__mocks__/styleMock.js b/...settingsViewer/src/__mocks__/styleMock.js → ...settingsViewer/src/__mocks__/styleMock.js
diff --git a/packages/settingsViewer/src/api/index.ts → packages/_settingsViewer/src/api/index.ts b/packages/settingsViewer/src/api/index.ts → packages/_settingsViewer/src/api/index.ts
diff --git a/...es/settingsViewer/src/api/message.test.ts → ...s/_settingsViewer/src/api/message.test.ts b/...es/settingsViewer/src/api/message.test.ts → ...s/_settingsViewer/src/api/message.test.ts
diff --git a/packages/settingsViewer/src/api/message.ts → packages/_settingsViewer/src/api/message.ts b/packages/settingsViewer/src/api/message.ts → packages/_settingsViewer/src/api/message.ts
diff --git a/.../settingsViewer/src/api/settings/index.ts → ..._settingsViewer/src/api/settings/index.ts b/.../settingsViewer/src/api/settings/index.ts → ..._settingsViewer/src/api/settings/index.ts
diff --git a/...ttingsViewer/src/api/settings/settings.ts → ...ttingsViewer/src/api/settings/settings.ts b/...ttingsViewer/src/api/settings/settings.ts → ...ttingsViewer/src/api/settings/settings.ts
diff --git a/...ages/settingsViewer/src/api/utils.test.ts → ...ges/_settingsViewer/src/api/utils.test.ts b/...ages/settingsViewer/src/api/utils.test.ts → ...ges/_settingsViewer/src/api/utils.test.ts
diff --git a/packages/settingsViewer/src/api/utils.ts → packages/_settingsViewer/src/api/utils.ts b/packages/settingsViewer/src/api/utils.ts → packages/_settingsViewer/src/api/utils.ts
diff --git a/...Viewer/src/api/vscode/VsCodeWebviewApi.ts → ...Viewer/src/api/vscode/VsCodeWebviewApi.ts b/...Viewer/src/api/vscode/VsCodeWebviewApi.ts → ...Viewer/src/api/vscode/VsCodeWebviewApi.ts
diff --git a/packages/settingsViewer/src/index.ts → packages/_settingsViewer/src/index.ts b/packages/settingsViewer/src/index.ts → packages/_settingsViewer/src/index.ts
diff --git a/...ges/settingsViewer/src/viewer/AppState.ts → ...es/_settingsViewer/src/viewer/AppState.ts b/...ges/settingsViewer/src/viewer/AppState.ts → ...es/_settingsViewer/src/viewer/AppState.ts
diff --git a/...Viewer/src/viewer/SettingsViewer.test.tsx → ...Viewer/src/viewer/SettingsViewer.test.tsx b/...Viewer/src/viewer/SettingsViewer.test.tsx → ...Viewer/src/viewer/SettingsViewer.test.tsx
diff --git a/...tingsViewer/src/viewer/SettingsViewer.tsx → ...tingsViewer/src/viewer/SettingsViewer.tsx b/...tingsViewer/src/viewer/SettingsViewer.tsx → ...tingsViewer/src/viewer/SettingsViewer.tsx
diff --git a/...__snapshots__/panelLanguage.test.tsx.snap → ...__snapshots__/panelLanguage.test.tsx.snap b/...__snapshots__/panelLanguage.test.tsx.snap → ...__snapshots__/panelLanguage.test.tsx.snap
diff --git a/packages/settingsViewer/src/viewer/app.scss → packages/_settingsViewer/src/viewer/app.scss b/packages/settingsViewer/src/viewer/app.scss → packages/_settingsViewer/src/viewer/app.scss
diff --git a/...s/settingsViewer/src/viewer/app.scss.d.ts → .../_settingsViewer/src/viewer/app.scss.d.ts b/...s/settingsViewer/src/viewer/app.scss.d.ts → .../_settingsViewer/src/viewer/app.scss.d.ts
diff --git a/packages/settingsViewer/src/viewer/cat.tsx → packages/_settingsViewer/src/viewer/cat.tsx b/packages/settingsViewer/src/viewer/cat.tsx → packages/_settingsViewer/src/viewer/cat.tsx
diff --git a/...Viewer/src/viewer/images/SpellCheck.m.png → ...Viewer/src/viewer/images/SpellCheck.m.png b/...Viewer/src/viewer/images/SpellCheck.m.png → ...Viewer/src/viewer/images/SpellCheck.m.png
diff --git a/...gsViewer/src/viewer/images/SpellCheck.png → ...gsViewer/src/viewer/images/SpellCheck.png b/...gsViewer/src/viewer/images/SpellCheck.png → ...gsViewer/src/viewer/images/SpellCheck.png
diff --git a/...Viewer/src/viewer/images/SpellCheck.s.png → ...Viewer/src/viewer/images/SpellCheck.s.png b/...Viewer/src/viewer/images/SpellCheck.s.png → ...Viewer/src/viewer/images/SpellCheck.s.png
diff --git a/...iewer/src/viewer/images/SpellCheck.xs.png → ...iewer/src/viewer/images/SpellCheck.xs.png b/...iewer/src/viewer/images/SpellCheck.xs.png → ...iewer/src/viewer/images/SpellCheck.xs.png
diff --git a/...ttingsViewer/src/viewer/images/index.d.ts → ...ttingsViewer/src/viewer/images/index.d.ts b/...ttingsViewer/src/viewer/images/index.d.ts → ...ttingsViewer/src/viewer/images/index.d.ts
diff --git a/packages/settingsViewer/src/viewer/index.hbs → ...ages/_settingsViewer/src/viewer/index.hbs b/packages/settingsViewer/src/viewer/index.hbs → ...ages/_settingsViewer/src/viewer/index.hbs
diff --git a/.../src/viewer/mld/MaterialIcons-Regular.eot → .../src/viewer/mld/MaterialIcons-Regular.eot b/.../src/viewer/mld/MaterialIcons-Regular.eot → .../src/viewer/mld/MaterialIcons-Regular.eot
diff --git a/...rc/viewer/mld/MaterialIcons-Regular.ijmap → ...rc/viewer/mld/MaterialIcons-Regular.ijmap b/...rc/viewer/mld/MaterialIcons-Regular.ijmap → ...rc/viewer/mld/MaterialIcons-Regular.ijmap
diff --git a/.../src/viewer/mld/MaterialIcons-Regular.svg → .../src/viewer/mld/MaterialIcons-Regular.svg b/.../src/viewer/mld/MaterialIcons-Regular.svg → .../src/viewer/mld/MaterialIcons-Regular.svg
diff --git a/.../src/viewer/mld/MaterialIcons-Regular.ttf → .../src/viewer/mld/MaterialIcons-Regular.ttf b/.../src/viewer/mld/MaterialIcons-Regular.ttf → .../src/viewer/mld/MaterialIcons-Regular.ttf
diff --git a/...src/viewer/mld/MaterialIcons-Regular.woff → ...src/viewer/mld/MaterialIcons-Regular.woff b/...src/viewer/mld/MaterialIcons-Regular.woff → ...src/viewer/mld/MaterialIcons-Regular.woff
diff --git a/...rc/viewer/mld/MaterialIcons-Regular.woff2 → ...rc/viewer/mld/MaterialIcons-Regular.woff2 b/...rc/viewer/mld/MaterialIcons-Regular.woff2 → ...rc/viewer/mld/MaterialIcons-Regular.woff2
diff --git a/...s/settingsViewer/src/viewer/mld/README.md → .../_settingsViewer/src/viewer/mld/README.md b/...s/settingsViewer/src/viewer/mld/README.md → .../_settingsViewer/src/viewer/mld/README.md
diff --git a/.../settingsViewer/src/viewer/mld/codepoints → ..._settingsViewer/src/viewer/mld/codepoints b/.../settingsViewer/src/viewer/mld/codepoints → ..._settingsViewer/src/viewer/mld/codepoints
diff --git a/...sViewer/src/viewer/mld/material-icons.css → ...sViewer/src/viewer/mld/material-icons.css b/...sViewer/src/viewer/mld/material-icons.css → ...sViewer/src/viewer/mld/material-icons.css
diff --git a/...sViewer/src/viewer/panelLanguage.test.tsx → ...sViewer/src/viewer/panelLanguage.test.tsx b/...sViewer/src/viewer/panelLanguage.test.tsx → ...sViewer/src/viewer/panelLanguage.test.tsx
diff --git a/...ttingsViewer/src/viewer/panelLanguage.tsx → ...ttingsViewer/src/viewer/panelLanguage.tsx b/...ttingsViewer/src/viewer/panelLanguage.tsx → ...ttingsViewer/src/viewer/panelLanguage.tsx
diff --git a/...ages/settingsViewer/src/viewer/viewer.tsx → ...ges/_settingsViewer/src/viewer/viewer.tsx b/...ages/settingsViewer/src/viewer/viewer.tsx → ...ges/_settingsViewer/src/viewer/viewer.tsx
diff --git a/...gsViewer/src/viewer/vsCodeTestWrapper.tsx → ...gsViewer/src/viewer/vsCodeTestWrapper.tsx b/...gsViewer/src/viewer/vsCodeTestWrapper.tsx → ...gsViewer/src/viewer/vsCodeTestWrapper.tsx
diff --git a/packages/settingsViewer/tsconfig.json → packages/_settingsViewer/tsconfig.json b/packages/settingsViewer/tsconfig.json → packages/_settingsViewer/tsconfig.json
@@ -6,7 +6,7 @@
  "sourceMap": true,
  "declaration": true,
  "jsx": "react",
- "outDir": "out",
+ "outDir": "../client/settingsViewer",
  "experimentalDecorators": true,
  "strictNullChecks": true
  },

diff --git a/packages/settingsViewer/webpack.config.js → packages/_settingsViewer/webpack.config.js b/packages/settingsViewer/webpack.config.js → packages/_settingsViewer/webpack.config.js
@@ -3,7 +3,11 @@ const { CheckerPlugin } = require('awesome-typescript-loader');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
-const dist = path.join('out', 'webapp');
+const tsConfig = require('./tsconfig.json');
+
+const target = path.resolve(tsConfig['compilerOptions']['outDir']);
+
+const dist = path.join(target, 'webapp');
 
 const baseConfig = {
  devtool: 'source-map',
@@ -12,7 +16,7 @@ const baseConfig = {
  index: path.join(__dirname, 'src', 'viewer', 'viewer.tsx'),
  },
  output: {
- path: path.join(__dirname, dist),
+ path: dist,
  filename: '[name].bundle.js',
  publicPath: '/',
  },
@@ -73,7 +77,7 @@ const baseConfig = {
  ],
  },
  devServer: {
- contentBase: path.join(__dirname, dist),
+ contentBase: dist,
  headers: {
  'Access-Control-Allow-Origin': '*',
  'Access-Control-Allow-Headers': '*',

diff --git a/packages/client/.gitignore b/packages/client/.gitignore
@@ -1,4 +1,5 @@
 out
-/server/*
+server/*
+settingsViewer/*
 node_modules
 temp
diff --git a/packages/client/.vscodeignore b/packages/client/.vscodeignore
@@ -2,8 +2,10 @@
 .vscode-test/**
 .vscode/**
 **/*.map
-**/*.test.js
 **/*.ts
+**/*.test.*
+**/test.*
+**/*.spec.*
 out/test/**
 samples/**
 src/**
@@ -12,3 +14,5 @@ test/**
 tsconfig.json
 typings/**
 vsc-extension-quickstart.md
+coverage/**
+settingsViewer/viewer/**
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -452,7 +452,6 @@
  },
  "dependencies": {
  "comment-json": "^1.1.3",
- "cspell-settings-webview": "file:../settingsViewer",
  "fs-extra": "^7.0.1",
  "kefir": "^3.8.6",
  "node-watch": "^0.6.0",

diff --git a/packages/client/src/infoViewer/settingsViewer.ts b/packages/client/src/infoViewer/settingsViewer.ts
@@ -0,0 +1 @@
+export * from '../../settingsViewer';
diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json
@@ -10,6 +10,10 @@
  "sourceMap": true,
  "rootDir": "."
  },
+ "include": [
+ "src",
+ "test"
+ ],
  "exclude": [
  "node_modules",
  "server"