Browse Source

Minor Pioneer workspaces, build and lint adjustments

Leszek Wiesner 4 years ago
parent
commit
401c71bb16
5 changed files with 41 additions and 547 deletions
  1. 3 1
      package.json
  2. 14 1
      pioneer/.eslintignore
  3. 4 20
      pioneer/package.json
  4. 1 0
      pioneer/packages/apps/public/locales/en/joy-utils-old.json
  5. 19 525
      yarn.lock

+ 3 - 1
package.json

@@ -20,7 +20,9 @@
     "devops/eslint-config",
     "devops/prettier-config",
     "pioneer",
-    "pioneer/packages/*"
+    "pioneer/packages/apps*",
+    "pioneer/packages/page*",
+    "pioneer/packages/react*"
   ],
   "resolutions": {
     "@polkadot/api": "^1.26.1",

+ 14 - 1
pioneer/.eslintignore

@@ -2,6 +2,19 @@
 **/coverage/*
 **/node_modules/*
 packages/old-apps/*
-packages/joy-*/*
+packages/apps*/*
+packages/page*/*
+packages/react*/*
+packages/joy-members/*
+packages/joy-election/*
+packages/joy-forum/*
+packages/joy-help/*
+packages/joy-media/*
+packages/joy-pages/*
+packages/joy-proposals/*
+packages/joy-roles/*
+packages/joy-settings/*
+packages/joy-utils/*
+packages/joy-utils-old/*
 .eslintrc.js
 i18next-scanner.config.js

+ 4 - 20
pioneer/package.json

@@ -10,7 +10,7 @@
   "name": "pioneer",
   "scripts": {
     "analyze": "yarn clean && BUILD_ANALYZE=1 yarn run build:code && yarn source-map-explorer packages/apps/build/main.*.js",
-    "build": "yarn run build:code && yarn run build:i18n && mkdir -p build",
+    "build": "yarn run build:i18n && yarn run build:code",
     "build:code": "NODE_ENV=production node ./scripts/dev-build-ts.js",
     "build:i18n": "i18next-scanner --config i18next-scanner.config.js && node ./scripts/i18nSort.js",
     "build:www": "rm -rf packages/apps/build && mkdir -p packages/apps/build && yarn run build:i18n && cd packages/apps && NODE_ENV=production webpack --config webpack.config.js",
@@ -76,7 +76,9 @@
     "@storybook/react": "^5.2.5",
     "json-schema-to-typescript": "^7.1.0",
     "storybook-react-router": "^1.0.8",
-    "typescript": "^3.9.7"
+    "typescript": "^3.9.7",
+    "eslint-plugin-header": "^3.0.0",
+    "eslint-plugin-sort-destructure-keys": "^1.3.5"
   },
   "dependencies": {
     "@types/lodash": "^4.14.138",
@@ -90,23 +92,5 @@
     "sass-loader": "^8.0.0",
     "style-loader": "^1.0.0",
     "@joystream/types": "link:../types"
-  },
-  "//": "TODO: Move those below to root package.json",
-  "workspaces": [
-    "packages/apps",
-    "packages/apps-*",
-    "packages/page-*",
-    "packages/react-*"
-  ],
-  "resolutions": {
-    "@polkadot/api": "^1.26.1",
-    "@polkadot/api-contract": "^1.26.1",
-    "@polkadot/keyring": "^3.0.1",
-    "@polkadot/types": "^1.26.1",
-    "@polkadot/util": "^3.0.1",
-    "@polkadot/util-crypto": "^3.0.1",
-    "@polkadot/wasm-crypto": "^1.2.1",
-    "babel-core": "^7.0.0-bridge.0",
-    "typescript": "^3.9.7"
   }
 }

+ 1 - 0
pioneer/packages/apps/public/locales/en/joy-utils-old.json

@@ -0,0 +1 @@
+{}

File diff suppressed because it is too large
+ 19 - 525
yarn.lock


Some files were not shown because too many files changed in this diff