refactor: backport latest projector changes

nhscc · Aug 30, 2021 · 14a4c43 · 14a4c43
1 parent 7f60680
commit 14a4c43
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 15 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -1,2 +1,2 @@
 coverage:
-  range: '70...100'
+  range: '75...100'
diff --git a/docs/modules/test_setup.md b/docs/modules/test_setup.md
@@ -442,7 +442,7 @@
 `options?`): (`fn`:
 [`FixtureAction`][13]<[`FixtureContext`][4]<[`FixtureOptions`][5] &
 `Partial`<`Record`<`string`, `unknown`> & `CustomOptions`>> & `CustomContext`>)
-=> `Promise`<`void`>
+\=> `Promise`<`void`>
 
 #### Type parameters
 

diff --git a/docs/modules/types_global.md b/docs/modules/types_global.md
@@ -455,7 +455,7 @@ The shape of a publicly available meme.
 ### PublicUser
 
 Ƭ **PublicUser**: `Pick`<[`InternalUser`][21], `"name"` | `"email"` | `"phone"`
-| `"username"` | `"deleted"` | `"imageUrl"`> & { `friends`: `number` ; `liked`:
+\| `"username"` | `"deleted"` | `"imageUrl"`> & { `friends`: `number` ; `liked`:
 `number` ; `user_id`: `string` }
 
 The shape of a publicly available user.

diff --git a/webpack.config.js b/webpack.config.js
@@ -8,6 +8,15 @@ const { verifyEnvironment } = require('./expect-env');
 const nodeExternals = require('webpack-node-externals');
 const debug = require('debug')(`${require('./package.json').name}:webpack-config`);
 
+const IMPORT_ALIASES = {
+  universe: `${__dirname}/src/`,
+  multiverse: `${__dirname}/lib/`,
+  testverse: `${__dirname}/test/`,
+  externals: `${__dirname}/external-scripts/`,
+  types: `${__dirname}/types/`,
+  package: `${__dirname}/package.json`
+};
+
 let sanitizedEnv = {};
 let { NODE_ENV: nodeEnv, ...sanitizedProcessEnv } = {
   ...process.env,
@@ -74,7 +83,12 @@ const externals = [
     errorDetails: true
   },
 
-  resolve: { extensions: ['.ts', '.wasm', '.mjs', '.cjs', '.js', '.json'] },
+  resolve: {
+    extensions: ['.ts', '.wasm', '.mjs', '.cjs', '.js', '.json'],
+    // ! If changed, also update these aliases in tsconfig.json,
+    // ! jest.config.js, next.config.ts, and .eslintrc.js
+    alias: IMPORT_ALIASES
+  },
   module: {
     rules: [{ test: /\.(ts|js)x?$/, loader: 'babel-loader', exclude: /node_modules/ }]
   },
@@ -120,14 +134,7 @@ const externalsConfig = {
     extensions: ['.ts', '.wasm', '.mjs', '.cjs', '.js', '.json'],
     // ! If changed, also update these aliases in tsconfig.json,
     // ! jest.config.js, next.config.ts, and .eslintrc.js
-    alias: {
-      universe: `${__dirname}/src/`,
-      multiverse: `${__dirname}/lib/`,
-      testverse: `${__dirname}/test/`,
-      externals: `${__dirname}/external-scripts/`,
-      types: `${__dirname}/types/`,
-      package: `${__dirname}/package.json`
-    }
+    alias: IMPORT_ALIASES
   },
   module: {
     rules: [
@@ -146,7 +153,7 @@ const externalsConfig = {
   ]
 };
 
-/*const cliConfig = {
+/* const cliConfig = {
   name: 'cli',
   mode: 'production',
   target: 'node',
@@ -169,7 +176,12 @@ const externalsConfig = {
     errorDetails: true
   },
 
-  resolve: { extensions: ['.ts', '.wasm', '.mjs', '.cjs', '.js', '.json'] },
+  resolve: {
+    extensions: ['.ts', '.wasm', '.mjs', '.cjs', '.js', '.json'],
+    // ! If changed, also update these aliases in tsconfig.json,
+    // ! jest.config.js, next.config.ts, and .eslintrc.js
+    alias: IMPORT_ALIASES
+  },
   module: {
     rules: [{ test: /\.(ts|js)x?$/, loader: 'babel-loader', exclude: /node_modules/ }]
   },
@@ -179,7 +191,7 @@ const externalsConfig = {
     // * ▼ For bundled CLI applications, make entry file executable w/ shebang
     new BannerPlugin({ banner: '#!/usr/bin/env node', raw: true, entryOnly: true })
   ]
-};*/
+}; */
 
 module.exports = [/*libConfig,*/ externalsConfig /*, cliConfig*/];
 debug('exports: %O', module.exports);