preparing release

Author: Janther

.github/workflows/CI.yml

@@ -23,23 +23,23 @@ jobs:
       - name: lint
         run: npm run lint
 
-  test_bundle:
-    name: Test production
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-          cache: 'npm'
-      - name: Install
-        run: npm install
-      - name: Build
-        run: npm run build
-      - name: Build test app
-        run: npm run build:test
-      - name: Run tests
-        run: npm run test:standalone
+  # test_bundle:
+  #   name: Test production
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #     - uses: actions/setup-node@v3
+  #       with:
+  #         node-version: 16
+  #         cache: 'npm'
+  #     - name: Install
+  #       run: npm install
+  #     - name: Build
+  #       run: npm run build
+  #     - name: Build test app
+  #       run: npm run build:test
+  #     - name: Run tests
+  #       run: npm run test:standalone
 
   test_prettier_v2:
     name: Prettier V2
@@ -56,10 +56,10 @@ jobs:
         run: npm run build
       - name: Downgrade Prettier to V2
         run: npm install [email protected]
-      - name: Build test app
-        run: npm run build:test
-      - name: Run standalone tests
-        run: npm run test:standalone
+      # - name: Build test app
+      #   run: npm run build:test
+      # - name: Run standalone tests
+      #   run: npm run test:standalone
 
   test_linux:
     name: Test on Linux with Node ${{ matrix.node }}

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 prettier-solidity
+Copyright (c) 2024 prettier-solidity
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -10,6 +10,12 @@
 
 A [Prettier plugin](https://prettier.io/docs/en/plugins.html) for automatically formatting your [Solidity](https://github.com/ethereum/solidity) code.
 
+## Nomic Foundation`s Slang
+
+Nomic Foundation has put a lot of effort in providing a set of compiler APIs that helped us rethink our approach to parsing and rely on their flexibility, detail oriented solution and continuos support of new and old Solidity syntaxes.
+
+Since v2.0.0 this package will ship with the Slang parser and this change must be implemented in existing configurations by replacing `parser: 'solidity-parse'` with `parser: 'slang'`.
+
 ## Installation and usage
 
 ### Using in NodeJS
@@ -40,7 +46,7 @@ Or you can use it as part of your linting to check that all your code is prettif
 
 > Prettier Solidity only works with valid code. If there is a syntax error, nothing will be done and a parser error will be thrown.
 
-### Using in the Browser
+### ~~Using in the Browser~~ _Disabled during v2.0.0-beta_
 
 _Added in v1.1.0_
 
@@ -73,7 +79,7 @@ We follow Prettier's strategy for populating their plugins in the object `pretti
 
 For more details and please have a look at [Prettier's documentation](https://prettier.io/docs/en/browser.html).
 
-### Creating a package for the Browser
+### ~~Creating a package for the Browser~~ _Disabled during v2.0.0-beta_
 
 _Added in v1.2.0_
 
@@ -85,7 +91,7 @@ import solidityPlugin from 'prettier-plugin-solidity/standalone';
 
 async function format(code) {
   return await prettier.format(code, {
-    parser: "solidity-parse",
+    parser: "slang",
     plugins: [solidityPlugin],
   });
 }
@@ -106,7 +112,7 @@ The following is the default configuration internally used by this plugin.
     {
       "files": "*.sol",
       "options": {
-        "parser": "solidity-parse",
+        "parser": "slang",
         "printWidth": 80,
         "tabWidth": 4,
         "useTabs": false,

package.json

@@ -1,32 +1,18 @@
 {
   "name": "prettier-plugin-solidity",
-  "version": "1.3.1",
+  "version": "2.0.0-beta",
   "description": "A Prettier Plugin for automatically formatting your Solidity code.",
   "type": "module",
-  "main": "./src/index.js",
-  "browser": "./dist/standalone.cjs",
-  "unpkg": "./dist/standalone.cjs",
-  "exports": {
-    ".": {
-      "import": "./src/index.js",
-      "require": "./dist/standalone.cjs"
-    },
-    "./standalone": {
-      "default": "./dist/standalone.cjs"
-    }
-  },
+  "main": "./dist/index.js",
   "scripts": {
-    "build": "webpack --env production",
-    "build:dev": "webpack --env development",
-    "build:test": "webpack --config test.config.js",
+    "build": "npx tsc",
     "eslint": "eslint 'src/**' 'tests/**'",
     "lint": "npm run eslint && npm run prettier -- --list-different",
     "lint:fix": "npm run eslint -- --fix && npm run prettier -- --write",
     "prepublishOnly": "npm run build",
     "prettier": "prettier './*.{ts,js,cjs,json,md,yml}' '{src,tests}/**/*.{ts,js,cjs}'",
     "test": "NODE_OPTIONS=\"--loader=ts-node/esm --loader=esmock\" jest",
-    "test:all": "cross-env FULL_TEST=1 NODE_OPTIONS=\"--loader=ts-node/esm --loader=esmock\" c8 jest",
-    "test:standalone": "cross-env TEST_STANDALONE=1 FULL_TEST=1 jest"
+    "test:all": "cross-env FULL_TEST=1 NODE_OPTIONS=\"--loader=ts-node/esm --loader=esmock\" c8 jest"
   },
   "files": [
     "src",
@@ -42,6 +28,7 @@
     "ethereum",
     "plugin",
     "prettier",
+    "slang",
     "solidity"
   ],
   "author": {

src/index.ts

@@ -31,7 +31,7 @@ const languages: SupportLanguage[] = [
     aceMode: 'text',
     tmScope: 'source.solidity',
     extensions: ['.sol'],
-    parsers: ['solidity-parse', parserName],
+    parsers: [parserName, 'solidity-parse'],
     vscodeLanguageIds: ['solidity']
   }
 ];
@@ -46,8 +46,8 @@ const slangParser: Parser<AstNode> = {
 };
 
 const parsers = {
-  'solidity-parse': parser,
-  [parserName]: slangParser
+  [parserName]: slangParser,
+  'solidity-parse': parser
 };
 
 const solidityCanAttachComment = (node: { type: string }): boolean =>
@@ -83,8 +83,8 @@ const slangPrinter: Printer<AstNode> = {
 };
 
 const printers = {
-  'solidity-ast': printer,
-  [astFormat]: slangPrinter
+  [astFormat]: slangPrinter,
+  'solidity-ast': printer
 };
 
 // https://prettier.io/docs/en/plugins.html#defaultoptions