fix(rush): add appropriate path-mapping, add sourcemaps for dev (#1869)

neo-one-suite · Nov 20, 2019 · 3ffae0c · 3ffae0c
1 parent 980af2a
commit 3ffae0c
Show file tree

Hide file tree

Showing 24 changed files with 202 additions and 173 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,27 +1,27 @@
 aliases:
-  - &restore-pnpm-store-10
+  - &restore-yarn-cache-10
     keys:
-      - v7-pnpm-10-{{ .Branch }}-{{ checksum "common/config/rush/pnpm-lock.yaml" }}
+      - v7-yarn-10-{{ .Branch }}-{{ checksum "common/config/rush/yarn.lock" }}
       # Fallback in case checksum fails
-      - v7-pnpm-10-{{ .Branch }}-
+      - v7-yarn-10-{{ .Branch }}-
 
-  - &save-pnpm-store-10
+  - &save-yarn-cache-10
     paths:
       - common/temp/node_modules
-      - common/temp/pnpm-store
-    key: v7-pnpm-10-{{ .Branch }}-{{ checksum "common/config/rush/pnpm-lock.yaml" }}
+      - common/temp/yarn-cache
+    key: v7-yarn-10-{{ .Branch }}-{{ checksum "common/config/rush/yarn.lock" }}
 
-  - &restore-pnpm-store-12
+  - &restore-yarn-cache-12
     keys:
-      - v7-pnpm-12-{{ .Branch }}-{{ checksum "common/config/rush/pnpm-lock.yaml" }}
+      - v7-yarn-12-{{ .Branch }}-{{ checksum "common/config/rush/yarn.lock" }}
       # Fallback in case checksum fails
-      - v7-pnpm-12-{{ .Branch }}-
+      - v7-yarn-12-{{ .Branch }}-
 
-  - &save-pnpm-store-12
+  - &save-yarn-cache-12
     paths:
       - common/temp/node_modules
-      - common/temp/pnpm-store
-    key: v7-pnpm-12-{{ .Branch }}-{{ checksum "common/config/rush/pnpm-lock.yaml" }}
+      - common/temp/yarn-cache
+    key: v7-yarn-12-{{ .Branch }}-{{ checksum "common/config/rush/yarn.lock" }}
 
   - &filter-ignore-bors-tmp
     branches:
@@ -36,13 +36,17 @@ aliases:
     working_directory: ~/neo-one
     steps:
       - checkout
-      - restore-cache: *restore-pnpm-store-12
+      - restore-cache: *restore-yarn-cache-12
       - run: *install
-      - save-cache: *save-pnpm-store-12
+      - save-cache: *save-yarn-cache-12
       - run:
           name: Changelog
           command: node common/scripts/install-run-rush.js change -v
           when: always
+      - run:
+          name: Lint
+          command: node common/scripts/install-run-rush.js lint -p 8
+          when: always
       - run:
           name: Prettier
           command: node common/scripts/install-run-rush.js nit
@@ -52,15 +56,12 @@ aliases:
     working_directory: ~/neo-one
     steps:
       - checkout
-      - restore-cache: *restore-pnpm-store-10
+      - restore-cache: *restore-yarn-cache-10
       - run: *install
-      - save-cache: *save-pnpm-store-10
+      - save-cache: *save-yarn-cache-10
       - run:
           name: Build
           command: node common/scripts/install-run-rush.js rebuild
-      - run:
-          name: Lint
-          command: node common/scripts/install-run-rush.js lint -p 8
       - persist_to_workspace:
           root: ~/neo-one
           paths:
@@ -74,9 +75,9 @@ aliases:
       - checkout
       - attach_workspace:
           at: ./
-      - restore-cache: *restore-pnpm-store-10
+      - restore-cache: *restore-yarn-cache-10
       - run: *install
-      - save-cache: *save-pnpm-store-10
+      - save-cache: *save-yarn-cache-10
       - run:
           name: Test
           command: node common/scripts/install-run-rush.js test-ci --test-path-pattern '$(circleci tests glob packages/*/src/__tests__/**/*.test.ts)' --coverage
@@ -87,10 +88,10 @@ aliases:
       - run:
           name: E2E
           command: node common/scripts/install-run-rush.js e2e-ci --test-path-pattern '$(circleci tests glob packages/*/src/__e2e__/**/*.test.ts)'
-      # - run:
-      #     name: Upload E2E Test Coverage
-      #     command: node common/scripts/install-run-rush.js upload-coverage -F e2e
-      #     when: always
+      - run:
+          name: Upload E2E Test Coverage
+          command: node common/scripts/install-run-rush.js upload-coverage -F e2e
+          when: always
       - store_test_results:
           path: reports
     parallelism: 2
@@ -99,9 +100,9 @@ aliases:
     working_directory: ~/neo-one
     steps:
       - checkout
-      - restore-cache: *restore-pnpm-store-12
+      - restore-cache: *restore-yarn-cache-12
       - run: *install
-      - save-cache: *save-pnpm-store-12
+      - save-cache: *save-yarn-cache-12
       - run:
           name: Build
           command: node common/scripts/install-run-rush.js rebuild
@@ -121,9 +122,9 @@ aliases:
       - checkout
       - attach_workspace:
           at: ./
-      - restore-cache: *restore-pnpm-store-12
+      - restore-cache: *restore-yarn-cache-12
       - run: *install
-      - save-cache: *save-pnpm-store-12
+      - save-cache: *save-yarn-cache-12
       - run:
           name: Test
           command: node common/scripts/install-run-rush.js test-ci --test-path-pattern '$(circleci tests glob packages/*/src/__tests__/**/*.test.ts)' --coverage
@@ -134,10 +135,10 @@ aliases:
       - run:
           name: E2E
           command: node common/scripts/install-run-rush.js e2e-ci --test-path-pattern '$(circleci tests glob packages/*/src/__e2e__/**/*.test.ts)'
-      # - run:
-      #     name: Upload E2E Test Coverage
-      #     command: node common/scripts/install-run-rush.js upload-coverage -F e2e
-      #     when: always
+      - run:
+          name: Upload E2E Test Coverage
+          command: node common/scripts/install-run-rush.js upload-coverage -F e2e
+          when: always
       - store_test_results:
           path: reports
     parallelism: 2

diff --git a/.github/workflows/website.yaml b/.github/workflows/website.yaml
@@ -18,19 +18,19 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@94d077c24971944d312dd9197c1bdfba62b39878
       - name: Install Node
-        run: brew update-reset && brew update && export PATH="/usr/local/bin:$PATH" && brew unlink node@6 && brew install node
+        run: brew update-reset && brew update && export PATH="/usr/local/bin:$PATH" && brew unlink node@12 && brew install node
       - name: Install Chrome
         run: brew cask install google-chrome
       - name: Rush Install
-        run: node/common/scripts/install-run-rush.js install
+        run: node common/scripts/install-run-rush.js install
       - name: Rush Rebuild
-        run: node/common/scripts/install-run-rush.js rebuild
+        run: node common/scripts/install-run-rush.js rebuild
       - name: Rush Link Root
-        run: node/common/scripts/install-run-rush.js link-root
+        run: node common/scripts/install-run-rush.js link-root
       - name: Run Cypress Express Test
-        run: node/common/scripts/install-run-rush.js test-cypress --express
+        run: node common/scripts/install-run-rush.js test-cypress --express
       - name: Rush Unlink Root
-        run: node/common/scripts/install-run-rush.js unlink-root
+        run: node common/scripts/install-run-rush.js unlink-root
       - name: Store Cypress Screenshots
         if: failure()
         continue-on-error: true

diff --git a/.huskyrc.js b/.huskyrc.js
@@ -1,7 +1,10 @@
+const path = require('path');
+
+const basePath = path.resolve(__dirname, '.git');
+
 module.exports = {
   hooks: {
-    'pre-commit':
-      'rush check && rush lint:staged -p 16 && rush tsc -p 16 && rush change -v',
+    'pre-commit': `rush check && rush lint:staged -p 16 && rush build && GIT_DIR=${basePath} rush change -v`,
     'post-merge': 'rush install',
     'post-rewrite': 'rush install',
     'post-checkout': 'rush install',

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -15,6 +15,7 @@
   "deepscan.enable": true,
   "files.associations": {
     "[Dd]ockerfile*": "dockerfile",
-    "docker-compose*": "yaml"
+    "docker-compose*": "yaml",
+    "*.d.ts.map": "json"
   }
 }
diff --git a/common/config/rush/command-line.json b/common/config/rush/command-line.json
@@ -379,6 +379,12 @@
       "description": "enables cleaning of lib/* and rush/* directories",
       "associatedCommands": ["clean"]
     },
+    {
+      "parameterKind": "flag",
+      "longName": "--detect-open-handles",
+      "description": "pass through of jest's detectOpenHandle flag",
+      "associatedCommands": ["test", "test-ci", "e2e", "e2e-ci"]
+    },
     {
       "parameterKind": "string",
       "longName": "--test-path-pattern",

diff --git a/common/config/rush/yarn.lock b/common/config/rush/yarn.lock
@@ -1539,7 +1539,7 @@
     cross-env "^6.0.0"
     cypress "3.4.1"
     cypress-plugin-retries "^1.2.2"
-    husky "^3.0.9"
+    husky "^3.1.0"
     json "^9.0.6"
     lint-staged "^9.4.1"
     rxjs-tslint-rules "^4.24.3"
@@ -9573,7 +9573,7 @@ human-signals@^1.1.1:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-husky@^3.0.9:
+husky@^3.0.9, husky@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/husky/-/husky-3.1.0.tgz#5faad520ab860582ed94f0c1a77f0f04c90b57c0"
   integrity sha512-FJkPoHHB+6s4a+jwPqBudBDvYZsoQW5/HBuMSehC8qDiCe50kpcxeqFoDSlow+9I6wg47YxBoT3WxaURlrDIIQ==

diff --git a/deploy/Dockerfile b/deploy/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/neoone/node:1.5
+FROM neoonesuite/node:latest
 RUN mkdir -p etc/static-html
 COPY static/ etc/static-html/
 CMD ["--environment.rpc.splashScreen.path=/etc/static-html/", "--environment.rpc.http.host=0.0.0.0"]
diff --git a/packages/neo-one-build-common/package.json b/packages/neo-one-build-common/package.json
@@ -12,7 +12,7 @@
     "cypress": "3.4.1",
     "cypress-plugin-retries": "^1.2.2",
     "json": "^9.0.6",
-    "husky": "^3.0.9",
+    "husky": "^3.1.0",
     "lint-staged": "^9.4.1",
     "rxjs-tslint-rules": "^4.24.3",
     "serve": "^11.2.0",

diff --git a/packages/neo-one-build-tests/tsconfig.jest.json b/packages/neo-one-build-tests/tsconfig.jest.json
@@ -24,8 +24,7 @@
     "noFallthroughCasesInSwitch": true,
     "forceConsistentCasingInFileNames": true,
     "paths": {
-      "bn.js": ["node_modules/@neo-one/build-tools/types/bn.js.d.ts"],
-      "@neo-one/*": ["../neo-one-*/src"]
+      "bn.js": ["node_modules/@neo-one/build-tools/types/bn.js.d.ts"]
     }
   },
   "exclude": [

diff --git a/packages/neo-one-build-tools-web/src/webpack/plugin/node.tsx b/packages/neo-one-build-tools-web/src/webpack/plugin/node.tsx
@@ -152,9 +152,8 @@ export const node = () => ({
     <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5" />,
     <meta name="theme-color" content="#ffffff" />,
     <meta name="application-name" content="NEO•ONE" />,
-    // @ts-ignore
-    <meta charset="utf-8" />,
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />,
+    <meta charSet="utf-8" />,
+    <meta httpEquiv="X-UA-Compatible" content="IE=edge" />,
     <meta name="viewport" content="width=device-width, initial-scale=1" />,
   ],
 });
diff --git a/packages/neo-one-build-tools/bin/neo-one-lint.js b/packages/neo-one-build-tools/bin/neo-one-lint.js
@@ -5,6 +5,6 @@ require('ts-node').register({
   transpileOnly: true,
   project: path.resolve(__dirname, '..', 'tsconfig.json'),
 });
-const linter = require('../src/linters/lint.ts');
+const linter = require('../src/lint.ts');
 
 linter.lint();
diff --git a/packages/neo-one-build-tools/includes/tsconfig.dev.json b/packages/neo-one-build-tools/includes/tsconfig.dev.json
@@ -2,8 +2,8 @@
   "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "paths": {
-      "bn.js": ["node_modules/@neo-one/build-tools/types/bn.js.d.ts"]
-      // "@neo-one/*": ["../neo-one-*/src"]
+      "bn.js": ["node_modules/@neo-one/build-tools/types/bn.js.d.ts"],
+      "@neo-one/*": ["../neo-one-*/src"]
     }
   },
   "exclude": ["./node_modules", "./lib", "./src/__data__/contracts/**/*.ts", "./template/**/*.ts?(x)"]

diff --git a/packages/neo-one-build-tools/src/build.ts b/packages/neo-one-build-tools/src/build.ts
@@ -88,7 +88,7 @@ export const compileBinTask = new BuildTask(buildBin);
 
 export const copyDataTask = new BuildTask<undefined>(copyData);
 
-export const packTask = new BuildTask<undefined>(pack, ['lib/**']);
+export const packTask = new BuildTask<undefined>(pack, ['lib/**', '!lib/**/*.map']);
 
 export const packBinTask = new BuildTask<undefined>(packBin);
 

diff --git a/packages/neo-one-build-tools/src/builds/buildBin.ts b/packages/neo-one-build-tools/src/builds/buildBin.ts
@@ -5,23 +5,25 @@ import gulp from 'gulp';
 import gulpBanner from 'gulp-banner';
 import gulpPlumber from 'gulp-plumber';
 import gulpRename from 'gulp-rename';
-// import gulpSourcemaps from 'gulp-sourcemaps';
+import gulpSourcemaps from 'gulp-sourcemaps';
 import ts from 'gulp-typescript';
 import path from 'path';
 import typescript from 'typescript';
 import { Format } from '../formats';
 import { flattenBin, gulpReplaceBin, gulpReplaceModule, replaceCmd } from '../utils';
 
 const gulpBin = (format: Format, binPath: string) =>
-  gulpReplaceModule(format, gulp.src(binPath)).pipe(
-    gulpRename((parsedPath) => {
-      if (parsedPath.dirname === undefined) {
-        throw new Error('error creating bin');
-      }
-      // tslint:disable-next-line: no-object-mutation
-      parsedPath.dirname = `${parsedPath.dirname.slice(0, -'/src/bin'.length)}/bin`;
-    }),
-  );
+  gulpReplaceModule(format, gulp.src(binPath))
+    .pipe(gulpSourcemaps.init())
+    .pipe(
+      gulpRename((parsedPath) => {
+        if (parsedPath.dirname === undefined) {
+          throw new Error('error creating bin');
+        }
+        // tslint:disable-next-line: no-object-mutation
+        parsedPath.dirname = `${parsedPath.dirname.slice(0, -'/src/bin'.length)}/bin`;
+      }),
+    );
 
 const binBanner = `#!/usr/bin/env node
 require('source-map-support').install({ handleUncaughtExceptions: false, environment: 'node' });
@@ -33,19 +35,15 @@ const compileBin = (format: Format, binGlob: string) => {
     declaration: false,
   });
 
-  return (
-    gulpBin(format, binGlob)
-      // .pipe(gulpSourcemaps.init())
-      .pipe(gulpPlumber())
-      .pipe(binProject())
-      .pipe(gulpBanner(binBanner))
-      // .pipe(gulpSourcemaps.mapSources(mapSources))
-      // .pipe(gulpSourcemaps.write())
-      .pipe(replaceCmd)
-      .pipe(flattenBin)
-      .pipe(gulpReplaceBin())
-      .pipe(gulp.dest('lib'))
-  );
+  return gulpBin(format, binGlob)
+    .pipe(gulpPlumber())
+    .pipe(binProject())
+    .pipe(gulpBanner(binBanner))
+    .pipe(replaceCmd)
+    .pipe(flattenBin)
+    .pipe(gulpReplaceBin())
+    .pipe(gulpSourcemaps.write('.', { includeContent: false, sourceRoot: '../src' }))
+    .pipe(gulp.dest('lib'));
 };
 
 export const buildBin = (format: Format) => () => {

diff --git a/packages/neo-one-build-tools/src/builds/buildTypescript.ts b/packages/neo-one-build-tools/src/builds/buildTypescript.ts
@@ -1,9 +1,8 @@
 // tslint:disable: no-any match-default-export-name
 import gulp from 'gulp';
 import gulpPlumber from 'gulp-plumber';
-// import gulpSourcemaps from 'gulp-sourcemaps';
+import gulpSourcemaps from 'gulp-sourcemaps';
 import ts from 'gulp-typescript';
-// import path from 'path';
 import typescript from 'typescript';
 import { Format } from '../formats';
 import {
@@ -15,7 +14,6 @@ import {
   replaceInternalSources,
   replaceRXJSImport,
   replaceStatic,
-  // transformPackage,
 } from '../utils';
 
 export interface CompileTypescriptOptions {
@@ -40,13 +38,15 @@ export const buildTypescript = (format: Format, pkgName?: string) => (
     gulp
       .src(glob)
       .pipe(gulpPlumber())
+      .pipe(gulpSourcemaps.init())
       .pipe(project())
       .pipe(replaceRXJSImport(format))
       .pipe(replaceInternalSources)
       .pipe(replaceBNTypeImport)
       .pipe(replaceBNImport)
       .pipe(replaceStatic)
       .pipe(flattenSource)
+      .pipe(gulpSourcemaps.write('.', { includeContent: false, sourceRoot: '../src' }))
       .pipe(filterJS(isToolsPackage)),
   ).pipe(gulp.dest('lib'));
 };