Restructure to monorepo (lensapp#6907)

* wip: restructure to monorepo

Signed-off-by: Jari Kolehmainen <[email protected]>

* refactor create-release-pr to a package

Signed-off-by: Jari Kolehmainen <[email protected]>

* build fixes

Signed-off-by: Jari Kolehmainen <[email protected]>

* github workflow fixes

Signed-off-by: Jari Kolehmainen <[email protected]>

* fix typo

Signed-off-by: Jari Kolehmainen <[email protected]>

* add webpack-env types to core

Signed-off-by: Jari Kolehmainen <[email protected]>

* fix github workflows

Signed-off-by: Jari Kolehmainen <[email protected]>

* refactor/fix integration tests

Signed-off-by: Jari Kolehmainen <[email protected]>

* lint fix

Signed-off-by: Jari Kolehmainen <[email protected]>

* yarn run dev

Signed-off-by: Jari Kolehmainen <[email protected]>

* eslint settings for vscode

Signed-off-by: Jari Kolehmainen <[email protected]>

* move templates to right package

Signed-off-by: Jari Kolehmainen <[email protected]>

* open-lens build fixes

Signed-off-by: Jari Kolehmainen <[email protected]>

* integration test fix

Signed-off-by: Jari Kolehmainen <[email protected]>

* fix nx task dependencies

Signed-off-by: Jari Kolehmainen <[email protected]>

* use bash shell for unit tests in test workflow

Signed-off-by: Jari Kolehmainen <[email protected]>

* fix test:unit for windows

Signed-off-by: Jari Kolehmainen <[email protected]>

* fix win-ca webpack error in open-lens

Signed-off-by: Jari Kolehmainen <[email protected]>

* fix win-ca webpack error in open-lens

Signed-off-by: Jari Kolehmainen <[email protected]>

* fix build:app on windows

Signed-off-by: Jari Kolehmainen <[email protected]>

* remove ELECTRON_BUILDER_EXTRA_ARGS

Signed-off-by: Jari Kolehmainen <[email protected]>

* sync src/ from master

Signed-off-by: Jari Kolehmainen <[email protected]>

* remove Makefile from core

Signed-off-by: Jari Kolehmainen <[email protected]>

Signed-off-by: Jari Kolehmainen <[email protected]>

Author: jakolehm

.github/workflows/bump-master-version.yaml

@@ -19,27 +19,25 @@ jobs:
           fetch-depth: 0
       - name: Install dependencies
         run: |
-          npm i --location=global semver
+          yarn install --frozen-lockfile
       - name: Bump version to first alpha of next minor version
         id: bump
         run: |
-          CURRENT_VERSION=$(cat package.json | jq .version --raw-output)
+          CURRENT_VERSION=$(cat lerna.json | jq .version --raw-output)
 
           if ! [[ "${CURRENT_VERSION}" =~ ^\d+\.\d+\.0$ ]]; then
             echo "Not a minor release"
             echo "status=skip" >> $GITHUB_OUTPUT
             exit 0
           fi
 
-          NEW_VERSION=$(cat package.json | jq .version --raw-output | xargs semver -i preminor --preid alpha)
-          cat package.json | jq --arg new_version "$NEW_VERSION" '.version = $new_version' > new-package.json
-          mv new-package.json package.json
+          yarn bump-version preminor
 
           echo "status=create" >> $GITHUB_OUTPUT
       - uses: peter-evans/create-pull-request@v4
         if: ${{ steps.bump.outputs.status == 'create' }}
         with:
-          add-paths: package.json
+          add-paths: lerna.json,packages/*/package.json
           commit-message: Update package.json version to next preminor because of recent release
           signoff: true
           delete-branch: true

.github/workflows/check-docs.yml

@@ -24,8 +24,8 @@ jobs:
       - name: Generate Extensions API Reference using typedocs
         run: |
           yarn install
-          yarn typedocs-extensions-api
+          yarn run build:docs
 
       - name: Verify that the markdown is valid
         run: |
-          yarn run verify-docs
+          yarn run mkdocs:verify

.github/workflows/electronegativity.yml

@@ -18,7 +18,7 @@ jobs:
 
       - uses: doyensec/[email protected]
         with:
-          input: src/
+          input: packages/core/src/
           electron-version: "19.0.4"
           severity: medium
 

.github/workflows/license-header.yml

@@ -25,4 +25,4 @@ jobs:
           set -e
           export PATH=${PATH}:`go env GOPATH`/bin
 
-          addlicense -check -l mit -c "OpenLens Authors" src/**/*.?css
+          addlicense -check -l mit -c "OpenLens Authors" packages/*/src/**/*.?css

.github/workflows/main.yml

@@ -35,11 +35,11 @@ jobs:
       - name: Generate Extensions API Reference using typedocs
         run: |
           yarn install
-          yarn typedocs-extensions-api
+          yarn run build:docs
 
       - name: Verify that the markdown is valid
         run: |
-          yarn run verify-docs
+          yarn run mkdocs:verify
 
   build:
     name: Deploy docs
@@ -77,8 +77,8 @@ jobs:
 
       - name: Generate Extensions API Reference using typedocs
         run: |
-          yarn install
-          yarn typedocs-extensions-api
+          yarn install --frozen-lockfile
+          yarn build:docs
 
       - name: mkdocs deploy master
         if: contains(github.ref, 'refs/heads/master')

.github/workflows/publish-master-npm.yml

@@ -25,13 +25,11 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: Generate NPM package
+      - name: Generate NPM packages
         run: |
-          make build-extensions-npm
+          yarn install --frozen-lockfile
+          yarn run build
 
-      - name: publish new release
+      - name: Publish NPM package
         run: |
-          make publish-extensions-npm
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          NPM_RELEASE_TAG: master
+          yarn lerna publish from-package --dist-tag master --no-push --no-git-tag-version --yes

.github/workflows/publish-release-npm.yml

@@ -12,8 +12,8 @@ on:
         type: string
         description: The version to release manually
 jobs:
-  publish-extensions:
-    name: Publish Extensions NPM Package Release
+  publish-npm-packages:
+    name: Publish NPM Packages
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -30,39 +30,13 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: Generate NPM package
+      - name: Generate NPM packages
         run: |
-          make build-extensions-npm
+          yarn install --frozen-lockfile
+          yarn run build
 
-      - name: Publish NPM package
+      - name: Publish NPM packages
         run: |
-          make publish-extensions-npm
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-  publish-library:
-    name: Publish Library NPM Package Release
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [16.x]
-    steps:
-      - name: Checkout Release
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          ref: ${{ inputs.version }}
-
-      - name: Using Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Generate NPM package
-        run: |
-          make build-library-npm
-
-      - name: Publish NPM package
-        run: |
-          make publish-library-npm
+          yarn lerna publish from-package --no-push --no-git-tag-version --yes
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/test.yml

@@ -51,10 +51,11 @@ jobs:
           timeout_minutes: 10
           max_attempts: 3
           retry_on: error
-          command: make node_modules
+          command: yarn install --frozen-lockfile
 
       - run: make test
         name: Run tests
+        shell: bash
         if: ${{ matrix.type == 'unit' }}
 
       - run: make ci-validate-dev
@@ -68,20 +69,16 @@ jobs:
           minikube-version: latest
         if: ${{ runner.os == 'Linux' && matrix.type == 'smoke' }}
 
-      - run: xvfb-run --auto-servernum --server-args='-screen 0, 1600x900x24' make integration
+      - run: xvfb-run --auto-servernum --server-args='-screen 0, 1600x900x24' yarn run test:integration
         name: Run Linux integration tests
         if: ${{ runner.os == 'Linux' && matrix.type == 'smoke' }}
 
-      - run: make integration
+      - run: yarn run test:integration
         name: Run macOS integration tests
         shell: bash
-        env:
-          ELECTRON_BUILDER_EXTRA_ARGS: "--x64 --arm64"
         if: ${{ runner.os == 'macOS' && matrix.type == 'smoke' }}
 
-      - run: make integration
+      - run: yarn run test:integration
         name: Run Windows integration tests
         shell: bash
-        env:
-          ELECTRON_BUILDER_EXTRA_ARGS: "--x64 --ia32"
         if: ${{ runner.os == 'Windows' && matrix.type == 'smoke' }}

.gitignore

@@ -1,15 +1,8 @@
-dist/
 node_modules/
 .DS_Store
 yarn-error.log
-coverage/
 tmp/
-locales/**/**.js
 lens.log
-static/build
-static/types
-binaries/client/
-binaries/server/
 docs/extensions/api
 site/
-build/webpack/
+lerna-debug.log

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "eslint.workingDirectories": [{ "mode": "auto" }]
+}

.yarnrc

@@ -1,3 +1,2 @@
-disturl "https://electronjs.org/headers"
-target "19.0.4"
-runtime "electron"
+--install.check-files true
+--install.network-timeout 100000

Makefile

@@ -5,108 +5,27 @@ CMD_ARGS = $(filter-out $@,$(MAKECMDGOALS))
 
 ELECTRON_BUILDER_EXTRA_ARGS ?=
 
-ifeq ($(OS),Windows_NT)
-    DETECTED_OS := Windows
-else
-    DETECTED_OS := $(shell uname)
-endif
-
-node_modules: yarn.lock
-	yarn install --check-files --frozen-lockfile --network-timeout=100000
-
-binaries/client: node_modules
-	yarn download:binaries
-
-.PHONY: compile-dev
-compile-dev: node_modules
-	yarn compile:main --cache
-	yarn compile:renderer --cache
-
-.PHONY: validate-dev
-ci-validate-dev: binaries/client compile-dev
-
-.PHONY: dev
-dev: binaries/client
-	rm -rf static/build/
-	yarn run build:tray-icons
-	yarn dev
+.PHONY: bootstrap
+bootstrap:
+	yarn install
 
 .PHONY: lint
 lint: node_modules
 	yarn lint
 
-.PHONY: tag-release
-tag-release:
-	scripts/tag-release.sh $(CMD_ARGS)
-
 .PHONY: test
-test: node_modules binaries/client
-	yarn run jest $(or $(CMD_ARGS), "src")
+test: node_modules
+	yarn run test:unit
 
 .PHONY: integration
 integration: build
-	yarn integration
-
-.PHONY: build-impl
-build-impl:
-	yarn run download:binaries
-	yarn run build:tray-icons
-	yarn run compile
-ifeq "$(DETECTED_OS)" "Windows"
-# https://github.com/ukoloff/win-ca#clear-pem-folder-on-publish
-	rm -rf node_modules/win-ca/pem
-endif
-	yarn run electron-builder --publish onTag $(ELECTRON_BUILDER_EXTRA_ARGS)
+	yarn test:integration
 
 .PHONY: build
-build: node_modules binaries/client build-impl
-
-src/extensions/npm/extensions/__mocks__:
-	cp -r __mocks__ src/extensions/npm/extensions/
-
-packages/extensions/dist: packages/extensions/node_modules
-	yarn compile:extension-types
-
-packages/extensions/node_modules: packages/extensions/package.json
-	cd packages/extensions/ && ../../node_modules/.bin/npm install --no-audit --no-fund --no-save
-
-.PHONY: build-extensions-npm
-build-extensions-npm: build-extension-types
-	yarn npm:fix-extensions-package-version
-
-.PHONY: build-library-npm
-build-library-npm: node_modules
-	yarn compile-library
-
-.PHONY: build-extension-types
-build-extension-types: node_modules packages/extensions/dist
-
-.PHONY: publish-extensions-npm
-publish-extensions-npm: node_modules build-extensions-npm
-	./scripts/publish-extensions-npm.sh
-
-.PHONY: publish-library-npm
-publish-library-npm: node_modules build-library-npm
-	./scripts/publish-library-npm.sh
-
-.PHONY: build-docs
-build-docs:
-	yarn typedocs-extensions-api
-
-.PHONY: docs
-docs: build-docs
-	yarn mkdocs-serve-local
-
-.PHONY: clean-npm
-clean-npm:
-	rm -rf packages/extensions/{dist,__mocks__,node_modules}
-	rm -rf static/build/library/
+build:
+	yarn lerna run build:app
 
 .PHONY: clean
-clean: clean-npm
-	rm -rf binaries/client
-	rm -rf dist
-	rm -rf static/build
-	rm -rf node_modules
-	rm -rf site
-	rm -rf docs/extensions/api
+clean:
+	yarn run clean
+	yarn run clean:node_modules

build/set_extensions_npm_version.ts

@@ -0,0 +1,9 @@
+{
+  "$schema": "node_modules/lerna/schemas/lerna-schema.json",
+  "useWorkspaces": false,
+  "packages": [
+    "packages/*"
+  ],
+  "version": "6.4.0-alpha.2",
+  "npmClient": "yarn"
+}