[prettierx-update-branch-0010] rename bin & test config items

to be more consistent with prettierX 0.18.x including some updates from: - #549 - #569 Co-authored-by: Christopher J. Brody <[email protected]> Co-authored-by: Adaline Valentina Simonian <[email protected]>
brodycj · Jun 22, 2021 · d7ebc3b · d7ebc3b
1 parent dffab33
commit d7ebc3b
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 24 deletions.
diff --git a/bin/prettier.js → bin/prettierx.js b/bin/prettier.js → bin/prettierx.js
diff --git a/jest.config.js b/jest.config.js
@@ -1,21 +1,24 @@
 "use strict";
 
 const path = require("path");
-const installPrettier = require("./scripts/install-prettier");
+
+// [prettierx]
+const installPrettier = require("./scripts/install-prettierx");
 
 const PROJECT_ROOT = __dirname;
 const isProduction = process.env.NODE_ENV === "production";
 const ENABLE_CODE_COVERAGE = Boolean(process.env.ENABLE_CODE_COVERAGE);
 const TEST_STANDALONE = Boolean(process.env.TEST_STANDALONE);
 const INSTALL_PACKAGE = Boolean(process.env.INSTALL_PACKAGE);
 
-let PRETTIER_DIR = isProduction
+// [prettierx]
+let PRETTIERX_DIR = isProduction
   ? path.join(PROJECT_ROOT, "dist")
   : PROJECT_ROOT;
 if (INSTALL_PACKAGE || (isProduction && !TEST_STANDALONE)) {
-  PRETTIER_DIR = installPrettier(PRETTIER_DIR);
+  PRETTIERX_DIR = installPrettier(PRETTIERX_DIR);
 }
-process.env.PRETTIER_DIR = PRETTIER_DIR;
+process.env.PRETTIERX_DIR = PRETTIERX_DIR;
 
 const testPathIgnorePatterns = [];
 let transform = {};
@@ -68,7 +71,8 @@ module.exports = {
   ],
   coverageReporters: ["text", "lcov"],
   moduleNameMapper: {
-    "prettier-local": "<rootDir>/tests/config/require-prettier.js",
+    // [prettierx]
+    "prettier-local": "<rootDir>/tests/config/require-prettierx.js",
     "prettier-standalone": "<rootDir>/tests/config/require-standalone.js",
   },
   modulePathIgnorePatterns: ["<rootDir>/dist", "<rootDir>/website"],

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0-dev",
   "prettier-version": "2.4.0",
   "description": "prettierx-update-branch-0010 version branch",
-  "bin": "./bin/prettier.js",
+  "bin": "./bin/prettierx.js",
   "author": "James Long",
   "license": "MIT",
   "main": "./index.js",

diff --git a/scripts/build/build.mjs b/scripts/build/build.mjs
@@ -133,7 +133,8 @@ async function cacheFiles(cache) {
 
 async function preparePackage() {
   const pkg = await utils.readJson("package.json");
-  pkg.bin = "./bin-prettier.js";
+  // [prettierx]
+  pkg.bin = "./bin-prettierx.js";
   pkg.engines.node = ">=10.13.0";
   delete pkg.dependencies;
   delete pkg.devDependencies;

diff --git a/scripts/build/config.mjs b/scripts/build/config.mjs
@@ -130,13 +130,15 @@ const coreBundles = [
     minify: false,
   },
   {
+    // [prettierx]
     input: "src/standalone.js",
-    name: "prettier",
+    name: "prettierx",
     target: "universal",
   },
   {
-    input: "bin/prettier.js",
-    output: "bin-prettier.js",
+    // [prettierx]
+    input: "bin/prettierx.js",
+    output: "bin-prettierx.js",
     external: ["benchmark"],
   },
   {

diff --git a/scripts/install-prettier.js → scripts/install-prettierx.js b/scripts/install-prettier.js → scripts/install-prettierx.js
diff --git a/tests/config/require-prettier.js b/tests/config/require-prettier.js
diff --git a/tests/config/require-prettierx.js b/tests/config/require-prettierx.js
@@ -0,0 +1,6 @@
+"use strict";
+
+// [prettierx]
+const prettier = require(process.env.PRETTIERX_DIR);
+
+module.exports = prettier;
diff --git a/tests/config/require-standalone.js b/tests/config/require-standalone.js
@@ -8,15 +8,17 @@ const sandbox = vm.createContext();
 
 const source = globby
   .sync(["standalone.js", "parser-*.js"], {
-    cwd: process.env.PRETTIER_DIR,
+    // [prettierx]
+    cwd: process.env.PRETTIERX_DIR,
     absolute: true,
   })
   .map((file) => fs.readFileSync(file, "utf8"))
   .join(";");
 
 vm.runInContext(source, sandbox);
 
-const allowedGlobalObjects = new Set(["prettier", "prettierPlugins"]);
+// [prettierx]
+const allowedGlobalObjects = new Set(["prettierx", "prettierPlugins"]);
 const globalObjects = Object.keys(sandbox).filter(
   (property) => !allowedGlobalObjects.has(property)
 );
@@ -38,6 +40,7 @@ if (globalObjects.length > 0) {
 module.exports = {
   formatWithCursor(input, options) {
     return vm.runInNewContext(
+      // [prettierx]
       `
         const options = {
           ...$$$options,
@@ -46,7 +49,7 @@ module.exports = {
             ...($$$options.plugins || []),
           ],
         };
-        prettier.formatWithCursor($$$input, options);
+        prettierx.formatWithCursor($$$input, options);
       `,
       { $$$input: input, $$$options: options, ...sandbox }
     );
@@ -55,6 +58,7 @@ module.exports = {
   __debug: {
     parse(input, options, massage) {
       return vm.runInNewContext(
+        // [prettierx]
         `
           const options = {
             ...$$$options,
@@ -63,7 +67,9 @@ module.exports = {
               ...($$$options.plugins || []),
             ],
           };
-          prettier.__debug.parse($$$input, options, ${JSON.stringify(massage)});
+          prettierx.__debug.parse($$$input, options, ${JSON.stringify(
+            massage
+          )});
         `,
         { $$$input: input, $$$options: options, ...sandbox }
       );

diff --git a/tests/integration/env.js b/tests/integration/env.js
@@ -2,18 +2,20 @@
 
 const path = require("path");
 const isProduction = process.env.NODE_ENV === "production";
-const { PRETTIER_DIR } = process.env;
+// [prettierx]
+const { PRETTIERX_DIR } = process.env;
 // [prettierx] get fork package name from package.json
-const { bin, name } = require(path.join(PRETTIER_DIR, "package.json"));
+const { bin, name } = require(path.join(PRETTIERX_DIR, "package.json"));
 const prettierCli = path.join(
-  PRETTIER_DIR,
+  PRETTIERX_DIR,
   // [prettierx] use fork package name from package.json
   typeof bin === "object" ? bin[name] : bin
 );
 
+// [prettierx]
 const thirdParty = isProduction
-  ? path.join(PRETTIER_DIR, "./third-party")
-  : path.join(PRETTIER_DIR, "./src/common/third-party");
+  ? path.join(PRETTIERX_DIR, "./third-party")
+  : path.join(PRETTIERX_DIR, "./src/common/third-party");
 
 const projectRoot = path.join(__dirname, "../..");