pw_web_ui: Replace '@Pigweed' and 'pigweed' imports with 'pigweedjs'

Changing package name from pigweed to pigweedjs caused a few protos to not be included in final bundle. This fixes the bug and adds a test to check if the bundle imports some outside module, which happens when rollup fails to find the right module when creating the bundle. Change-Id: I0987ca74e91b1b355779bf382ea8b567e62eda18 Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/103400 Commit-Queue: Asad Memon <asadmemon@google.com> Reviewed-by: Anthony DiGirolamo <tonymd@google.com>
google · Jul 25, 2022 · 41af1d8 · 41af1d8
1 parent e9bb8a0
commit 41af1d8
Show file tree

Hide file tree

Showing 30 changed files with 64 additions and 57 deletions.
diff --git a/jest.config.ts b/jest.config.ts
@@ -16,10 +16,10 @@ import {pathsToModuleNameMapper} from "ts-jest";
 import type {InitialOptionsTsJest} from 'ts-jest/dist/types';
 
 const paths = {
-  "@pigweed/pw_*": [
+  "pigweedjs/pw_*": [
     "./pw_*/ts"
   ],
-  "pigweed/protos/*": [
+  "pigweedjs/protos/*": [
     "./dist/protos/*"
   ]
 }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pigweedjs",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "An open source collection of embedded-targeted libraries",
   "author": "The Pigweed Authors",
   "license": "Apache-2.0",

diff --git a/pw_protobuf_compiler/ts/build.ts b/pw_protobuf_compiler/ts/build.ts
@@ -93,6 +93,6 @@ protoc(protos, outDir).then(() => {
   makeProtoCollection(
     path.join(outDir, 'descriptor.bin'),
     outDir,
-    'pigweed/protos'
+    'pigweedjs/protos'
   );
 });
diff --git a/pw_protobuf_compiler/ts/ts_proto_collection.template.ts b/pw_protobuf_compiler/ts/ts_proto_collection.template.ts
@@ -17,7 +17,7 @@
 import {
   ProtoCollection as Base,
   ModuleMap,
-} from '@pigweed/pw_protobuf_compiler';
+} from 'pigweedjs/pw_protobuf_compiler';
 import {FileDescriptorSet} from 'google-protobuf/google/protobuf/descriptor_pb';
 import * as base64 from 'base64-js';
 

diff --git a/pw_protobuf_compiler/ts/ts_proto_collection_test.ts b/pw_protobuf_compiler/ts/ts_proto_collection_test.ts
@@ -14,9 +14,9 @@
 
 /* eslint-env browser */
 
-import {Message} from 'pigweed/protos/pw_protobuf_compiler/pw_protobuf_compiler_protos/nested/more_nesting/test_pb';
+import {Message} from 'pigweedjs/protos/pw_protobuf_compiler/pw_protobuf_compiler_protos/nested/more_nesting/test_pb';
 
-import {ProtoCollection} from 'pigweed/protos/collection';
+import {ProtoCollection} from 'pigweedjs/protos/collection';
 
 describe('ProtoCollection', () => {
   it('getMessageType returns message', () => {

diff --git a/pw_rpc/ts/call.ts b/pw_rpc/ts/call.ts
@@ -12,7 +12,7 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
-import {Status} from '@pigweed/pw_status';
+import {Status} from 'pigweedjs/pw_status';
 import {Message} from 'google-protobuf';
 
 import WaitQueue from "./queue";

diff --git a/pw_rpc/ts/call_test.ts b/pw_rpc/ts/call_test.ts
@@ -14,7 +14,7 @@
 
 /* eslint-env browser */
 
-import {SomeMessage} from 'pigweed/protos/pw_rpc/ts/test2_pb';
+import {SomeMessage} from 'pigweedjs/protos/pw_rpc/ts/test2_pb';
 
 import {Call} from './call';
 import {Channel, Method, Service} from './descriptors';

diff --git a/pw_rpc/ts/client.ts b/pw_rpc/ts/client.ts
@@ -14,13 +14,13 @@
 
 /** Provides a pw_rpc client for TypeScript. */
 
-import {ProtoCollection} from '@pigweed/pw_protobuf_compiler';
-import {Status} from '@pigweed/pw_status';
+import {ProtoCollection} from 'pigweedjs/pw_protobuf_compiler';
+import {Status} from 'pigweedjs/pw_status';
 import {Message} from 'google-protobuf';
 import {
   PacketType,
   RpcPacket,
-} from 'pigweed/protos/pw_rpc/internal/packet_pb';
+} from 'pigweedjs/protos/pw_rpc/internal/packet_pb';
 
 import {Channel, Service} from './descriptors';
 import {MethodStub, methodStubFactory} from './method';

diff --git a/pw_rpc/ts/client_test.ts b/pw_rpc/ts/client_test.ts
@@ -14,18 +14,18 @@
 
 /* eslint-env browser */
 
-import {Status} from '@pigweed/pw_status';
-import {MessageCreator} from '@pigweed/pw_protobuf_compiler';
+import {Status} from 'pigweedjs/pw_status';
+import {MessageCreator} from 'pigweedjs/pw_protobuf_compiler';
 import {Message} from 'google-protobuf';
 import {
   PacketType,
   RpcPacket,
-} from 'pigweed/protos/pw_rpc/internal/packet_pb';
-import {ProtoCollection} from 'pigweed/protos/collection';
+} from 'pigweedjs/protos/pw_rpc/internal/packet_pb';
+import {ProtoCollection} from 'pigweedjs/protos/collection';
 import {
   Request,
   Response,
-} from 'pigweed/protos/pw_rpc/ts/test_pb';
+} from 'pigweedjs/protos/pw_rpc/ts/test_pb';
 
 import {Client} from './client';
 import {Channel, Method} from './descriptors';

diff --git a/pw_rpc/ts/descriptors.ts b/pw_rpc/ts/descriptors.ts
@@ -12,7 +12,7 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
-import {ProtoCollection} from '@pigweed/pw_protobuf_compiler';
+import {ProtoCollection} from 'pigweedjs/pw_protobuf_compiler';
 import {
   MethodDescriptorProto,
   ServiceDescriptorProto,

diff --git a/pw_rpc/ts/descriptors_test.ts b/pw_rpc/ts/descriptors_test.ts
@@ -14,11 +14,11 @@
 
 /* eslint-env browser */
 
-import {ProtoCollection} from 'pigweed/protos/collection';
+import {ProtoCollection} from 'pigweedjs/protos/collection';
 import {
   Request,
   Response,
-} from 'pigweed/protos/pw_rpc/ts/test_pb';
+} from 'pigweedjs/protos/pw_rpc/ts/test_pb';
 
 import * as descriptors from './descriptors';
 

diff --git a/pw_rpc/ts/method.ts b/pw_rpc/ts/method.ts
@@ -12,7 +12,7 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
-import {Status} from '@pigweed/pw_status';
+import {Status} from 'pigweedjs/pw_status';
 import {Message} from 'google-protobuf';
 
 import {

diff --git a/pw_rpc/ts/packets.ts b/pw_rpc/ts/packets.ts
@@ -16,8 +16,8 @@
 
 import {Message} from 'google-protobuf';
 import {MethodDescriptorProto} from 'google-protobuf/google/protobuf/descriptor_pb';
-import * as packetPb from 'pigweed/protos/pw_rpc/internal/packet_pb';
-import {Status} from '@pigweed/pw_status';
+import * as packetPb from 'pigweedjs/protos/pw_rpc/internal/packet_pb';
+import {Status} from 'pigweedjs/pw_status';
 
 // Channel, Service, Method
 type idSet = [number, number, number];

diff --git a/pw_rpc/ts/packets_test.ts b/pw_rpc/ts/packets_test.ts
@@ -16,8 +16,8 @@
 import {
   PacketType,
   RpcPacket,
-} from 'pigweed/protos/pw_rpc/internal/packet_pb';
-import {Status} from '@pigweed/pw_status';
+} from 'pigweedjs/protos/pw_rpc/internal/packet_pb';
+import {Status} from 'pigweedjs/pw_status';
 
 import * as packets from './packets';
 

diff --git a/pw_rpc/ts/rpc_classes.ts b/pw_rpc/ts/rpc_classes.ts
@@ -13,7 +13,7 @@
 // the License.
 
 import {Message} from 'google-protobuf';
-import {Status} from '@pigweed/pw_status';
+import {Status} from 'pigweedjs/pw_status';
 
 import {Call} from './call';
 import {Channel, Method, Service} from './descriptors';

diff --git a/pw_tokenizer/ts/detokenizer.ts b/pw_tokenizer/ts/detokenizer.ts
@@ -14,7 +14,7 @@
 
 /**  Decodes and detokenizes strings from binary or Base64 input. */
 import {Buffer} from 'buffer';
-import {Frame} from '@pigweed/pw_hdlc';
+import {Frame} from 'pigweedjs/pw_hdlc';
 import {TokenDatabase} from './token_database';
 import {PrintfDecoder} from './printf_decoder';
 

diff --git a/pw_tokenizer/ts/detokenizer_test.ts b/pw_tokenizer/ts/detokenizer_test.ts
@@ -14,7 +14,7 @@
 
 /* eslint-env browser */
 
-import {Frame, Encoder, Decoder} from '@pigweed/pw_hdlc';
+import {Frame, Encoder, Decoder} from 'pigweedjs/pw_hdlc';
 import {Detokenizer} from './detokenizer';
 
 const CSV = `

diff --git a/pw_transfer/ts/client.ts b/pw_transfer/ts/client.ts
@@ -18,9 +18,9 @@ import {
   BidirectionalStreamingCall,
   BidirectionalStreamingMethodStub,
   ServiceClient,
-} from '@pigweed/pw_rpc';
-import {Status} from '@pigweed/pw_status';
-import {Chunk} from 'pigweed/protos/pw_transfer/transfer_pb';
+} from 'pigweedjs/pw_rpc';
+import {Status} from 'pigweedjs/pw_status';
+import {Chunk} from 'pigweedjs/protos/pw_transfer/transfer_pb';
 
 import {
   ReadTransfer,

diff --git a/pw_transfer/ts/transfer.ts b/pw_transfer/ts/transfer.ts
@@ -16,9 +16,9 @@ import {
   BidirectionalStreamingCall,
   BidirectionalStreamingMethodStub,
   ServiceClient,
-} from '@pigweed/pw_rpc';
-import {Status} from '@pigweed/pw_status';
-import {Chunk} from 'pigweed/protos/pw_transfer/transfer_pb';
+} from 'pigweedjs/pw_rpc';
+import {Status} from 'pigweedjs/pw_status';
+import {Chunk} from 'pigweedjs/protos/pw_transfer/transfer_pb';
 
 export class ProgressStats {
   constructor(

diff --git a/pw_transfer/ts/transfer_test.ts b/pw_transfer/ts/transfer_test.ts
@@ -20,14 +20,14 @@ import {
   decode,
   MethodStub,
   ServiceClient,
-} from '@pigweed/pw_rpc';
-import {Status} from '@pigweed/pw_status';
+} from 'pigweedjs/pw_rpc';
+import {Status} from 'pigweedjs/pw_status';
 import {
   PacketType,
   RpcPacket,
-} from 'pigweed/protos/pw_rpc/internal/packet_pb';
-import {ProtoCollection} from 'pigweed/protos/collection';
-import {Chunk} from 'pigweed/protos/pw_transfer/transfer_pb';
+} from 'pigweedjs/protos/pw_rpc/internal/packet_pb';
+import {ProtoCollection} from 'pigweedjs/protos/collection';
+import {Chunk} from 'pigweedjs/protos/pw_transfer/transfer_pb';
 
 import {Manager} from './client';
 import {ProgressStats} from './transfer';

diff --git a/pw_web_ui/src/frontend/app.tsx b/pw_web_ui/src/frontend/app.tsx
@@ -23,13 +23,13 @@ import {
 } from '@material-ui/core';
 import {ToggleButtonGroup, ToggleButton} from '@material-ui/lab';
 import {WebSerialTransport} from '../transport/web_serial_transport';
-import {Decoder, Frame, Encoder} from '@pigweed/pw_hdlc';
+import {Decoder, Frame, Encoder} from 'pigweedjs/pw_hdlc';
 import {SerialLog} from './serial_log';
 import {Log} from './log';
 import * as React from 'react';
 import {useState, useRef} from 'react';
-import {Channel, Client, UnaryMethodStub} from '@pigweed/pw_rpc';
-import {Status} from '@pigweed/pw_status';
+import {Channel, Client, UnaryMethodStub} from 'pigweedjs/pw_rpc';
+import {Status} from 'pigweedjs/pw_status';
 import {ProtoCollection} from 'web_proto_collection/generated/ts_proto_collection';
 
 const RPC_ADDRESS = 82;

diff --git a/pw_web_ui/src/frontend/log.tsx b/pw_web_ui/src/frontend/log.tsx
@@ -18,8 +18,8 @@ import {makeStyles, Paper, Box} from '@material-ui/core';
 import * as React from 'react';
 import {default as AnsiUp} from 'ansi_up';
 import * as Parser from 'html-react-parser';
-import {Frame} from '@pigweed/pw_hdlc';
-import {Detokenizer} from '@pigweed/pw_tokenizer';
+import {Frame} from 'pigweedjs/pw_hdlc';
+import {Detokenizer} from 'pigweedjs/pw_tokenizer';
 
 type Props = {
   lines: string[];

diff --git a/pw_web_ui/src/frontend/rpc.tsx b/pw_web_ui/src/frontend/rpc.tsx
@@ -15,9 +15,9 @@
 /* eslint-env browser */
 import {makeStyles, Box} from '@material-ui/core';
 import * as React from 'react';
-import {Status} from '@pigweed/pw_status';
+import {Status} from 'pigweedjs/pw_status';
 import {Message} from 'google-protobuf';
-import {Call} from '@pigweed/pw_rpc';
+import {Call} from 'pigweedjs/pw_rpc';
 
 type Props = {
   calls: Call[];

diff --git a/pw_web_ui/src/frontend/serial_log.tsx b/pw_web_ui/src/frontend/serial_log.tsx
@@ -15,7 +15,7 @@
 /* eslint-env browser */
 import {makeStyles, Paper, Box} from '@material-ui/core';
 import * as React from 'react';
-import {FrameStatus, Frame} from '@pigweed/pw_hdlc';
+import {FrameStatus, Frame} from 'pigweedjs/pw_hdlc';
 
 type Props = {
   frames: Frame[];

diff --git a/ts/index_test.ts b/ts/index_test.ts
@@ -26,6 +26,7 @@ import {
 } from "../dist/index.umd";
 
 import {ProtoCollection} from "../dist/protos/collection.umd";
+import * as fs from "fs";
 
 describe('Pigweed Bundle', () => {
 
@@ -66,4 +67,10 @@ describe('Pigweed Bundle', () => {
     expect(WebSerial.WebSerialTransport).toBeDefined();
   });
 
+  it('is not referring to any outside Pigweed modules', () => {
+    const requireString = "require('pigweedjs";
+    const file = fs.readFileSync(require.resolve("../dist/index.umd"));
+    expect(file.indexOf(requireString)).toBe(-1)
+  });
+
 });
diff --git a/ts/transport/serial_mock.ts b/ts/transport/serial_mock.ts
@@ -14,7 +14,7 @@
 
 /* eslint-env browser */
 import {Subject} from 'rxjs';
-import type {SerialConnectionEvent, SerialPort, Serial, SerialPortRequestOptions, SerialOptions} from "pigweed/types/serial"
+import type {SerialConnectionEvent, SerialPort, Serial, SerialPortRequestOptions, SerialOptions} from "pigweedjs/types/serial"
 /**
  * AsyncQueue is a queue that allows values to be dequeued
  * before they are enqueued, returning a promise that resolves

diff --git a/ts/transport/web_serial_transport.ts b/ts/transport/web_serial_transport.ts
@@ -15,7 +15,7 @@
 /* eslint-env browser */
 import {BehaviorSubject, Observable, Subject, Subscription} from 'rxjs';
 import DeviceTransport from './device_transport';
-import type {SerialPort, Serial, SerialOptions, Navigator, SerialPortFilter} from "pigweed/types/serial"
+import type {SerialPort, Serial, SerialOptions, Navigator, SerialPortFilter} from "pigweedjs/types/serial"
 
 const DEFAULT_SERIAL_OPTIONS: SerialOptions & {baudRate: number} = {
   // Some versions of chrome use `baudrate` (linux)

diff --git a/ts/transport/web_serial_transport_test.ts b/ts/transport/web_serial_transport_test.ts
@@ -17,7 +17,7 @@ import {last, take} from 'rxjs/operators';
 
 import {SerialMock} from './serial_mock';
 import {WebSerialTransport, DeviceLockedError} from './web_serial_transport';
-import type {Serial} from "pigweed/types/serial"
+import type {Serial} from "pigweedjs/types/serial"
 
 describe('WebSerialTransport', () => {
   let serialMock: SerialMock;

diff --git a/tsconfig.json b/tsconfig.json
@@ -14,13 +14,13 @@
     "declaration": true,
     "allowJs": true,
     "paths": {
-      "@pigweed/pw_*": [
+      "pigweedjs/pw_*": [
         "./pw_*/ts"
       ],
-      "pigweed/protos/*": [
+      "pigweedjs/protos/*": [
         "./dist/protos/*"
       ],
-      "pigweed/types/*": [
+      "pigweedjs/types/*": [
         "./ts/types/*"
       ]
     }