Use Yarn v3.0.0-rc2

cylc · May 3, 2021 · a2cb975 · a2cb975
1 parent b3e2229
commit a2cb975
Show file tree

Hide file tree

Showing 8 changed files with 630 additions and 598 deletions.
diff --git a/.yarn/releases/yarn-3.0.0-rc.2.cjs b/.yarn/releases/yarn-3.0.0-rc.2.cjs
diff --git a/.yarn/releases/yarn-sources.cjs b/.yarn/releases/yarn-sources.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1,3 +1,3 @@
-nodeLinker: pnp
+nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-sources.cjs
+yarnPath: .yarn/releases/yarn-3.0.0-rc.2.cjs
diff --git a/package.json b/package.json
@@ -63,7 +63,9 @@
     "@vue/cli-plugin-unit-mocha": "^4.5.12",
     "@vue/cli-service": "^4.5.12",
     "@vue/test-utils": "^1.1.4",
+    "@yarnpkg/fslib": "^2.5.0-rc.2",
     "autoprefixer": "^9.8.6",
+    "babel-eslint": "^10.1.0",
     "babel-plugin-istanbul": "^6.0.0",
     "bufferutil": "^4.0.3",
     "chai": "^4.3.4",
@@ -74,6 +76,7 @@
     "eslint": "^7.25.0",
     "eslint-config-standard": "^16.0.2",
     "eslint-config-vuetify": "^0.5.0",
+    "eslint-import-resolver-node": "^0.3.4",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.1.0",

diff --git a/src/styles/cylc/_tree.scss b/src/styles/cylc/_tree.scss
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-@import '../../../node_modules/vuetify/src/styles/styles';
+@import '~vuetify/src/styles/styles';
 
 $active-color: #BDD5F7;
 /**

diff --git a/tests/unit/components/cylc/tree/tree.vue.spec.js b/tests/unit/components/cylc/tree/tree.vue.spec.js
@@ -25,7 +25,7 @@ import { simpleWorkflowTree4Nodes } from './tree.data'
 import TaskState from '@/model/TaskState.model'
 import TreeItem from '@/components/cylc/tree/TreeItem'
 import CylcObjectPlugin from '@/components/cylc/cylcObject/plugin'
-import cloneDeep from 'lodash.clonedeep'
+import cloneDeep from 'lodash/cloneDeep'
 
 const localVue = createLocalVue()
 localVue.prototype.$eventBus = {

diff --git a/vue.config.js b/vue.config.js
@@ -54,7 +54,6 @@ module.exports = {
       .resolve
       .alias
       .set('react-dom', 'preact/compat')
-    config.rules
     if (process.env.NODE_ENV !== 'production') {
       // devtool for test and other modes
       // https://webpack.js.org/configuration/devtool/

diff --git a/yarn.lock b/yarn.lock
@@ -2591,6 +2591,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/emscripten@npm:^1.38.0":
+  version: 1.39.4
+  resolution: "@types/emscripten@npm:1.39.4"
+  checksum: 7a51e08b2230b9b8f29db095703499c0c7a8e8195d5de288fc8583f4599f07172d700df89931e26eaab4f54ccc114d266373da6d15a711ef7a41b2dd6d450ccf
+  languageName: node
+  linkType: hard
+
 "@types/express-serve-static-core@npm:*":
   version: 4.17.9
   resolution: "@types/express-serve-static-core@npm:4.17.9"
@@ -3492,6 +3499,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@yarnpkg/fslib@npm:^2.5.0-rc.2":
+  version: 2.5.0-rc.2
+  resolution: "@yarnpkg/fslib@npm:2.5.0-rc.2"
+  dependencies:
+    "@yarnpkg/libzip": ^2.2.1
+    tslib: ^1.13.0
+  checksum: 50f65e8f096d9efd326735d1dd927b00a55f9ea83288cd0e5d058f8e5f97c28c8c12e3ea3f9c0a5d229b4813f12e9e2f287c7e7cc5304aa1a4d58f5834a182fb
+  languageName: node
+  linkType: hard
+
+"@yarnpkg/libzip@npm:^2.2.1":
+  version: 2.2.1
+  resolution: "@yarnpkg/libzip@npm:2.2.1"
+  dependencies:
+    "@types/emscripten": ^1.38.0
+    tslib: ^1.13.0
+  checksum: 396f6d22f5b159ada98636436189a7059b6914f1c788e6cf5a7b50a5a1cab65557cb2b2b1ab04fac1c05006370312e9aa23887ad3e7e8d8d73409e9c0b9c0888
+  languageName: node
+  linkType: hard
+
 "JSONStream@npm:^1.0.3, JSONStream@npm:^1.0.4":
   version: 1.3.5
   resolution: "JSONStream@npm:1.3.5"
@@ -4225,7 +4252,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-eslint@npm:^10.0.3":
+"babel-eslint@npm:^10.0.3, babel-eslint@npm:^10.1.0":
   version: 10.1.0
   resolution: "babel-eslint@npm:10.1.0"
   dependencies:
@@ -6822,9 +6849,11 @@ __metadata:
     "@vue/cli-plugin-unit-mocha": ^4.5.12
     "@vue/cli-service": ^4.5.12
     "@vue/test-utils": ^1.1.4
+    "@yarnpkg/fslib": ^2.5.0-rc.2
     autoprefixer: ^9.8.6
     axios: ^0.21.1
     axios-fetch: ^1.1.0
+    babel-eslint: ^10.1.0
     babel-plugin-istanbul: ^6.0.0
     babel-runtime: ^6.26.0
     bufferutil: ^4.0.3
@@ -6840,6 +6869,7 @@ __metadata:
     eslint: ^7.25.0
     eslint-config-standard: ^16.0.2
     eslint-config-vuetify: ^0.5.0
+    eslint-import-resolver-node: ^0.3.4
     eslint-plugin-import: ^2.22.1
     eslint-plugin-node: ^11.1.0
     eslint-plugin-promise: ^5.1.0
@@ -18484,7 +18514,7 @@ resolve@^1.18.1:
   languageName: node
   linkType: hard
 
-"tslib@npm:^1.14.1":
+"tslib@npm:^1.13.0, tslib@npm:^1.14.1":
   version: 1.14.1
   resolution: "tslib@npm:1.14.1"
   checksum: dbe628ef87f66691d5d2959b3e41b9ca0045c3ee3c7c7b906cc1e328b39f199bb1ad9e671c39025bd56122ac57dfbf7385a94843b1cc07c60a4db74795829acd