Merge branch '10.0-release' into elevatebart/fix/build-mjs-in-the-cli

Barthélémy Ledoux · web-flow · commit eeef5b5db743 · 2022-04-04T11:47:29.000-05:00
diff --git a/npm/webpack-preprocessor/package.json b/npm/webpack-preprocessor/package.json
@@ -5,7 +5,7 @@
   "private": false,
   "main": "dist",
   "scripts": {
-    "build": "shx rm -rf dist && tsc || echo 'built, with errors'",
+    "build": "rimraf dist && tsc || echo 'built, with errors'",
     "build-prod": "yarn build",
     "deps": "deps-ok && dependency-check --no-dev .",
     "secure": "nsp check",
@@ -53,8 +53,8 @@
     "react": "16.13.1",
     "react-dom": "16.13.1",
     "react-scripts": "3.2",
+    "rimraf": "3.0.2",
     "semantic-release": "17.2.3",
-    "shx": "0.3.3",
     "sinon": "^9.0.0",
     "sinon-chai": "^3.5.0",
     "snap-shot-it": "7.9.2",
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "check-terminal": "node scripts/check-terminal.js",
     "clean": "lerna run clean --parallel --no-bail || echo 'ok, errors while cleaning'",
     "check-ts": "gulp checkTs",
-    "clean-deps": "find . -depth -name node_modules -type d -exec rm -rf {} \\;",
+    "clean-deps": "find . -depth -name node_modules -type d -exec rimraf {} \\;",
     "clean-untracked-files": "git clean -d -f",
     "codegen": "yarn gulp codegen",
     "precypress:open": "yarn ensure-deps",
@@ -40,7 +40,7 @@
     "effective:circle:config": "circleci config process circle.yml | sed /^#/d",
     "ensure-deps": "./scripts/ensure-dependencies.sh",
     "get-next-version": "node scripts/get-next-version.js",
-    "postinstall": "patch-package && ./scripts/run-if-not-ci.sh yarn-deduplicate --strategy=highest && yarn clean && gulp postinstall && ./scripts/run-if-not-ci.sh yarn build",
+    "postinstall": "node ./scripts/run-postInstall.js",
     "jscodeshift": "jscodeshift -t ./node_modules/js-codemod/transforms/arrow-function-arguments.js",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx,.json,.vue .",
     "lint-changed": "lint-changed",
@@ -203,6 +203,7 @@
     "pretty-ms": "7.0.0",
     "print-arch": "1.0.0",
     "proxyquire": "2.1.3",
+    "rimraf": "3.0.2",
     "semantic-release": "17.2.3",
     "semantic-release-monorepo": "7.0.3",
     "semver": "7.3.2",
diff --git a/packages/config/package.json b/packages/config/package.json
@@ -8,8 +8,8 @@
   "scripts": {
     "build-prod": "tsc || echo 'built, with errors'",
     "check-ts": "tsc --noEmit",
-    "clean-deps": "rm -rf node_modules",
-    "clean": "rm -f ./src/*.js ./src/**/*.js ./src/**/**/*.js ./test/**/*.js || echo 'cleaned'",
+    "clean-deps": "rimraf node_modules",
+    "clean": "rimraf --glob ./src/*.js ./src/**/*.js ./src/**/**/*.js ./test/**/*.js || echo 'cleaned'",
     "test": "yarn test-unit",
     "test-debug": "yarn test-unit --inspect-brk=5566",
     "test-unit": "mocha --configFile=../../mocha-reporter-config.json -r @packages/ts/register test/unit/**/*.spec.ts --exit"
@@ -26,7 +26,8 @@
     "@packages/types": "0.0.0-development",
     "@types/mocha": "9.1.0",
     "chai": "4.2.0",
-    "mocha": "7.0.1"
+    "mocha": "7.0.1",
+    "rimraf": "3.0.2"
   },
   "files": [
     "src"
diff --git a/packages/data-context/package.json b/packages/data-context/package.json
@@ -9,7 +9,7 @@
     "check-ts": "tsc --noEmit && yarn -s tslint",
     "clean-deps": "rimraf node_modules",
     "tslint": "tslint --config ../ts/tslint.json --project .",
-    "clean": "rimraf './{src,test}/**/*!(.stories).js'",
+    "clean": "rimraf --glob \"./{src,test}/**/*!(.stories).js\"",
     "test": "yarn test-unit",
     "test-unit": "mocha -r @packages/ts/register --config ./test/.mocharc.js"
   },
diff --git a/packages/errors/package.json b/packages/errors/package.json
@@ -10,8 +10,8 @@
     "build": "../../scripts/run-if-ci.sh tsc || echo 'type errors'",
     "build-prod": "tsc",
     "check-ts": "tsc --noEmit",
-    "clean-deps": "rm -rf node_modules",
-    "clean": "rm -f ./src/*.js ./src/**/*.js ./src/**/**/*.js ./test/**/*.js || echo 'cleaned'",
+    "clean-deps": "rimraf node_modules",
+    "clean": "rimraf ./src/*.js ./src/**/*.js ./src/**/**/*.js ./test/**/*.js || echo 'cleaned'",
     "pretest-unit": "yarn clean",
     "test-unit": "mocha",
     "test-electron": "HTML_IMAGE_CONVERSION=1 xvfb-maybe electron --no-sandbox ./node_modules/.bin/_mocha"
@@ -36,6 +36,7 @@
     "is-ci": "^3.0.1",
     "mocha": "7.0.1",
     "pngjs": "^6.0.0",
+    "rimraf": "3.0.2",
     "sinon": "7.5.0",
     "terminal-banner": "^1.1.0",
     "xvfb-maybe": "^0.2.1"
diff --git a/packages/https-proxy/package.json b/packages/https-proxy/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "main": "index.js",
   "scripts": {
-    "clean-deps": "rm -rf node_modules",
+    "clean-deps": "rimraf node_modules",
     "https": "node https.js",
     "regenerate:certs": "cd ./test/helpers/certs && ./regenerate-certs.sh",
     "start": "node index.js",
@@ -30,6 +30,7 @@
     "chai": "3.5.0",
     "cross-env": "6.0.3",
     "mocha": "3.5.3",
+    "rimraf": "3.0.2",
     "sinon": "1.17.7",
     "sinon-as-promised": "4.0.3",
     "sinon-chai": "3.3.0",
diff --git a/packages/icons/package.json b/packages/icons/package.json
@@ -6,14 +6,15 @@
   "main": "index.js",
   "scripts": {
     "build-prod": "yarn build",
-    "build": "scripts/build.sh && ts-node ./src/ico.ts",
+    "build": "ts-node ./scripts/build.ts && ts-node ./src/ico.ts",
     "test-unit": "NODE_ENV=test mocha -r @packages/ts/register test/*.ts",
     "test": "yarn test-unit"
   },
   "devDependencies": {
     "@types/mocha": "^8.0.3",
     "@types/to-ico": "^1.1.1",
     "chai": "^4.2.0",
+    "fs-extra": "9.1.0",
     "mocha": "^8.1.3",
     "to-ico": "^1.1.5"
   },
diff --git a/packages/icons/scripts/build.sh b/packages/icons/scripts/build.sh
diff --git a/packages/icons/scripts/build.ts b/packages/icons/scripts/build.ts
@@ -0,0 +1,26 @@
+import fs from 'fs-extra'
+import path from 'path'
+import { exec } from 'child_process'
+import os from 'os'
+
+async function build () {
+  const distPath = path.join(__dirname, '../dist')
+  const assetsPath = path.join(__dirname, '../assets')
+  const iconsPath = path.join(distPath, 'icons')
+  const iconsetPath = path.join(distPath, 'cypress.iconset')
+
+  await fs.remove(distPath)
+  await fs.mkdir(iconsPath, { recursive: true })
+
+  await exec('yarn tsc -p ./tsconfig.build.json')
+
+  if (os.platform() === 'darwin') {
+    await exec('iconutil -c icns assets/cypress.iconset -o dist/icons/cypress.icns')
+  }
+
+  await fs.copy(assetsPath, distPath)
+  await fs.copy(iconsetPath, iconsPath, { overwrite: true })
+  await fs.remove(iconsetPath)
+}
+
+build()
diff --git a/packages/launcher/package.json b/packages/launcher/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "build-prod": "tsc --project .",
-    "clean": "node scripts/clean.js || true",
+    "clean": "rimraf --glob \"lib/*.js\" && rimraf --glob \"lib/**/*.js\" || true",
     "clean-deps": "rimraf node_modules",
     "clean-js": "yarn clean",
     "size": "t=\"cypress-v0.0.0.tgz\"; yarn pack --filename \"${t}\"; wc -c \"cli/${t}\"; tar tvf \"${t}\"; rm \"${t}\";",
@@ -29,7 +29,6 @@
     "cross-env": "6.0.3",
     "mocha": "3.5.3",
     "rimraf": "3.0.2",
-    "shelljs": "0.8.5",
     "sinon": "^10.0.0",
     "sinon-chai": "3.4.0",
     "typescript": "^4.2.3"
diff --git a/packages/launcher/scripts/clean.js b/packages/launcher/scripts/clean.js
diff --git a/packages/launchpad/cypress/e2e/migration.cy.ts b/packages/launchpad/cypress/e2e/migration.cy.ts
@@ -1,6 +1,9 @@
 import type { e2eProjectDirs } from '@packages/frontend-shared/cypress/e2e/support/e2eProjectDirs'
 import { decodeBase64Unicode } from '@packages/frontend-shared/src/utils/base64'
 
+// @ts-ignore
+const platform = window.Cypress.platform
+
 const renameAutoStep = `[data-cy="migration-step renameAuto"]`
 const renameManualStep = `[data-cy="migration-step renameManual"]`
 const renameSupportStep = `[data-cy="migration-step renameSupport"]`
@@ -949,7 +952,9 @@ describe('Full migration flow for each project', { retries: { openMode: 2, runMo
 
     cy.contains('Error Loading Config')
     // correct location of error
-    cy.get('[data-testid="error-code-frame"]').contains(`cypress/plugins/index.js:2:9`)
+    const pluginsPath = platform === 'win32' ? 'cypress\\plugins\\index.js:2:9' : 'cypress/plugins/index.js:2:9'
+
+    cy.get('[data-testid="error-code-frame"]').contains(pluginsPath)
     // correct error from pluginsFile
     cy.contains(`throw Error('Uh oh, there was an error!')`)
 
diff --git a/packages/scaffold-config/package.json b/packages/scaffold-config/package.json
@@ -7,8 +7,8 @@
   "scripts": {
     "build-prod": "tsc || echo 'built, with errors'",
     "check-ts": "tsc --noEmit",
-    "clean": "rm -f ./src/*.js ./src/**/*.js ./src/**/**/*.js ./test/**/*.js || echo 'cleaned'",
-    "clean-deps": "rm -rf node_modules",
+    "clean": "rimraf ./src/*.js ./src/**/*.js ./src/**/**/*.js ./test/**/*.js || echo 'cleaned'",
+    "clean-deps": "rimraf node_modules",
     "test-unit": "mocha -r @packages/ts/register 'test/unit/**' --config ./test/.mocharc.js --exit"
   },
   "dependencies": {
@@ -17,7 +17,8 @@
   "devDependencies": {
     "@packages/ts": "0.0.0-development",
     "chai": "4.2.0",
-    "mocha": "7.0.1"
+    "mocha": "7.0.1",
+    "rimraf": "3.0.2"
   },
   "files": [
     "src"
diff --git a/scripts/gulp/tasks/gulpMakePackage.ts b/scripts/gulp/tasks/gulpMakePackage.ts
@@ -61,8 +61,8 @@ export async function makePackage () {
           scripts: {
             'build-prod': 'tsc || echo \'built, with errors\'',
             'check-ts': 'tsc --noEmit',
-            'clean-deps': 'rm -rf node_modules',
-            'clean': 'rm -f ./src/*.js ./src/**/*.js ./src/**/**/*.js ./test/**/*.js || echo \'cleaned\'',
+            'clean-deps': 'rimraf node_modules',
+            'clean': 'rimraf ./src/*.js ./src/**/*.js ./src/**/**/*.js ./test/**/*.js || echo \'cleaned\'',
             ...(results.scaffoldTests ? {
               'test-unit': 'mocha -r @packages/ts/register test/unit/**/*.spec.ts --config ./test/.mocharc.js --exit',
               'test-integration': 'mocha -r @packages/ts/register test/integration/**/*.spec.ts --config ./test/.mocharc.js --exit',
@@ -71,10 +71,12 @@ export async function makePackage () {
           files: ['src'],
           dependencies: {},
           devDependencies: results.scaffoldTests ? {
+            'rimraf': '3.0.2',
             'mocha': '7.0.1',
             'chai': '4.2.0',
             '@packages/ts': '0.0.0-development',
           } : {
+            'rimraf': '3.0.2',
             '@packages/ts': '0.0.0-development',
           },
         },
diff --git a/scripts/run-if-not-ci.sh b/scripts/run-if-not-ci.sh
diff --git a/scripts/run-postInstall.js b/scripts/run-postInstall.js
@@ -0,0 +1,12 @@
+const { execSync } = require('child_process')
+
+const executionEnv = process.env.CI ? 'ci' : 'local'
+
+const postInstallCommands = {
+  local: 'patch-package && yarn-deduplicate --strategy=highest && yarn clean && gulp postinstall && yarn build',
+  ci: 'patch-package && yarn clean && gulp postinstall',
+}
+
+execSync(postInstallCommands[executionEnv], {
+  stdio: 'inherit',
+})
