build: fixups 3

.gitignore

@@ -56,6 +56,7 @@ yarn-error.log
 /ui/assets/vs
 /ui/assets/*.html
 /ui/assets/*.map
+/ui/assets/extension
 /ui/.tmp
 *.json.actual
 

enterprise/package.json

@@ -1,8 +1,6 @@
 {
-  "private": true,
   "name": "enterprise",
   "version": "1.0.0",
-  "description": "Sourcegraph Enterprise",
   "dependencies": {
     "date-fns": "^2.0.0-alpha.7"
   }

gulpfile.ts

@@ -232,7 +232,7 @@ export function watchExtensionsClientCommon(): ChildProcess {
     })
 }
 
-const PHABRICATOR_EXTENSION_FILES = './packages/webapp/node_modules/@sourcegraph/phabricator-extension/dist/**'
+const PHABRICATOR_EXTENSION_FILES = './packages/browser-extensions/build/phabricator/**'
 
 /**
  * Copies the bundles from the `@sourcegraph/phabricator-extension` package over to the ui/assets

packages/browser-extensions/config/shared/webpack.ts

@@ -4,7 +4,14 @@ import * as webpack from 'webpack'
 
 export const buildStylesLoaders = (baseLoader: webpack.Loader): webpack.Loader[] => [
     baseLoader,
-    { loader: 'postcss-loader' },
+    {
+        loader: 'postcss-loader',
+        options: {
+            config: {
+                path: path.join(__dirname, '../..'),
+            },
+        },
+    },
     {
         loader: 'sass-loader',
         options: {

packages/browser-extensions/package.json

@@ -6,7 +6,7 @@
     "yarn": ">1.10.0"
   },
   "scripts": {
-    "dev": "NODE_ENV=development node --max_old_space_size=8192 -r ts-node/register scripts/dev",
+    "dev": "NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 node -r ts-node/register scripts/dev",
     "dev:no-reload": "AUTO_RELOAD=false yarn run dev",
     "dev:firefox": "web-ext run --source-dir ./build/firefox",
     "build": "NODE_ENV=production ts-node scripts/build",

packages/extensions-client-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sourcegraph/extensions-client-common",
-  "version": "11.0.0",
+  "version": "12.0.0",
   "description": "Common TypeScript/React client application code for Sourcegraph extension configuration and management, used in Sourcegraph and \"Sourcegraph for X\" products",
   "main": "lib/index.js",
   "module": "lib/index.js",

packages/sourcegraph-extension-api/src/client/providers/decoration.test.ts

@@ -1,7 +1,6 @@
 import * as assert from 'assert'
 import { of } from 'rxjs'
 import { TestScheduler } from 'rxjs/testing'
-import { ThemableDecorationStyle } from 'sourcegraph'
 import { TextDocumentIdentifier } from '../../client/types/textDocument'
 import { TextDocumentDecoration } from '../../protocol/plainTypes'
 import {
@@ -139,7 +138,7 @@ describe('decorationStyleForTheme', () => {
         assert.deepStrictEqual(decorationStyleForTheme({ range: FIXTURE_RANGE, backgroundColor: 'red' }, true), {
             range: FIXTURE_RANGE, // it's not necessary that range is included, but it saves an object allocation
             backgroundColor: 'red',
-        } as ThemableDecorationStyle))
+        }))
 
     it('applies light theme overrides', () =>
         assert.deepStrictEqual(

packages/webapp/webpack.config.ts

@@ -18,6 +18,7 @@ const babelLoader: webpack.RuleSetUseItem = {
     loader: 'babel-loader',
     options: {
         cacheDirectory: true,
+        configFile: path.join(__dirname, 'babel.config.js'),
     },
 }
 
@@ -134,7 +135,14 @@ const config: webpack.Configuration = {
                             minimize: process.env.NODE_ENV === 'production',
                         },
                     },
-                    'postcss-loader',
+                    {
+                        loader: 'postcss-loader',
+                        options: {
+                            config: {
+                                path: __dirname,
+                            },
+                        },
+                    },
                     {
                         loader: 'sass-loader',
                         options: {

postcss.config.js

@@ -1,3 +0,0 @@
-module.exports = {
-  plugins: [require('autoprefixer')],
-}